Skip to content

Commit

Permalink
Merge pull request #50 from open-craft/jenkins/upgrade-python-require…
Browse files Browse the repository at this point in the history
…ments-85e98ec

Python Requirements Update
  • Loading branch information
Agrendalath authored Jul 17, 2023
2 parents 85e98ec + 6b94b6f commit 071f42c
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ test: clean ## run tests in the current virtualenv
test-all: unit quality pii_check ## run tests on every supported Python/Django combination

# Define PIP_COMPILE_OPTS=-v to get more information during make upgrade.
PIP_COMPILE = pip-compile --upgrade --resolver=backtracking $(PIP_COMPILE_OPTS)
PIP_COMPILE = pip-compile --upgrade $(PIP_COMPILE_OPTS)

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
Expand Down
4 changes: 3 additions & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ asgiref==3.7.2
bleach[css]==6.0.0
# via -r requirements/base.in
django==3.2.20
# via -r requirements/base.in
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
fs==2.4.16
# via xblock
lxml==4.9.3
Expand Down
5 changes: 3 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ filelock==3.12.2
# virtualenv
packaging==23.1
# via tox
platformdirs==3.8.1
platformdirs==3.9.1
# via virtualenv
pluggy==1.2.0
# via tox
Expand All @@ -24,9 +24,10 @@ tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
virtualenv==20.23.1
virtualenv==20.24.0
# via tox
22 changes: 13 additions & 9 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ binaryornot==0.4.4
# cookiecutter
bleach[css]==6.0.0
# via -r requirements/quality.txt
boto3==1.28.1
boto3==1.28.3
# via
# -r requirements/quality.txt
# fs-s3fs
botocore==1.31.1
botocore==1.31.3
# via
# -r requirements/quality.txt
# boto3
Expand All @@ -52,7 +52,7 @@ charset-normalizer==3.2.0
# via
# -r requirements/quality.txt
# requests
click==8.1.4
click==8.1.5
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
Expand All @@ -69,7 +69,7 @@ code-annotations==1.3.0
# via
# -r requirements/quality.txt
# edx-lint
cookiecutter==2.2.0
cookiecutter==2.2.3
# via
# -r requirements/quality.txt
# xblock-sdk
Expand All @@ -87,6 +87,7 @@ distlib==0.3.6
# virtualenv
django==3.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/quality.txt
# edx-i18n-tools
# openedx-django-pyfs
Expand Down Expand Up @@ -164,16 +165,17 @@ mccabe==0.7.0
# via
# -r requirements/quality.txt
# pylint
mock==5.0.2
mock==5.1.0
# via -r requirements/quality.txt
openedx-django-pyfs==3.3.0
openedx-django-pyfs==3.4.0
# via
# -r requirements/quality.txt
# xblock
packaging==23.1
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# build
# pytest
# tox
Expand All @@ -185,9 +187,9 @@ pbr==5.11.1
# via
# -r requirements/quality.txt
# stevedore
pip-tools==6.14.0
pip-tools==7.0.0
# via -r requirements/pip-tools.txt
platformdirs==3.8.1
platformdirs==3.9.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down Expand Up @@ -319,6 +321,7 @@ tomli==2.0.1
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# build
# coverage
# pip-tools
Expand All @@ -332,6 +335,7 @@ tomlkit==0.11.8
# pylint
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.txt
# tox-battery
tox-battery==0.6.1
Expand All @@ -347,7 +351,7 @@ urllib3==1.26.16
# -r requirements/quality.txt
# botocore
# requests
virtualenv==20.23.1
virtualenv==20.24.0
# via
# -r requirements/ci.txt
# tox
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#
build==0.10.0
# via pip-tools
click==8.1.4
click==8.1.5
# via pip-tools
packaging==23.1
# via build
pip-tools==6.14.0
pip-tools==7.0.0
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.40.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.1.2
pip==23.2
# via -r requirements/pip.in
setuptools==68.0.0
# via -r requirements/pip.in
15 changes: 8 additions & 7 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ binaryornot==0.4.4
# cookiecutter
bleach[css]==6.0.0
# via -r requirements/test.txt
boto3==1.28.1
boto3==1.28.3
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.31.1
botocore==1.31.3
# via
# -r requirements/test.txt
# boto3
Expand All @@ -47,7 +47,7 @@ charset-normalizer==3.2.0
# via
# -r requirements/test.txt
# requests
click==8.1.4
click==8.1.5
# via
# -r requirements/test.txt
# click-log
Expand All @@ -60,7 +60,7 @@ code-annotations==1.3.0
# via
# -r requirements/test.txt
# edx-lint
cookiecutter==2.2.0
cookiecutter==2.2.3
# via
# -r requirements/test.txt
# xblock-sdk
Expand All @@ -72,6 +72,7 @@ dill==0.3.6
# via pylint
django==3.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
# edx-i18n-tools
# openedx-django-pyfs
Expand Down Expand Up @@ -140,9 +141,9 @@ markupsafe==2.1.3
# xblock
mccabe==0.7.0
# via pylint
mock==5.0.2
mock==5.1.0
# via -r requirements/test.txt
openedx-django-pyfs==3.3.0
openedx-django-pyfs==3.4.0
# via
# -r requirements/test.txt
# xblock
Expand All @@ -158,7 +159,7 @@ pbr==5.11.1
# via
# -r requirements/test.txt
# stevedore
platformdirs==3.8.1
platformdirs==3.9.1
# via pylint
pluggy==1.2.0
# via
Expand Down
13 changes: 7 additions & 6 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ asgiref==3.7.2
binaryornot==0.4.4
# via cookiecutter
# via -r requirements/base.txt
boto3==1.28.1
boto3==1.28.3
# via fs-s3fs
botocore==1.31.1
botocore==1.31.3
# via
# boto3
# s3transfer
Expand All @@ -29,17 +29,18 @@ chardet==5.1.0
# via binaryornot
charset-normalizer==3.2.0
# via requests
click==8.1.4
click==8.1.5
# via
# code-annotations
# cookiecutter
code-annotations==1.3.0
# via -r requirements/test.in
cookiecutter==2.2.0
cookiecutter==2.2.3
# via xblock-sdk
coverage[toml]==7.2.7
# via pytest-cov
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
# edx-i18n-tools
# openedx-django-pyfs
Expand Down Expand Up @@ -87,9 +88,9 @@ markupsafe==2.1.3
# jinja2
# mako
# xblock
mock==5.0.2
mock==5.1.0
# via -r requirements/test.in
openedx-django-pyfs==3.3.0
openedx-django-pyfs==3.4.0
# via xblock
packaging==23.1
# via pytest
Expand Down

0 comments on commit 071f42c

Please sign in to comment.