From d9bc0879aae360a8961a431d06f3972ad8e7b2d1 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Fri, 7 Nov 2025 18:42:36 +0500 Subject: [PATCH] fix: make upgrade to reinstall pip before running pip-compile --- Makefile | 1 + requirements/ci.txt | 6 +++--- requirements/dev.txt | 18 +++++++----------- requirements/django.txt | 6 +++--- requirements/doc.txt | 6 +++--- requirements/pip.txt | 4 +++- requirements/test.txt | 14 ++++++-------- 7 files changed, 26 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 646870e09..4939072a1 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ requirements: ## install development environment requirements upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: ## update the pip requirements files to use the latest releases satisfying our constraints pip install -qr requirements/pip-tools.txt + pip install -qr requirements/pip.txt # Make sure to compile files after any other files they include! pip-compile -v --upgrade --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in pip-compile -v --upgrade --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 29cd36509..642c32b62 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,7 +10,7 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox -coverage==7.11.0 +coverage==7.11.1 # via -r requirements/ci.in distlib==0.4.0 # via virtualenv @@ -30,7 +30,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/ci.in -virtualenv==20.35.3 +virtualenv==20.35.4 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 9fe43dcc1..5fdc632cb 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -17,15 +17,11 @@ astroid==3.3.11 # -r requirements/test.txt # pylint # pylint-celery -attrs==25.4.0 - # via - # -r requirements/test.txt - # hypothesis -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 @@ -66,7 +62,7 @@ colorama==0.4.6 # -r requirements/ci.txt # -r requirements/test.txt # tox -coverage[toml]==7.11.0 +coverage[toml]==7.11.1 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -84,7 +80,7 @@ distlib==0.4.0 # -r requirements/ci.txt # -r requirements/test.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 @@ -112,7 +108,7 @@ fs-s3fs==1.1.1 # via # -r requirements/test.txt # openedx-django-pyfs -hypothesis==6.142.1 +hypothesis==6.147.0 # via -r requirements/test.txt iniconfig==2.3.0 # via @@ -277,7 +273,7 @@ tomlkit==0.13.3 # via # -r requirements/test.txt # pylint -tox==4.31.0 +tox==4.32.0 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -289,7 +285,7 @@ urllib3==2.5.0 # via # -r requirements/test.txt # botocore -virtualenv==20.35.3 +virtualenv==20.35.4 # via # -r requirements/ci.txt # -r requirements/test.txt diff --git a/requirements/django.txt b/requirements/django.txt index c11cf386b..6dd1a316b 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -10,13 +10,13 @@ appdirs==1.4.4 # 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 # -r requirements/django.in diff --git a/requirements/doc.txt b/requirements/doc.txt index fceb556e6..1ef329818 100644 --- a/requirements/doc.txt +++ b/requirements/doc.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/django.txt # fs-s3fs -botocore==1.40.55 +botocore==1.40.68 # via # -r requirements/django.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 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/django.txt diff --git a/requirements/pip.txt b/requirements/pip.txt index dec15874f..172b7cce5 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/test.txt b/requirements/test.txt index dd325a7c6..bc1c4b9fe 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -17,13 +17,11 @@ astroid==3.3.11 # -r requirements/test.in # pylint # pylint-celery -attrs==25.4.0 - # via hypothesis -boto3==1.40.55 +boto3==1.40.68 # via # -r requirements/django.txt # fs-s3fs -botocore==1.40.55 +botocore==1.40.68 # via # -r requirements/django.txt # boto3 @@ -45,7 +43,7 @@ code-annotations==2.3.0 # via edx-lint colorama==0.4.6 # via tox -coverage[toml]==7.11.0 +coverage[toml]==7.11.1 # via # -r requirements/test.in # pytest-cov @@ -82,7 +80,7 @@ fs-s3fs==1.1.1 # via # -r requirements/django.txt # openedx-django-pyfs -hypothesis==6.142.1 +hypothesis==6.147.0 # via -r requirements/test.in iniconfig==2.3.0 # via pytest @@ -208,7 +206,7 @@ text-unidecode==1.3 # via python-slugify tomlkit==0.13.3 # via pylint -tox==4.31.0 +tox==4.32.0 # via -r requirements/test.in typing-extensions==4.15.0 # via @@ -218,7 +216,7 @@ urllib3==2.5.0 # via # -r requirements/django.txt # botocore -virtualenv==20.35.3 +virtualenv==20.35.4 # via tox web-fragments==3.1.0 # via -r requirements/django.txt