1
=== modified file 'setup.py'
2
--- setup.py	2011-11-25 18:24:10 +0000
3
+++ setup.py	2012-02-13 18:45:10 +0000
4
@@ -1,62 +1,13 @@
5
1
#!/usr/bin/env python
1
#!/usr/bin/env python
6
2
"""Distutils installer for testtools."""
2
"""Distutils installer for testtools."""
7
3
3
9
4
from distutils.core import setup
4
from setuptools import setup
10
5
import email
5
import email
11
6
import os
6
import os
12
7
7
13
8
import testtools
8
import testtools
14
9
9
15
10
10
16
11
def get_revno():
17
12
    import bzrlib.errors
18
13
    import bzrlib.workingtree
19
14
    try:
20
15
        t = bzrlib.workingtree.WorkingTree.open_containing(__file__)[0]
21
16
    except (bzrlib.errors.NotBranchError, bzrlib.errors.NoWorkingTree):
22
17
        return None
23
18
    else:
24
19
        return t.branch.revno()
25
20
26
21
27
22
def get_version_from_pkg_info():
28
23
    """Get the version from PKG-INFO file if we can."""
29
24
    pkg_info_path = os.path.join(os.path.dirname(__file__), 'PKG-INFO')
30
25
    try:
31
26
        pkg_info_file = open(pkg_info_path, 'r')
32
27
    except (IOError, OSError):
33
28
        return None
34
29
    try:
35
30
        pkg_info = email.message_from_file(pkg_info_file)
36
31
    except email.MessageError:
37
32
        return None
38
33
    return pkg_info.get('Version', None)
39
34
40
35
41
36
def get_version():
42
37
    """Return the version of testtools that we are building."""
43
38
    version = '.'.join(
44
39
        str(component) for component in testtools.__version__[0:3])
45
40
    phase = testtools.__version__[3]
46
41
    if phase == 'final':
47
42
        return version
48
43
    pkg_info_version = get_version_from_pkg_info()
49
44
    if pkg_info_version:
50
45
        return pkg_info_version
51
46
    revno = get_revno()
52
47
    if revno is None:
53
48
        # Apparently if we just say "snapshot" then distribute won't accept it
54
49
        # as satisfying versioned dependencies. This is a problem for the
55
50
        # daily build version.
56
51
        return "snapshot-%s" % (version,)
57
52
    if phase == 'alpha':
58
53
        # No idea what the next version will be
59
54
        return 'next-r%s' % revno
60
55
    else:
61
56
        # Preserve the version number but give it a revno prefix
62
57
        return version + '-r%s' % revno
63
58
64
59
65
60
def get_long_description():
11
def get_long_description():
66
61
    manual_path = os.path.join(
12
    manual_path = os.path.join(
67
62
        os.path.dirname(__file__), 'doc/overview.rst')
13
        os.path.dirname(__file__), 'doc/overview.rst')
68
@@ -70,7 +21,8 @@
69
70
      description=('Extensions to the Python standard library unit testing '
21
      description=('Extensions to the Python standard library unit testing '
70
71
                   'framework'),
22
                   'framework'),
71
72
      long_description=get_long_description(),
23
      long_description=get_long_description(),
73
73
      version=get_version(),
24
      version=":versiontools:testtools:",
74
74
      classifiers=["License :: OSI Approved :: MIT License"],
25
      classifiers=["License :: OSI Approved :: MIT License"],
75
26
      setup_requires=['versiontools'],
76
75
      packages=['testtools', 'testtools.testresult', 'testtools.tests'],
27
      packages=['testtools', 'testtools.testresult', 'testtools.tests'],
77
76
      cmdclass={'test': testtools.TestCommand})
28
      cmdclass={'test': testtools.TestCommand})
Status:	Work in progress
Proposed branch:	lp:~zyga/testtools/use-versiontools
Merge into:	lp:~testtools-committers/testtools/trunk
Diff against target:	77 lines (+3/-51) 1 file modified setup.py (+3/-51)
To merge this branch:	bzr merge lp:~zyga/testtools/use-versiontools
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Robert Collins		2012-02-13	Needs Information on 2012-05-02
Review via email: mp+92824@code.launchpad.net