Skip to content

Commit

Permalink
Add wheel in venv creation
Browse files Browse the repository at this point in the history
The generated based venv from `python3.8 -m venv` vs. `virtualenv -p
python38` is different. This changes aims to address the differences.

It was introduced as part of the Python 3.8 migration.
ansible#8778
  • Loading branch information
Spredzy committed Apr 1, 2021
1 parent b9d92ff commit d9b71bd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ DEVEL_IMAGE_NAME ?= $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
SRC_ONLY_PKGS ?= cffi,pycparser,psycopg2,twilio,pycurl
# These should be upgraded in the AWX and Ansible venv before attempting
# to install the actual requirements
VENV_BOOTSTRAP ?= pip==19.3.1 setuptools==41.6.0
VENV_BOOTSTRAP ?= pip==19.3.1 setuptools==41.6.0 wheel==0.36.2

# Determine appropriate shasum command
UNAME_S := $(shell uname -s)
Expand Down
2 changes: 2 additions & 0 deletions requirements/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ azure-keyvault==1.1.0 # see UPGRADE BLOCKERs
channels
channels-redis>=3.1.0 # https://github.com/django/channels_redis/issues/212
cryptography<3.0.0
Cython<3
daphne
distro
django==2.2.16 # see UPGRADE BLOCKERs
Expand Down Expand Up @@ -55,5 +56,6 @@ twilio
twisted[tls]>=20.3.0 # CVE-2020-10108, CVE-2020-10109
uWSGI
uwsgitop
wheel
pip==19.3.1 # see UPGRADE BLOCKERs
setuptools==41.6.0 # see UPGRADE BLOCKERs
5 changes: 5 additions & 0 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ cryptography==2.9.2
# pyopenssl
# service-identity
# social-auth-core
Cython==0.29.22
# via
# -r /awx_devel/requirements/requirements.in
daphne==2.4.1
# via
# -r /awx_devel/requirements/requirements.in
Expand Down Expand Up @@ -412,3 +415,5 @@ setuptools==41.6.0
# markdown
# python-daemon
# zope.interface
wheel==0.36.2
# via -r /awx_devel/requirements/requirements.in

0 comments on commit d9b71bd

Please sign in to comment.