Commit f4600355 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

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
parent aa5d307d

django/__init__.py

+14 −0
Original line number Diff line number Diff line
@@ -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

setup.py

+6 −8
Original line number Diff line number Diff line
@@ -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',