Skip to content

Commit

Permalink
Revert change to virtualenv version
Browse files Browse the repository at this point in the history
  • Loading branch information
asset-web committed Jul 2, 2024
1 parent a84b611 commit 0a8fe8d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ ARG REQUIREMENTS_FILE='requirements.txt'

ENV PYTHONDONTWRITEBYTECODE=1
ENV PYTHONUNBUFFERED=1
ENV PIP_VERSION='24.0'
ENV PIP_VERSION='24.1.1'
ENV SETUPTOOLS_VERSION='70.2.0'
ENV PIP_TOOLS_VERSION='7.4.1'
# As per RHEL installation
ENV VE_VERSION='15.1.0'
# NB: Version 15.1.0 is installed on RHEL
ENV VE_VERSION='20.26.3'

# Update system packages and install dependencies
RUN apt update -y && \
Expand Down
2 changes: 1 addition & 1 deletion deploy/fabfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# Tools not handled by pip-tools and/or requirements installs using pip
# Also update pip version in tests/build-test-env.sh and Dockerfile
PIP_VERSION = '24.0'
PIP_VERSION = '24.1.1'
SETUPTOOLS_VERSION = '70.2.0'
PIP_TOOLS_VERSION = '7.4.1'

Expand Down
4 changes: 2 additions & 2 deletions tests/build-test-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ mkdir -p var/tmp
echo "Check the version of pip that is installed"
pip3 -V
echo "Ensure using a consistent version of pip as per on premises CI server"
pip3 install -U pip==24.0
pip3 install -U pip==24.1.1
pip3 -V

echo "Install Fabric"
pip3 install fabric==1.15.0 # NB: v1.15.0 supports Python 2, & 3.6, 3.7, & 3.8

echo "Install virtualenv"
pip3 install virtualenv==15.1.0 # As per RHEL installation
pip3 install virtualenv==20.26.3 # NB: Version 15.1.0 is installed on RHEL

echo "Install wheel"
sudo apt-get install -y python3-wheel-whl
Expand Down

0 comments on commit 0a8fe8d

Please sign in to comment.