Skip to content

Commit

Permalink
Update python dependencies and tweak docker config for improved perfo…
Browse files Browse the repository at this point in the history
…rmance
  • Loading branch information
asset-web committed Aug 15, 2024
1 parent c7fadfc commit 189d652
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-django-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
ports:
- 6379:6379
db:
image: mysql:8.0.36
image: mysql:8.0.39
ports:
- 3306:3306
env:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
9.7.0 Update Python packaging tools
Update Cypress
Update version of MySQL used in GitHub actions

9.6.1 Update Python dependencies

9.6.0 Apply Django security update
Expand Down
9 changes: 4 additions & 5 deletions deploy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
FROM python:3.8.19-slim

ARG REQUIREMENTS_FILE='requirements.txt'

ENV PYTHONDONTWRITEBYTECODE=1
ENV PYTHONUNBUFFERED=1
ENV PIP_VERSION='24.1.1'
ENV SETUPTOOLS_VERSION='70.2.0'
ENV PIP_VERSION='24.2'
ENV SETUPTOOLS_VERSION='72.2.0'
ENV PIP_TOOLS_VERSION='7.4.1'
# NB: Version 15.1.0 is installed on RHEL
ENV VE_VERSION='20.26.3'
ENV VE_VERSION='20.26.3'

# Update system packages and install dependencies
RUN apt update -y && \
Expand Down Expand Up @@ -49,6 +47,7 @@ WORKDIR /srv

VOLUME [ "/srv" ]

ARG REQUIREMENTS_FILE='requirements.txt'
COPY requirements/$REQUIREMENTS_FILE /srv
RUN pip install --no-deps -r /srv/$REQUIREMENTS_FILE

Expand Down
4 changes: 2 additions & 2 deletions deploy/fabfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

# 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.1.1'
SETUPTOOLS_VERSION = '70.2.0'
PIP_VERSION = '24.2'
SETUPTOOLS_VERSION = '72.2.0'
PIP_TOOLS_VERSION = '7.4.1'


Expand Down
2 changes: 1 addition & 1 deletion tests/build-test-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ 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.1.1
pip3 install -U pip==24.2
pip3 -V

echo "Install Fabric"
Expand Down

0 comments on commit 189d652

Please sign in to comment.