Skip to content

Commit a5becad

Browse files
apollo13jezdez
apollo13
authored and
jezdez
committed
Fixed django#19252 -- Added support for wheel packages.
Signed-off-by: Jannis Leidel <[email protected]>
1 parent ce45240 commit a5becad

6 files changed

Lines changed: 69 additions & 56 deletions

File tree

‎MANIFEST.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ recursive-include docs *
1010
recursive-include scripts *
1111
recursive-include extras *
1212
recursive-include tests *
13+
recursive-include django/conf/app_template *
1314
recursive-include django/conf/locale *
15+
recursive-include django/conf/project_template *
1416
recursive-include django/contrib/*/locale *
1517
recursive-include django/contrib/admin/templates *
1618
recursive-include django/contrib/admin/static *

‎django/bin/__init__.py‎

Whitespace-only changes.

‎docs/internals/howto-release-django.txt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@ OK, this is the fun part, where we actually push out a release!
175175

176176
#. Make sure you have an absolutely clean tree by running ``git clean -dfx``.
177177

178-
#. Run ``python setup.py sdist`` to generate the release package. This will
179-
create the release package in a ``dist/`` directory.
178+
#. Run ``make -f extras/Makefile`` to generate the release packages. This will
179+
create the release packages in a ``dist/`` directory.
180180

181-
#. Generate the hashes of the release package::
181+
#. Generate the hashes of the release packages::
182182

183-
$ md5sum dist/Django-<version>.tar.gz
184-
$ sha1sum dist/Django-<version>.tar.gz
183+
$ md5sum dist/Django-*
184+
$ sha1sum dist/Django-*
185185

186186
*FIXME: perhaps we should switch to sha256?*
187187

@@ -221,6 +221,9 @@ Now you're ready to actually put the release out there. To do this:
221221
$ mktmpenv
222222
$ pip install https://www.djangoproject.com/m/releases/1.5/Django-1.5.1.tar.gz
223223
$ deactivate
224+
$ mktmpenv
225+
$ pip install https://www.djangoproject.com/m/releases/1.5/Django-1.5.1-py2.py3-none-any.whl
226+
$ deactivate
224227

225228
This just tests that the tarballs are available (i.e. redirects are up) and
226229
that they install correctly, but it'll catch silly mistakes.

‎extras/Makefile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
all: sdist bdist_wheel
2+
3+
sdist:
4+
python setup.py sdist
5+
6+
bdist_wheel:
7+
python -c "import setuptools;__file__='setup.py';exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))" bdist_wheel
8+
9+
.PHONY : sdist bdist_wheel

‎setup.cfg‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@
22
doc_files = docs extras AUTHORS INSTALL LICENSE README.rst
33
install-script = scripts/rpm-install.sh
44

5+
[metadata]
6+
license-file = LICENSE
7+
8+
[wheel]
9+
universal = 1 # use py2.py3 tag for pure-python dist

‎setup.py‎

Lines changed: 45 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
from distutils.core import setup
2-
from distutils.command.install_data import install_data
3-
from distutils.command.install import INSTALL_SCHEMES
4-
from distutils.sysconfig import get_python_lib
51
import os
62
import sys
73

4+
from distutils.core import setup
5+
from distutils.sysconfig import get_python_lib
6+
87
# Warn if we are installing over top of an existing installation. This can
98
# cause issues where files that were deleted from a more recent Django are
109
# still present in site-packages. See #18115.
@@ -23,28 +22,11 @@
2322
overlay_warning = True
2423
break
2524

26-
class osx_install_data(install_data):
27-
# On MacOS, the platform-specific lib dir is /System/Library/Framework/Python/.../
28-
# which is wrong. Python 2.5 supplied with MacOS 10.5 has an Apple-specific fix
29-
# for this in distutils.command.install_data#306. It fixes install_lib but not
30-
# install_data, which is why we roll our own install_data class.
31-
32-
def finalize_options(self):
33-
# By the time finalize_options is called, install.install_lib is set to the
34-
# fixed directory, so we set the installdir to install_lib. The
35-
# install_data class uses ('install_data', 'install_dir') instead.
36-
self.set_undefined_options('install', ('install_lib', 'install_dir'))
37-
install_data.finalize_options(self)
38-
39-
if sys.platform == "darwin":
40-
cmdclasses = {'install_data': osx_install_data}
41-
else:
42-
cmdclasses = {'install_data': install_data}
4325

4426
def fullsplit(path, result=None):
4527
"""
46-
Split a pathname into components (the opposite of os.path.join) in a
47-
platform-neutral way.
28+
Split a pathname into components (the opposite of os.path.join)
29+
in a platform-neutral way.
4830
"""
4931
if result is None:
5032
result = []
@@ -55,15 +37,23 @@ def fullsplit(path, result=None):
5537
return result
5638
return fullsplit(head, [tail] + result)
5739

58-
# Tell distutils not to put the data_files in platform-specific installation
59-
# locations. See here for an explanation:
60-
# http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
61-
for scheme in INSTALL_SCHEMES.values():
62-
scheme['data'] = scheme['purelib']
40+
41+
EXCLUDE_FROM_PACKAGES = ['django.conf.project_template',
42+
'django.conf.app_template',
43+
'django.bin']
44+
45+
46+
def is_package(package_name):
47+
for pkg in EXCLUDE_FROM_PACKAGES:
48+
if package_name.startswith(pkg):
49+
return False
50+
return True
51+
6352

6453
# Compile the list of packages available, because distutils doesn't have
6554
# an easy way to do this.
66-
packages, data_files = [], []
55+
packages, package_data = [], {}
56+
6757
root_dir = os.path.dirname(__file__)
6858
if root_dir != '':
6959
os.chdir(root_dir)
@@ -72,33 +62,37 @@ def fullsplit(path, result=None):
7262
for dirpath, dirnames, filenames in os.walk(django_dir):
7363
# Ignore PEP 3147 cache dirs and those whose names start with '.'
7464
dirnames[:] = [d for d in dirnames if not d.startswith('.') and d != '__pycache__']
75-
if '__init__.py' in filenames:
76-
packages.append('.'.join(fullsplit(dirpath)))
65+
parts = fullsplit(dirpath)
66+
package_name = '.'.join(parts)
67+
if '__init__.py' in filenames and is_package(package_name):
68+
packages.append(package_name)
7769
elif filenames:
78-
data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
70+
relative_path = []
71+
while '.'.join(parts) not in packages:
72+
relative_path.append(parts.pop())
73+
relative_path.reverse()
74+
path = os.path.join(*relative_path)
75+
package_files = package_data.setdefault('.'.join(parts), [])
76+
package_files.extend([os.path.join(path, f) for f in filenames])
7977

80-
# Small hack for working with bdist_wininst.
81-
# See http://mail.python.org/pipermail/distutils-sig/2004-August/004134.html
82-
if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst':
83-
for file_info in data_files:
84-
file_info[0] = '\\PURELIB\\%s' % file_info[0]
8578

8679
# Dynamically calculate the version based on django.VERSION.
8780
version = __import__('django').get_version()
8881

82+
8983
setup(
90-
name = "Django",
91-
version = version,
92-
url = 'http://www.djangoproject.com/',
93-
author = 'Django Software Foundation',
94-
author_email = '[email protected]',
95-
description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
96-
license = "BSD",
97-
packages = packages,
98-
cmdclass = cmdclasses,
99-
data_files = data_files,
100-
scripts = ['django/bin/django-admin.py'],
101-
classifiers = [
84+
name='Django',
85+
version=version,
86+
url='http://www.djangoproject.com/',
87+
author='Django Software Foundation',
88+
author_email='[email protected]',
89+
description=('A high-level Python Web framework that encourages '
90+
'rapid development and clean, pragmatic design.'),
91+
license='BSD',
92+
packages=packages,
93+
package_data=package_data,
94+
scripts=['django/bin/django-admin.py'],
95+
classifiers=[
10296
'Development Status :: 5 - Production/Stable',
10397
'Environment :: Web Environment',
10498
'Framework :: Django',
@@ -115,7 +109,7 @@ def fullsplit(path, result=None):
115109
'Topic :: Internet :: WWW/HTTP :: WSGI',
116110
'Topic :: Software Development :: Libraries :: Application Frameworks',
117111
'Topic :: Software Development :: Libraries :: Python Modules',
118-
],
112+
],
119113
)
120114

121115
if overlay_warning:
@@ -136,4 +130,4 @@ def fullsplit(path, result=None):
136130
137131
directory and re-install Django.
138132
139-
""" % { "existing_path": existing_path })
133+
""" % {"existing_path": existing_path})

0 commit comments

Comments
 (0)