summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-07-13 16:03:51 -0400
committerTim Graham <timograham@gmail.com>2015-07-13 19:57:52 -0400
commit3b324970e390a6dc4c373db036d6f27300d7fded (patch)
treedb05dad24da57e9fed752960f2e196a551fb2fc5
parent3df6495c12b35adef9d8e77e33adf59a212c06bb (diff)
downloaddjango-3b324970e390a6dc4c373db036d6f27300d7fded.tar.gz
[1.4.x] Fixed #25119 -- Disabled wheel support.
-rw-r--r--docs/releases/1.4.22.txt9
-rw-r--r--docs/releases/index.txt1
-rw-r--r--setup.py3
3 files changed, 13 insertions, 0 deletions
diff --git a/docs/releases/1.4.22.txt b/docs/releases/1.4.22.txt
new file mode 100644
index 0000000000..3abbe5c60b
--- /dev/null
+++ b/docs/releases/1.4.22.txt
@@ -0,0 +1,9 @@
+===========================
+Django 1.4.22 release notes
+===========================
+
+*Under development*
+
+Django 1.4.22 fixes support with pip 7+ by disabling wheel support. Older
+versions of 1.4 would silently build a broken wheel when installed with those
+versions of pip.
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 095e952e80..3c2e6b1707 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -19,6 +19,7 @@ Final releases
.. toctree::
:maxdepth: 1
+ 1.4.22
1.4.21
1.4.20
1.4.19
diff --git a/setup.py b/setup.py
index f3f6f58eda..fd824d5e89 100644
--- a/setup.py
+++ b/setup.py
@@ -65,6 +65,9 @@ if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst':
for file_info in data_files:
file_info[0] = '\\PURELIB\\%s' % file_info[0]
+if 'bdist_wheel' in sys.argv:
+ raise RuntimeError('Django 1.4 does not support wheel. This error is safe to ignore.')
+
# Dynamically calculate the version based on django.VERSION.
version = __import__('django').get_version()