/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-27 16:10:10 UTC
  • mto: (4310.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4311.
  • Revision ID: v.ladeuil+lp@free.fr-20090427161010-7swfzeagf63cpixd
Fix bug #367726 by reverting some default user handling introduced
while fixing bug #256612.

* bzrlib/transport/ssh.py:
(_paramiko_auth): Explicitly use getpass.getuser() as default
user.

* bzrlib/transport/ftp/_gssapi.py:
(GSSAPIFtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/transport/ftp/__init__.py:
(FtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/tests/test_sftp_transport.py:
(TestUsesAuthConfig.test_sftp_is_none_if_no_config)
(TestUsesAuthConfig.test_sftp_doesnt_prompt_username): Revert to
None as the default user.

* bzrlib/tests/test_remote.py:
(TestRemoteSSHTransportAuthentication): The really offending one:
revert to None as the default user.

* bzrlib/tests/test_config.py:
(TestAuthenticationConfig.test_username_default_no_prompt): Update
test (and some PEP8).

* bzrlib/smtp_connection.py:
(SMTPConnection._authenticate): Revert to None as the default
user.

* bzrlib/plugins/launchpad/account.py:
(_get_auth_user): Revert default value handling.

* bzrlib/config.py:
(AuthenticationConfig.get_user): Fix doc-string. Leave default
value handling to callers.

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://bazaar.canonical.com/',
 
40
    'url':          'http://www.bazaar-vcs.org/',
41
41
    'description':  'Friendly distributed version control system',
42
42
    'license':      'GNU GPL v2',
43
 
    'download_url': 'https://launchpad.net/bzr/+download',
 
43
    'download_url': 'http://bazaar-vcs.org/Download',
44
44
    'long_description': get_long_description(),
45
45
    'classifiers': [
46
46
        'Development Status :: 6 - Mature',
65
65
            'package_data': {'bzrlib': ['doc/api/*.txt',
66
66
                                        'tests/test_patches_data/*',
67
67
                                        'help_topics/en/*.txt',
68
 
                                        'tests/ssl_certs/server_without_pass.key',
69
 
                                        'tests/ssl_certs/server_with_pass.key',
70
 
                                        'tests/ssl_certs/server.crt'
71
68
                                       ]},
72
69
           }
73
70
 
96
93
BZRLIB['packages'] = get_bzrlib_packages()
97
94
 
98
95
 
99
 
from distutils import log
100
96
from distutils.core import setup
101
97
from distutils.command.install_scripts import install_scripts
102
98
from distutils.command.install_data import install_data
152
148
    def run(self):
153
149
        build.run(self)
154
150
 
155
 
        from tools import generate_docs
 
151
        import generate_docs
156
152
        generate_docs.main(argv=["bzr", "man"])
157
153
 
158
154
 
167
163
from distutils.extension import Extension
168
164
ext_modules = []
169
165
try:
170
 
    try:
171
 
        from Pyrex.Distutils import build_ext
172
 
        from Pyrex.Compiler.Version import version as pyrex_version
173
 
    except ImportError:
174
 
        print "No Pyrex, trying Cython..."
175
 
        from Cython.Distutils import build_ext
176
 
        from Cython.Compiler.Version import version as pyrex_version
 
166
    from Pyrex.Distutils import build_ext
177
167
except ImportError:
178
168
    have_pyrex = False
179
169
    # try to build the extension from the prior generated source.
186
176
    from distutils.command.build_ext import build_ext
187
177
else:
188
178
    have_pyrex = True
189
 
    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
 
179
    from Pyrex.Compiler.Version import version as pyrex_version
190
180
 
191
181
 
192
182
class build_ext_if_possible(build_ext):
252
242
    c_name = path + '.c'
253
243
    define_macros = []
254
244
    if sys.platform == 'win32':
255
 
        # pyrex uses the macro WIN32 to detect the platform, even though it
256
 
        # should be using something like _WIN32 or MS_WINDOWS, oh well, we can
257
 
        # give it the right value.
 
245
        # pyrex uses the macro WIN32 to detect the platform, even though it should
 
246
        # be using something like _WIN32 or MS_WINDOWS, oh well, we can give it the
 
247
        # right value.
258
248
        define_macros.append(('WIN32', None))
259
249
    if have_pyrex:
260
250
        source = [pyrex_name]
269
259
        define_macros=define_macros, libraries=libraries))
270
260
 
271
261
 
272
 
add_pyrex_extension('bzrlib._annotator_pyx')
273
 
add_pyrex_extension('bzrlib._bencode_pyx')
274
 
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
 
262
add_pyrex_extension('bzrlib._btree_serializer_c')
275
263
add_pyrex_extension('bzrlib._groupcompress_pyx',
276
264
                    extra_source=['bzrlib/diff-delta.c'])
277
 
add_pyrex_extension('bzrlib._knit_load_data_pyx')
278
 
add_pyrex_extension('bzrlib._known_graph_pyx')
279
 
add_pyrex_extension('bzrlib._rio_pyx')
 
265
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
 
266
add_pyrex_extension('bzrlib._knit_load_data_c')
 
267
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=['z'])
280
268
if sys.platform == 'win32':
281
 
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
 
