/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to setup.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
285
285
        include_dirs=include_dirs))
286
286
 
287
287
 
 
288
add_cython_extension('breezy._simple_set_pyx')
 
289
ext_modules.append(Extension('breezy._static_tuple_c',
 
290
                             ['breezy/_static_tuple_c.c']))
288
291
add_cython_extension('breezy._annotator_pyx')
289
292
add_cython_extension('breezy._bencode_pyx')
290
293
add_cython_extension('breezy._chunks_to_lines_pyx')
303
306
add_cython_extension('breezy.bzr._chk_map_pyx')
304
307
ext_modules.append(Extension('breezy._patiencediff_c',
305
308
                             ['breezy/_patiencediff_c.c']))
306
 
add_cython_extension('breezy._simple_set_pyx')
307
 
ext_modules.append(Extension('breezy._static_tuple_c',
308
 
                             ['breezy/_static_tuple_c.c']))
309
309
add_cython_extension('breezy.bzr._btree_serializer_pyx')
310
310
 
311
311
 
573
573
        includes.append(module)
574
574
 
575
575
    additional_packages = set()
576
 
    if sys.version.startswith('2.4'):
577
 
        # adding elementtree package
578
 
        additional_packages.add('elementtree')
579
 
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
 
576
    if sys.version.startswith('2.7'):
580
577
        additional_packages.add('xml.etree')
581
578
    else:
582
579
        import warnings