diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-01-07 19:05:29 +0000 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-01-07 19:05:29 +0000 |
| commit | f46003559cc59d27df7a4926001fd10b84f4ab22 (patch) | |
| tree | 220a0a0805bba9e8dec985e3d4e7c01e6814abad | |
| parent | aa5d307da65cb0933172c9640efeb44d94323be5 (diff) | |
Fixed #17491 -- Honored the version number format expected by distutils. Fixed #11236 too.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/__init__.py | 14 | ||||
| -rw-r--r-- | setup.py | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/django/__init__.py b/django/__init__.py index e790da37f3..6467c033bb 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -14,3 +14,17 @@ def get_version(): if svn_rev != u'SVN-unknown': version = "%s %s" % (version, svn_rev) return version + +def get_distutils_version(): + # Distutils expects a version number formatted as major.minor[.patch][sub] + parts = 5 + if VERSION[3] == 'final': + parts = 3 + if VERSION[2] == 0: + parts = 2 + version = VERSION[:parts] + version = [str(x)[0] for x in version] # ['1', '4', '0', 'a', '1'] + if parts > 2: + version[2:] = [''.join(version[2:])] # ['1', '4', '0a1'] + version = '.'.join(version) # '1.4.0a1' + return version @@ -17,10 +17,10 @@ class osx_install_data(install_data): self.set_undefined_options('install', ('install_lib', 'install_dir')) install_data.finalize_options(self) -if sys.platform == "darwin": - cmdclasses = {'install_data': osx_install_data} -else: - cmdclasses = {'install_data': install_data} +if sys.platform == "darwin": + cmdclasses = {'install_data': osx_install_data} +else: + cmdclasses = {'install_data': install_data} def fullsplit(path, result=None): """ @@ -66,13 +66,11 @@ if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst': file_info[0] = '\\PURELIB\\%s' % file_info[0] # Dynamically calculate the version based on django.VERSION. -version = __import__('django').get_version() -if u'SVN' in version: - version = ' '.join(version.split(' ')[:-1]) +version = __import__('django').get_distutils_version() setup( name = "Django", - version = version.replace(' ', '-'), + version = version, url = 'http://www.djangoproject.com/', author = 'Django Software Foundation', author_email = 'foundation@djangoproject.com', |