269
    add_pyrex_extension('bzrlib._dirstate_helpers_c',
282
270
                        libraries=['Ws2_32'])
283
271
    add_pyrex_extension('bzrlib._walkdirs_win32')
284
272
else:
285
 
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
 
273
    if have_pyrex and pyrex_version == '0.9.4.1':
286
274
        # Pyrex 0.9.4.1 fails to compile this extension correctly
287
275
        # The code it generates re-uses a "local" pointer and
288
276
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
289
277
        # which is NULL safe with PY_DECREF which is not.)
290
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
291
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
292
 
        print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
 
278
        print 'Cannot build extension "bzrlib._dirstate_helpers_c" using'
293
279
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
294
280
            pyrex_version,)
295
281
        print 'install. For now, the non-compiled (python) version will'
296
282
        print 'be used instead.'
297
283
    else:
298
 
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
 
284
        add_pyrex_extension('bzrlib._dirstate_helpers_c')
299
285
    add_pyrex_extension('bzrlib._readdir_pyx')
300
 
add_pyrex_extension('bzrlib._chk_map_pyx')
301
 
ext_modules.append(Extension('bzrlib._patiencediff_c',
302
 
                             ['bzrlib/_patiencediff_c.c']))
303
 
if have_pyrex and pyrex_version_info < (0, 9, 6, 3):
304
 
    print
305
 
    print 'Your Pyrex/Cython version %s is too old to build the simple_set' % (
306
 
        pyrex_version)
307
 
    print 'and static_tuple extensions.'
308
 
    print 'Please upgrade to at least Pyrex 0.9.6.3'
309
 
    print
310
 
    # TODO: Should this be a fatal error?
311
 
else:
312
 
    # We only need 0.9.6.3 to build _simple_set_pyx, but static_tuple depends
313
 
    # on simple_set
314
 
    add_pyrex_extension('bzrlib._simple_set_pyx')
315
 
    ext_modules.append(Extension('bzrlib._static_tuple_c',
316
 
                                 ['bzrlib/_static_tuple_c.c']))
317
 
add_pyrex_extension('bzrlib._btree_serializer_pyx')
 
286
ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
318
287
 
319
288
 
320
289
if unavailable_files:
347
316
    # Ensure tbzrlib itself is on sys.path
348
317
    sys.path.append(tbzr_root)
349
318
 
 
319
    # Ensure our COM "entry-point" is on sys.path
 
320
    sys.path.append(os.path.join(tbzr_root, "shellext", "python"))
 
321
 
350
322
    packages.append("tbzrlib")
351
323
 
352
324
    # collect up our icons.
374
346
    excludes.extend("""pywin pywin.dialogs pywin.dialogs.list
375
347
                       win32ui crawler.Crawler""".split())
376
348
 
 
349
    # NOTE: We still create a DLL version of the Python implemented shell
 
350
    # extension for testing purposes - but it is *not* registered by
 
351
    # default - our C++ one is instead.  To discourage people thinking
 
352
    # this DLL is still necessary, its called 'tbzr_old.dll'
 
353
    tbzr = dict(
 
354
        modules=["tbzr"],
 
355
        create_exe = False, # we only want a .dll
 
356
        dest_base = 'tbzr_old',
 
357
    )
 
358
    com_targets.append(tbzr)
 
359
 
377
360
    # tbzrcache executables - a "console" version for debugging and a
378
361
    # GUI version that is generally used.
