From 57947a8e2d14c659f5ed444bda634306820531f9 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Fri, 7 Nov 2025 18:42:15 +0500 Subject: [PATCH] fix: make upgrade to reinstall pip before running pip-compile --- Makefile | 1 + requirements/base.txt | 6 +++--- requirements/ci.txt | 37 ++++++++----------------------------- requirements/dev.txt | 6 +++--- requirements/docs.txt | 6 +++--- requirements/pip.txt | 4 +++- requirements/quality.txt | 22 +++++----------------- requirements/test.txt | 22 +++++----------------- requirements/tox.txt | 4 ++-- 9 files changed, 33 insertions(+), 75 deletions(-) diff --git a/Makefile b/Makefile index ddad42a..bffa2aa 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,7 @@ covreport: ## Show the coverage results upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -q -r requirements/pip-tools.txt + pip install -qr requirements/pip.txt pip-compile --upgrade --allow-unsafe -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in pip install -q -r requirements/pip.txt diff --git a/requirements/base.txt b/requirements/base.txt index fe83d30..c5170e5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,13 +8,13 @@ appdirs==1.4.4 # via fs asgiref==3.10.0 # via django -boto3==1.40.55 +boto3==1.40.68 # via fs-s3fs -botocore==1.40.55 +botocore==1.40.68 # via # boto3 # s3transfer -django==4.2.25 +django==5.2.8 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # django-crum diff --git a/requirements/ci.txt b/requirements/ci.txt index 7d2a905..671601f 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -29,11 +29,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.40.55 +boto3==1.40.68 # via # -r requirements/test.txt # fs-s3fs -botocore==1.40.55 +botocore==1.40.68 # via # -r requirements/test.txt # boto3 @@ -46,10 +46,6 @@ certifi==2025.10.5 # via # -r requirements/test.txt # requests -cffi==2.0.0 - # via - # -r requirements/test.txt - # cryptography chardet==5.2.0 # via # -r requirements/test.txt @@ -83,16 +79,12 @@ cookiecutter==2.6.0 # via # -r requirements/test.txt # xblock-sdk -coverage[toml]==7.11.0 +coverage[toml]==7.11.1 # via # -r requirements/test.txt # coveralls coveralls==4.0.1 # via -r requirements/test.txt -cryptography==46.0.3 - # via - # -r requirements/test.txt - # secretstorage ddt==1.7.2 # via -r requirements/test.txt dill==0.4.0 @@ -103,7 +95,7 @@ distlib==0.4.0 # via # -r requirements/tox.txt # virtualenv -django==4.2.25 +django==5.2.8 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -121,7 +113,7 @@ docopt==0.6.2 # via # -r requirements/test.txt # coveralls -docutils==0.22.2 +docutils==0.22.3 # via # -r requirements/test.txt # readme-renderer @@ -179,11 +171,6 @@ jaraco-functools==4.3.0 # via # -r requirements/test.txt # keyring -jeepney==0.9.0 - # via - # -r requirements/test.txt - # keyring - # secretstorage jinja2==3.1.6 # via # -r requirements/test.txt @@ -236,7 +223,7 @@ more-itertools==10.8.0 # -r requirements/test.txt # jaraco-classes # jaraco-functools -nh3==0.3.1 +nh3==0.3.2 # via # -r requirements/test.txt # readme-renderer @@ -269,10 +256,6 @@ pluggy==1.6.0 # tox pycodestyle==2.14.0 # via -r requirements/test.txt -pycparser==2.23 - # via - # -r requirements/test.txt - # cffi pygments==2.19.2 # via # -r requirements/test.txt @@ -368,10 +351,6 @@ s3transfer==0.14.0 # via # -r requirements/test.txt # boto3 -secretstorage==3.4.0 - # via - # -r requirements/test.txt - # keyring simplejson==3.20.2 # via # -r requirements/test.txt @@ -401,7 +380,7 @@ tomlkit==0.13.3 # via # -r requirements/test.txt # pylint -tox==4.31.0 +tox==4.32.0 # via -r requirements/tox.txt twine==6.2.0 # via -r requirements/test.txt @@ -419,7 +398,7 @@ urllib3==2.5.0 # botocore # requests # twine -virtualenv==20.35.3 +virtualenv==20.35.4 # via # -r requirements/tox.txt # tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 6a83a29..867f6f2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,16 +12,16 @@ asgiref==3.10.0 # via # -r requirements/base.txt # django -boto3==1.40.55 +boto3==1.40.68 # via # -r requirements/base.txt # fs-s3fs -botocore==1.40.55 +botocore==1.40.68 # via # -r requirements/base.txt # boto3 # s3transfer -django==4.2.25 +django==5.2.8 # via # -r requirements/base.txt # django-crum diff --git a/requirements/docs.txt b/requirements/docs.txt index 1e2149d..fe48a88 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -22,11 +22,11 @@ babel==2.17.0 # sphinx beautifulsoup4==4.14.2 # via pydata-sphinx-theme -boto3==1.40.55 +boto3==1.40.68 # via # -r requirements/base.txt # fs-s3fs -botocore==1.40.55 +botocore==1.40.68 # via # -r requirements/base.txt # boto3 @@ -35,7 +35,7 @@ certifi==2025.10.5 # via requests charset-normalizer==3.4.4 # via requests -django==4.2.25 +django==5.2.8 # via # -r requirements/base.txt # django-crum diff --git a/requirements/pip.txt b/requirements/pip.txt index dec1587..172b7cc 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -9,6 +9,8 @@ wheel==0.45.1 # The following packages are considered to be unsafe in a requirements file: pip==25.2 - # via -r requirements/pip.in + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/pip.in setuptools==80.9.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 321d7ed..99efa9d 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -22,19 +22,17 @@ backports-tarfile==1.2.0 # via jaraco-context binaryornot==0.4.4 # via cookiecutter -boto3==1.40.55 +boto3==1.40.68 # via # -r requirements/base.txt # fs-s3fs -botocore==1.40.55 +botocore==1.40.68 # via # -r requirements/base.txt # boto3 # s3transfer certifi==2025.10.5 # via requests -cffi==2.0.0 - # via cryptography chardet==5.2.0 # via binaryornot charset-normalizer==3.4.4 @@ -51,13 +49,11 @@ code-annotations==2.3.0 # via edx-lint cookiecutter==2.6.0 # via xblock-sdk -cryptography==46.0.3 - # via secretstorage ddt==1.7.2 # via -r requirements/quality.in dill==0.4.0 # via pylint -django==4.2.25 +django==5.2.8 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt @@ -71,7 +67,7 @@ dnspython==2.8.0 # via # -r requirements/base.txt # pymongo -docutils==0.22.2 +docutils==0.22.3 # via readme-renderer edx-lint==5.6.0 # via -r requirements/quality.in @@ -104,10 +100,6 @@ jaraco-context==6.0.1 # via keyring jaraco-functools==4.3.0 # via keyring -jeepney==0.9.0 - # via - # keyring - # secretstorage jinja2==3.1.6 # via # code-annotations @@ -148,7 +140,7 @@ more-itertools==10.8.0 # via # jaraco-classes # jaraco-functools -nh3==0.3.1 +nh3==0.3.2 # via readme-renderer openedx-django-pyfs==3.8.0 # via @@ -162,8 +154,6 @@ platformdirs==4.5.0 # via pylint pycodestyle==2.14.0 # via -r requirements/quality.in -pycparser==2.23 - # via cffi pygments==2.19.2 # via # readme-renderer @@ -230,8 +220,6 @@ s3transfer==0.14.0 # via # -r requirements/base.txt # boto3 -secretstorage==3.4.0 - # via keyring simplejson==3.20.2 # via # -r requirements/base.txt diff --git a/requirements/test.txt b/requirements/test.txt index 4488e53..9886a4a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -22,19 +22,17 @@ backports-tarfile==1.2.0 # via jaraco-context binaryornot==0.4.4 # via cookiecutter -boto3==1.40.55 +boto3==1.40.68 # via # -r requirements/base.txt # fs-s3fs -botocore==1.40.55 +botocore==1.40.68 # via # -r requirements/base.txt # boto3 # s3transfer certifi==2025.10.5 # via requests -cffi==2.0.0 - # via cryptography chardet==5.2.0 # via binaryornot charset-normalizer==3.4.4 @@ -51,12 +49,10 @@ code-annotations==2.3.0 # via edx-lint cookiecutter==2.6.0 # via xblock-sdk -coverage[toml]==7.11.0 +coverage[toml]==7.11.1 # via coveralls coveralls==4.0.1 # via -r requirements/test.in -cryptography==46.0.3 - # via secretstorage ddt==1.7.2 # via -r requirements/test.in dill==0.4.0 @@ -76,7 +72,7 @@ dnspython==2.8.0 # pymongo docopt==0.6.2 # via coveralls -docutils==0.22.2 +docutils==0.22.3 # via readme-renderer edx-lint==5.6.0 # via -r requirements/test.in @@ -111,10 +107,6 @@ jaraco-context==6.0.1 # via keyring jaraco-functools==4.3.0 # via keyring -jeepney==0.9.0 - # via - # keyring - # secretstorage jinja2==3.1.6 # via # code-annotations @@ -157,7 +149,7 @@ more-itertools==10.8.0 # via # jaraco-classes # jaraco-functools -nh3==0.3.1 +nh3==0.3.2 # via readme-renderer openedx-django-pyfs==3.8.0 # via @@ -175,8 +167,6 @@ pluggy==1.6.0 # via pytest pycodestyle==2.14.0 # via -r requirements/test.in -pycparser==2.23 - # via cffi pygments==2.19.2 # via # pytest @@ -250,8 +240,6 @@ s3transfer==0.14.0 # via # -r requirements/base.txt # boto3 -secretstorage==3.4.0 - # via keyring simplejson==3.20.2 # via # -r requirements/base.txt diff --git a/requirements/tox.txt b/requirements/tox.txt index cd4c8c9..8b9c154 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -28,7 +28,7 @@ pluggy==1.6.0 # via tox pyproject-api==1.10.0 # via tox -tox==4.31.0 +tox==4.32.0 # via -r requirements/tox.in -virtualenv==20.35.3 +virtualenv==20.35.4 # via tox