Skip to content

Commit 2161e14

Browse files
author
ubernostrum
committed
Change version calculation in setup.py to go with the new VERSION tuple
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent 4651f77 commit 2161e14

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

setup.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,9 @@ def fullsplit(path, result=None):
6666
file_info[0] = '\\PURELIB\\%s' % file_info[0]
6767

6868
# Dynamically calculate the version based on django.VERSION.
69-
version_tuple = __import__('django').VERSION
70-
if version_tuple[2] is not None:
71-
version = "%d.%d_%s" % version_tuple
72-
else:
73-
version = "%d.%d" % version_tuple[:2]
69+
version = __import__('django').get_version()
70+
if u'SVN' in version:
71+
version = ' '.join(version.split(' ')[:-1])
7472

7573
setup(
7674
name = "Django",

0 commit comments

Comments
 (0)