← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
37
37
    'version':      bzrlib.__version__,
38
38
    'author':       'Canonical Ltd',
39
39
    'author_email': 'bazaar@lists.canonical.com',
40
 
    'url':          'http://www.bazaar.canonical.com/',
 
40
    'url':          'http://bazaar.canonical.com/',
41
41
    'description':  'Friendly distributed version control system',
42
42
    'license':      'GNU GPL v2',
43
43
    'download_url': 'https://launchpad.net/bzr/+download',
553
553
                                     version = version_str,
554
554
                                     description = META_INFO['description'],
555
555
                                     author = META_INFO['author'],
556
 
                                     copyright = "(c) Canonical Ltd, 2005-2009",
 
556
                                     copyright = "(c) Canonical Ltd, 2005-2010",
557
557
                                     company_name = "Canonical Ltd.",
558
558
                                     comments = META_INFO['description'],
559
559
                                    )
572
572
    if sys.version.startswith('2.4'):
573
573
        # adding elementtree package
574
574
        additional_packages.add('elementtree')
575
 
    elif sys.version.startswith('2.5'):
 
575
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
576
576
        additional_packages.add('xml.etree')
577
577
    else:
578
578
        import warnings
624
624
            excludes.extend(["bzrlib.plugins." + d for d in dirs])
625
625
        x = []
626
626
        for i in files:
627
 
            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
 
627
            # Throw away files we don't want packaged. Note that plugins may
 
628
            # have data files with all sorts of extensions so we need to
 
629
            # be conservative here about what we ditch.
 
630
            ext = os.path.splitext(i)[1]
 
631
            if ext.endswith('~') or ext in [".pyc", ".swp"]:
628
632
                continue
629
633
            if i == '__init__.py' and root == 'bzrlib/plugins':
630
634
                continue