Skip to content

Commit cfc8c46

Browse files
committed
downgrade virtualenv to <20.22.0
so that we keep Python 2.7 and 3.6 support until those are deprecated.
1 parent f0f8684 commit cfc8c46

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

Diff for: Dockerfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11-slim-bullseye
1+
FROM python:3.10-slim-bullseye
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \
@@ -26,6 +26,11 @@ ENV PATH="$PATH:/root/.asdf/shims"
2626

2727
WORKDIR /opt/app
2828

29+
COPY .tool-versions .
30+
31+
RUN asdf plugin-add python
32+
RUN asdf install python
33+
2934
ARG REQUIREMENTS_FILE=requirements-test.txt
3035

3136
COPY $REQUIREMENTS_FILE .
@@ -34,8 +39,5 @@ RUN pip install pip-tools==7.3.0 && \
3439

3540
COPY . .
3641

37-
RUN asdf plugin-add python
38-
RUN asdf install python
39-
4042
ENV PYTHONDONTWRITEBYTECODE=1
4143
ENV PYTHONUNBUFFERED=1

Diff for: requirements-test.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ oauthlib==1.1.2
55
pytest==7.4.3
66
requests-oauthlib==0.6.2
77
requests==2.11.0
8-
tox==4.11.4
9-
virtualenv-asdf
8+
tox==4.4.12
9+
virtualenv<20.22.0

Diff for: requirements-test.txt

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
55
# pip-compile requirements-test.in
66
#
7-
asdf-inspect==0.1.0
8-
# via virtualenv-asdf
97
cachetools==5.3.2
108
# via tox
119
chardet==5.2.0
@@ -16,6 +14,8 @@ distlib==0.3.7
1614
# via virtualenv
1715
django==1.10
1816
# via -r requirements-test.in
17+
exceptiongroup==1.2.0
18+
# via pytest
1919
filelock==3.13.1
2020
# via
2121
# tox
@@ -37,7 +37,7 @@ packaging==23.2
3737
# tox
3838
pbr==6.0.0
3939
# via mock
40-
platformdirs==4.0.0
40+
platformdirs==3.11.0
4141
# via
4242
# tox
4343
# virtualenv
@@ -62,11 +62,14 @@ six==1.16.0
6262
# freezegun
6363
# mock
6464
# python-dateutil
65-
tox==4.11.4
66-
# via -r requirements-test.in
67-
virtualenv==20.24.7
65+
tomli==2.0.1
6866
# via
67+
# pyproject-api
68+
# pytest
6969
# tox
70-
# virtualenv-asdf
71-
virtualenv-asdf==0.1.0
70+
tox==4.4.12
7271
# via -r requirements-test.in
72+
virtualenv==20.21.1
73+
# via
74+
# -r requirements-test.in
75+
# tox

0 commit comments

Comments
 (0)