From 468097ba39cc7e34f9ea921d1250a6d565cd36f4 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Wed, 9 Dec 2020 17:29:46 -0500 Subject: [PATCH] Remove Django from wheels tarball Wheels added to the wheels.cfg file result in modification to the upper-constraints.txt included in the wheels tarball to point to the explicit wheel added by the wheels.cfg. The inclusion of Django resulted in an upper-constraints.txt entry locking the version to 2.1.5. However, the openstack/horizon requirements.txt file includes the following: Django>=2.2,<3.0 This results in a conflict between the constraints and requirements. Recent updates to the pip resolver exposed the conflict, and pip was unable to find a version of Django to fit both. Since the Django entry was just downloading a pre-built wheel, as opposed to building an appropriate wheel from tarball, this update removes the entry altogether to avoid creating this conflict. Change-Id: I870a72f312c781a9b000fc98c4ed104c22469ebd Closes-Bug: 1907290 Signed-off-by: Don Penney --- build-tools/build-wheels/docker/stable-wheels.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/build-tools/build-wheels/docker/stable-wheels.cfg b/build-tools/build-wheels/docker/stable-wheels.cfg index addac690..b547ccdb 100644 --- a/build-tools/build-wheels/docker/stable-wheels.cfg +++ b/build-tools/build-wheels/docker/stable-wheels.cfg @@ -17,7 +17,6 @@ cmd2-0.8.9-py2.py3-none-any.whl|pypi|https://files.pythonhosted.org/packages/e9/ construct-2.8.22-py3-none-any.whl|tar|https://files.pythonhosted.org/packages/e5/c6/3e3aeef38bb0c27364af3d21493d9690c7c3925f298559bca3c48b7c9419/construct-2.8.22.tar.gz|construct-2.8.22 crc16-0.1.1-cp36-cp36m-linux_x86_64.whl|tar|https://files.pythonhosted.org/packages/a6/e0/70a44c4385f2b33df82e518005aae16b5c1feaf082c73c0acebe3426fc0a/crc16-0.1.1.tar.gz|crc16-0.1.1|fix_setup demjson-2.2.4-py3-none-any.whl|tar|https://files.pythonhosted.org/packages/96/67/6db789e2533158963d4af689f961b644ddd9200615b8ce92d6cad695c65a/demjson-2.2.4.tar.gz|demjson-2.2.4|fix_setup -Django-2.1.5-py3-none-any.whl|pypi|https://files.pythonhosted.org/packages/36/50/078a42b4e9bedb94efd3e0278c0eb71650ed9672cdc91bd5542953bec17f/Django-2.1.5-py3-none-any.whl django_debreach-2.0.1-py3-none-any.whl|pypi|https://files.pythonhosted.org/packages/2a/92/8c363cf5d1ee33d4c3b999b41c127c5cd3c64d4c20aa47bdfb6c386c9309/django_debreach-2.0.1-py3-none-any.whl django_floppyforms-1.8.0-py2.py3-none-any.whl|pypi|https://files.pythonhosted.org/packages/a9/d2/498b883ac309b56b70c26877974bd50927615dd3f6433f5463e2668b1128/django_floppyforms-1.8.0-py2.py3-none-any.whl django_pyscss-2.0.2-py3-none-any.whl|tar|https://files.pythonhosted.org/packages/4b/7f/d771802305184aac6010826f60a0b2ecaa3f57d19ab0e405f0c8db07e809/django-pyscss-2.0.2.tar.gz|django-pyscss-2.0.2