Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #17491 -- Honored the version number format expected by distuti…

…ls. Fixed #11236 too.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f46003559cc59d27df7a4926001fd10b84f4ab22 1 parent aa5d307
Aymeric Augustin aaugustin authored
Showing with 20 additions and 8 deletions.
  1. +14 −0 django/__init__.py
  2. +6 −8 setup.py
14 django/__init__.py
View
@@ -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
14 setup.py
View
@@ -17,10 +17,10 @@ def finalize_options(self):
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 @@ def fullsplit(path, result=None):
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',
Please sign in to comment.
Something went wrong with that request. Please try again.