Skip to content

Commit

Permalink
Merge pull request #35370 from dimagi/dm/upgrade-setuptools
Browse files Browse the repository at this point in the history
Upgrade setuptools and pip-tools
  • Loading branch information
millerdev authored Nov 15, 2024
2 parents 0fc0db5 + 1d842bb commit ec3df0d
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 18 deletions.
2 changes: 1 addition & 1 deletion docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function setup {
install -dm0755 -o cchq -g cchq ./artifacts
fi

pip-sync requirements/test-requirements.txt
pip-sync --user requirements/test-requirements.txt
pip check # make sure there are no incompatibilities in test-requirements.txt
python_preheat # preheat the python libs

Expand Down
15 changes: 8 additions & 7 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ botocore==1.27.96
# via
# boto3
# s3transfer
build==0.8.0
build==1.2.2.post1
# via pip-tools
bytecode==0.14.2
# via ddtrace
Expand Down Expand Up @@ -365,6 +365,7 @@ imagesize==1.4.1
# via sphinx
importlib-metadata==8.5.0
# via
# build
# markdown
# opentelemetry-api
# sphinx
Expand Down Expand Up @@ -476,8 +477,6 @@ parsimonious==0.10.0
# via pyseeyou
parso==0.8.3
# via jedi
pep517==0.10.0
# via build
pexpect==4.8.0
# via ipython
phonenumberslite==8.12.48
Expand All @@ -490,7 +489,7 @@ pillow==10.3.0
# via
# -r base-requirements.in
# reportlab
pip-tools==7.3.0
pip-tools==7.4.1
# via -r test-requirements.in
pluggy==1.5.0
# via pytest
Expand Down Expand Up @@ -578,6 +577,10 @@ pyphonetics==0.5.3
# via -r base-requirements.in
pypng==0.20220715.0
# via qrcode
pyproject-hooks==1.2.0
# via
# build
# pip-tools
pyrsistent==0.17.3
# via jsonschema
pyseeyou==1.0.2
Expand Down Expand Up @@ -775,8 +778,6 @@ text-unidecode==1.3
# via -r base-requirements.in
tinycss2==1.2.1
# via bleach
toml==0.10.2
# via pep517
tomli==2.0.1
# via
# build
Expand Down Expand Up @@ -871,7 +872,7 @@ zope-interface==6.1
# The following packages are considered to be unsafe in a requirements file:
pip==23.3
# via pip-tools
setuptools==72.1.0
setuptools==75.4.0
# via
# django-websocket-redis
# pip-tools
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ zope-interface==6.1
# via gevent

# The following packages are considered to be unsafe in a requirements file:
setuptools==72.1.0
setuptools==75.4.0
# via
# django-websocket-redis
# zope-event
Expand Down
2 changes: 1 addition & 1 deletion requirements/prod-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ zope-interface==6.1
# The following packages are considered to be unsafe in a requirements file:
pip==23.3
# via -r prod-requirements.in
setuptools==72.1.0
setuptools==75.4.0
# via
# django-websocket-redis
# zope-event
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ zope-interface==6.1
# via gevent

# The following packages are considered to be unsafe in a requirements file:
setuptools==72.1.0
setuptools==75.4.0
# via
# django-websocket-redis
# zope-event
Expand Down
15 changes: 8 additions & 7 deletions requirements/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ botocore==1.27.96
# via
# boto3
# s3transfer
build==0.8.0
build==1.2.2.post1
# via pip-tools
bytecode==0.14.2
# via ddtrace
Expand Down Expand Up @@ -326,6 +326,7 @@ idna==3.7
# yarl
importlib-metadata==8.5.0
# via
# build
# markdown
# opentelemetry-api
iniconfig==2.0.0
Expand Down Expand Up @@ -409,8 +410,6 @@ packaging==23.0
# pytest
parsimonious==0.10.0
# via pyseeyou
pep517==0.10.0
# via build
phonenumberslite==8.12.48
# via -r base-requirements.in
pickle5==0.0.11
Expand All @@ -419,7 +418,7 @@ pillow==10.3.0
# via
# -r base-requirements.in
# reportlab
pip-tools==7.3.0
pip-tools==7.4.1
# via -r test-requirements.in
pluggy==1.5.0
# via pytest
Expand Down Expand Up @@ -493,6 +492,10 @@ pyphonetics==0.5.3
# via -r base-requirements.in
pypng==0.20220715.0
# via qrcode
pyproject-hooks==1.2.0
# via
# build
# pip-tools
pyrsistent==0.17.3
# via jsonschema
pyseeyou==1.0.2
Expand Down Expand Up @@ -653,8 +656,6 @@ text-unidecode==1.3
# via -r base-requirements.in
tinycss2==1.2.1
# via bleach
toml==0.10.2
# via pep517
tomli==2.0.1
# via
# build
Expand Down Expand Up @@ -741,7 +742,7 @@ zope-interface==6.1
# The following packages are considered to be unsafe in a requirements file:
pip==23.3
# via pip-tools
setuptools==72.1.0
setuptools==75.4.0
# via
# django-websocket-redis
# pip-tools
Expand Down

0 comments on commit ec3df0d

Please sign in to comment.