From e044f1c59258260f8c8b4ce76f16e9349a933ec1 Mon Sep 17 00:00:00 2001 From: OpenCraft Requirements Bot Date: Mon, 17 Jul 2023 02:26:09 +0200 Subject: [PATCH 1/2] chore: Updating Python Requirements --- requirements/base.txt | 4 +++- requirements/ci.txt | 5 +++-- requirements/dev.txt | 31 +++++++++++++++++++++---------- requirements/pip-tools.txt | 4 ++-- requirements/pip.txt | 2 +- requirements/quality.txt | 15 ++++++++------- requirements/test.txt | 13 +++++++------ requirements/workbench.txt | 17 ++++++++++------- 8 files changed, 55 insertions(+), 36 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index cf31e65b..cfa89282 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -9,7 +9,9 @@ appdirs==1.4.4 asgiref==3.7.2 # via django 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 edx-opaque-keys==2.3.0 # via -r requirements/base.in fs==2.4.16 diff --git a/requirements/ci.txt b/requirements/ci.txt index e4650808..fee68c11 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -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 @@ -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 diff --git a/requirements/dev.txt b/requirements/dev.txt index 836da3cc..3780cfcd 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -30,13 +30,15 @@ binaryornot==0.4.4 # -r requirements/workbench.txt # cookiecutter bok-choy==0.7.1 - # via -r requirements/workbench.txt -boto3==1.28.1 + # via + # -c requirements/constraints.txt + # -r requirements/workbench.txt +boto3==1.28.3 # via # -r requirements/quality.txt # -r requirements/workbench.txt # fs-s3fs -botocore==1.31.1 +botocore==1.31.3 # via # -r requirements/quality.txt # -r requirements/workbench.txt @@ -61,9 +63,10 @@ charset-normalizer==3.2.0 # -r requirements/quality.txt # -r requirements/workbench.txt # requests -click==8.1.4 +click==8.1.5 # via # -r requirements/pip-tools.txt + # -r requirements/quality.txt # -r requirements/workbench.txt # click-log # code-annotations @@ -79,7 +82,7 @@ code-annotations==1.3.0 # -r requirements/quality.txt # -r requirements/workbench.txt # edx-lint -cookiecutter==2.2.0 +cookiecutter==2.2.3 # via # -r requirements/quality.txt # -r requirements/workbench.txt @@ -103,6 +106,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 # -r requirements/workbench.txt # django-appconf @@ -210,7 +214,7 @@ mccabe==0.7.0 # via # -r requirements/quality.txt # pylint -mock==5.0.2 +mock==5.1.0 # via # -r requirements/quality.txt # -r requirements/workbench.txt @@ -224,14 +228,16 @@ nose==1.3.7 # via # -r requirements/workbench.txt # needle -openedx-django-pyfs==3.3.0 +openedx-django-pyfs==3.4.0 # via # -r requirements/quality.txt # -r requirements/workbench.txt # xblock packaging==23.1 # via + # -r requirements/ci.txt # -r requirements/pip-tools.txt + # -r requirements/quality.txt # -r requirements/workbench.txt # build # pytest @@ -250,9 +256,9 @@ pillow==10.0.0 # via # -r requirements/workbench.txt # needle -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 @@ -260,6 +266,7 @@ platformdirs==3.8.1 # virtualenv pluggy==1.2.0 # via + # -r requirements/ci.txt # -r requirements/quality.txt # -r requirements/workbench.txt # pytest @@ -376,6 +383,7 @@ simplejson==3.19.1 # xblock-utils six==1.16.0 # via + # -r requirements/ci.txt # -r requirements/quality.txt # -r requirements/workbench.txt # bok-choy @@ -406,7 +414,9 @@ text-unidecode==1.3 # python-slugify tomli==2.0.1 # via + # -r requirements/ci.txt # -r requirements/pip-tools.txt + # -r requirements/quality.txt # -r requirements/workbench.txt # build # coverage @@ -421,6 +431,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 @@ -439,7 +450,7 @@ urllib3==1.26.16 # botocore # requests # selenium -virtualenv==20.23.1 +virtualenv==20.24.0 # via # -r requirements/ci.txt # tox diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index e47ed482..81f46a76 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -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 diff --git a/requirements/pip.txt b/requirements/pip.txt index fa19e6f0..bd9fb553 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -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 diff --git a/requirements/quality.txt b/requirements/quality.txt index 12b9da3c..1224a903 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -24,11 +24,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -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 @@ -45,7 +45,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 @@ -58,7 +58,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 @@ -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 # django-appconf # django-statici18n @@ -150,9 +151,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 @@ -168,7 +169,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 diff --git a/requirements/test.txt b/requirements/test.txt index 67abde62..d06897ba 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -16,9 +16,9 @@ asgiref==3.7.2 # django binaryornot==0.4.4 # via cookiecutter -boto3==1.28.1 +boto3==1.28.3 # via fs-s3fs -botocore==1.31.1 +botocore==1.31.3 # via # boto3 # s3transfer @@ -28,19 +28,20 @@ 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 ddt==1.6.0 # via -r requirements/test.in # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # django-appconf # django-statici18n @@ -96,9 +97,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 diff --git a/requirements/workbench.txt b/requirements/workbench.txt index 2930cece..ad3d9909 100644 --- a/requirements/workbench.txt +++ b/requirements/workbench.txt @@ -21,12 +21,14 @@ binaryornot==0.4.4 # -r requirements/test.txt # cookiecutter bok-choy==0.7.1 - # via -r requirements/workbench.in -boto3==1.28.1 + # via + # -c requirements/constraints.txt + # -r requirements/workbench.in +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 @@ -43,14 +45,14 @@ charset-normalizer==3.2.0 # via # -r requirements/test.txt # requests -click==8.1.4 +click==8.1.5 # via # -r requirements/test.txt # code-annotations # cookiecutter code-annotations==1.3.0 # via -r requirements/test.txt -cookiecutter==2.2.0 +cookiecutter==2.2.3 # via # -r requirements/test.txt # xblock-sdk @@ -62,6 +64,7 @@ ddt==1.6.0 # via -r requirements/test.txt django==3.2.20 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-appconf # django-statici18n @@ -133,7 +136,7 @@ markupsafe==2.1.3 # jinja2 # mako # xblock -mock==5.0.2 +mock==5.1.0 # via -r requirements/test.txt mysqlclient==2.2.0 # via -r requirements/workbench.in @@ -141,7 +144,7 @@ needle==0.5.0 # via bok-choy nose==1.3.7 # via needle -openedx-django-pyfs==3.3.0 +openedx-django-pyfs==3.4.0 # via # -r requirements/test.txt # xblock From 1ed09c306fb6e3258a8bf8c6a48c0d6defa621f5 Mon Sep 17 00:00:00 2001 From: Piotr Surowiec Date: Mon, 17 Jul 2023 11:04:30 +0200 Subject: [PATCH 2/2] chore: remove redundant pip-tools resolver `--resolver=backtracking` is the default option since `pip-tools==7.0.0`. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e6eaf4f0..9eeb2031 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ requirements_python: piptools ## install all requirements locally pip-sync requirements/dev.txt requirements/private.* # 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