379
362
    tbzrcache = dict(
404
387
    console_targets.append(tracer)
405
388
 
406
389
    # The C++ implemented shell extensions.
407
 
    dist_dir = os.path.join(tbzr_root, "shellext", "build")
 
390
    dist_dir = os.path.join(tbzr_root, "shellext", "cpp", "tbzrshellext",
 
391
                            "build", "dist")
408
392
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x86.dll')]))
409
393
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x64.dll')]))
410
394
 
411
395
 
412
 
def get_qbzr_py2exe_info(includes, excludes, packages, data_files):
 
396
def get_qbzr_py2exe_info(includes, excludes, packages):
413
397
    # PyQt4 itself still escapes the plugin detection code for some reason...
414
398
    packages.append('PyQt4')
415
399
    excludes.append('PyQt4.elementtree.ElementTree')
416
 
    excludes.append('PyQt4.uic.port_v3')
417
400
    includes.append('sip') # extension module required for Qt.
418
401
    packages.append('pygments') # colorizer for qbzr
419
402
    packages.append('docutils') # html formatting
420
 
    includes.append('win32event')  # for qsubprocess stuff
421
403
    # but we can avoid many Qt4 Dlls.
422
404
    dll_excludes.extend(
423
405
        """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
425
407
        QtSql4.dll QtTest4.dll QtWebKit4.dll QtXml4.dll
426
408
        qscintilla2.dll""".split())
427
409
    # the qt binaries might not be on PATH...
428
 
    # They seem to install to a place like C:\Python25\PyQt4\*
429
 
    # Which is not the same as C:\Python25\Lib\site-packages\PyQt4
430
 
    pyqt_dir = os.path.join(sys.prefix, "PyQt4")
431
 
    pyqt_bin_dir = os.path.join(pyqt_dir, "bin")
432
 
    if os.path.isdir(pyqt_bin_dir):
433
 
        path = os.environ.get("PATH", "")
434
 
        if pyqt_bin_dir.lower() not in [p.lower() for p in path.split(os.pathsep)]:
435
 
            os.environ["PATH"] = path + os.pathsep + pyqt_bin_dir
436
 
    # also add all imageformat plugins to distribution
437
 
    # We will look in 2 places, dirname(PyQt4.__file__) and pyqt_dir
438
 
    base_dirs_to_check = []
439
 
    if os.path.isdir(pyqt_dir):
440
 
        base_dirs_to_check.append(pyqt_dir)
441
 
    try:
442
 
        import PyQt4
443
 
    except ImportError:
444
 
        pass
445
 
    else:
446
 
        pyqt4_base_dir = os.path.dirname(PyQt4.__file__)
447
 
        if pyqt4_base_dir != pyqt_dir:
448
 
            base_dirs_to_check.append(pyqt4_base_dir)
449
 
    if not base_dirs_to_check:
450
 
        log.warn("Can't find PyQt4 installation -> not including imageformat"
451
 
                 " plugins")
452
 
    else:
453
 
        files = []
454
 
        for base_dir in base_dirs_to_check:
455
 
            plug_dir = os.path.join(base_dir, 'plugins', 'imageformats')
456
 
            if os.path.isdir(plug_dir):
457
 
                for fname in os.listdir(plug_dir):
458
 
                    # Include plugin dlls, but not debugging dlls
459
 
                    fullpath = os.path.join(plug_dir, fname)
460
 
                    if fname.endswith('.dll') and not fname.endswith('d4.dll'):
461
 
                        files.append(fullpath)
462
 
        if files:
463
 
            data_files.append(('imageformats', files))
464
 
        else:
465
 
            log.warn('PyQt4 was found, but we could not find any imageformat'
466
 
                     ' plugins. Are you sure your configuration is correct?')
 
410
    qt_dir = os.path.join(sys.prefix, "PyQt4", "bin")
 
411
    path = os.environ.get("PATH","")
 
412
    if qt_dir.lower() not in [p.lower() for p in path.split(os.pathsep)]:
 
413
        os.environ["PATH"] = path + os.pathsep + qt_dir
467
414
 
468
415
 
469
416
def get_svn_py2exe_info(includes, excludes, packages):
470
417
    packages.append('subvertpy')
471
 
    packages.append('sqlite3')
472
418
 
473
419
 
474
420
if 'bdist_wininst' in sys.argv:
532
478
            install_data.run(self)
533
479
 
534
480
            py2exe = self.distribution.get_command_obj('py2exe', False)
535
 
            # GZ 2010-04-19: Setup has py2exe.optimize as 2, but give plugins
536
 
            #                time before living with docstring stripping
537
 
            optimize = 1
 
481
            optimize = py2exe.optimize
538
482
            compile_names = [f for f in self.outfiles if f.endswith('.py')]
539
483
            byte_compile(compile_names,
540
484
                         optimize=optimize,
541
485
                         force=self.force, prefix=self.install_dir,
542
486
                         dry_run=self.dry_run)
543
 
            self.outfiles.extend([f + 'o' for f in compile_names])
 
487
            if optimize:
 
488
                suffix = 'o'
 
489
            else:
 
490
                suffix = 'c'
 
491
            self.outfiles.extend([f + suffix for f in compile_names])
544
492
    # end of class install_data_with_bytecompile
545
493
 
546
494
    target = py2exe.build_exe.Target(script = "bzr",
550
498
                                     version = version_str,
551
499
                                     description = META_INFO['description'],
552
500
                                     author = META_INFO['author'],
553
 
                                     copyright = "(c) Canonical Ltd, 2005-2010",
 
501
                                     copyright = "(c) Canonical Ltd, 2005-2007",
554
502
                                     company_name = "Canonical Ltd.",
555
503
                                     comments = META_INFO['description'],
556
504
                                    )
569
517
    if sys.version.startswith('2.4'):
570
518
        # adding elementtree package
571
519
        additional_packages.add('elementtree')
572
 
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
 
520
    elif sys.version.startswith('2.5'):
573
521
        additional_packages.add('xml.etree')
574
522
    else:
575
523
        import warnings
583
531
                  ImaginaryModule cElementTree elementtree.ElementTree
584
532
                  Crypto.PublicKey._fastmath
585
533
                  medusa medusa.filesys medusa.ftp_server
586
 
                  tools
 
534
                  tools tools.doc_generate
587
535
                  resource validate""".split()
588
536
    dll_excludes = []
589
537
 
621
569
            excludes.extend(["bzrlib.plugins." + d for d in dirs])
622
570
        x = []
623
571
        for i in files:
624
 
            # Throw away files we don't want packaged. Note that plugins may
625
 
            # have data files with all sorts of extensions so we need to
626
 
            # be conservative here about what we ditch.
627
 
            ext = os.path.splitext(i)[1]
628
 
            if ext.endswith('~') or ext in [".pyc", ".swp"]:
 
572
            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
629
573
                continue
630
574
            if i == '__init__.py' and root == 'bzrlib/plugins':
631
575
                continue
645
589
                       'tools/win32/bzr_postinstall.py',
646
590
                       ]
647
591
    gui_targets = []
 
592
    com_targets = []
648
593
    data_files = topics_files + plugins_files
649
594
 
650
595
    if 'qbzr' in plugins:
651
 
        get_qbzr_py2exe_info(includes, excludes, packages, data_files)
 
596
        get_qbzr_py2exe_info(includes, excludes, packages)
652
597
 
653
598
    if 'svn' in plugins:
654
599
        get_svn_py2exe_info(includes, excludes, packages)
657
602
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
658
603
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
659
604
        # can be downloaded from (username=guest, blank password):
660
 
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays
661
 
        # look for: version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
 
605
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays/version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
662
606
        # Ditto for TORTOISE_OVERLAYS_MSI_X64, pointing at *-x64.msi.
663
607
        for needed in ('TORTOISE_OVERLAYS_MSI_WIN32',
664
608
                       'TORTOISE_OVERLAYS_MSI_X64'):
665
 
            url = ('http://guest:@tortoisesvn.tigris.org/svn/tortoisesvn'
666
 
                   '/TortoiseOverlays')
667
609
            if not os.path.isfile(os.environ.get(needed, '<nofile>')):
668
 
                raise RuntimeError(
669
 
                    "\nPlease set %s to the location of the relevant"
670
 
                    "\nTortoiseOverlays .msi installer file."
671
 
                    " The installers can be found at"
672
 
                    "\n  %s"
673
 
                    "\ncheck in the version-X.Y.Z/bin/ subdir" % (needed, url))
 
610
                raise RuntimeError("Please set %s to the"
 
611
                                   " location of the relevant TortoiseOverlays"
 
612
                                   " .msi installer file" % needed)
674
613
        get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
675
614
                             gui_targets, data_files)
676
615
    else:
688
627
                               "excludes": excludes,
689
628
                               "dll_excludes": dll_excludes,
690
629
                               "dist_dir": "win32_bzr.exe",
691
 
                               "optimize": 2,
 
630
                               "optimize": 1,
692
631
                              },
693
632
                   }
694
633
 
695
634
    setup(options=options_list,
696
635
          console=console_targets,
697
636
          windows=gui_targets,
 
637
          com_server=com_targets,
698
638
          zipfile='lib/library.zip',
699
639
          data_files=data_files,
700
640
          cmdclass={'install_data': install_data_with_bytecompile},
704
644
    # ad-hoc for easy_install
705
645
    DATA_FILES = []
706
646
    if not 'bdist_egg' in sys.argv:
707
 
        # generate and install bzr.1 only with plain install, not the
708
 
        # easy_install one
 
647
        # generate and install bzr.1 only with plain install, not easy_install one
709
648
        DATA_FILES = [('man/man1', ['bzr.1'])]
710
649
 
711
 
    if sys.platform != 'win32':
712
 
        # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
713
 
        #
714
 
        # checking the paths and hardcoding the check for root is a bit gross,
715
 
        # but I don't see a cleaner way to find out the locations in a way
716
 
        # that's going to align with the hardcoded paths in apport.
717
 
        if os.geteuid() == 0:
718
 
            DATA_FILES += [
719
 
                ('/usr/share/apport/package-hooks',
720
 
                    ['apport/source_bzr.py']),
721
 
                ('/etc/apport/crashdb.conf.d/',
722
 
                    ['apport/bzr-crashdb.conf']),]
723
 
 
724
650
    # std setup
725
651
    ARGS = {'scripts': ['bzr'],
726
652
            'data_files': DATA_FILES,