From 0569407e50b0934b9130bcd79a7f5ad6a356957d Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Wed, 14 Jan 2026 17:27:55 +0500 Subject: [PATCH] fix: fix and correct make upgrade --- .github/workflows/ci.yml | 8 ++-- .github/workflows/pypi-publish.yml | 8 ++-- Makefile | 6 +-- requirements/base.txt | 38 +++++++-------- requirements/common_constraints.txt | 6 +-- requirements/pip-tools.txt | 12 +++-- requirements/pip.in | 6 --- requirements/pip.txt | 16 ------- test-requirements.txt | 74 ++++++++++++++--------------- 9 files changed, 73 insertions(+), 101 deletions(-) delete mode 100644 requirements/pip.in delete mode 100644 requirements/pip.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46567a88..6a906daf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,14 +18,14 @@ jobs: toxenv: [django52, django42, quality] steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: setup python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} - - name: Install pip - run: pip install -r requirements/pip.txt + - name: Install pip and pip-tools + run: pip install -r requirements/pip-tools.txt - name: Install Dependencies run: make requirements diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 7c14d9df..a112f479 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -11,14 +11,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: setup python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: 3.12 - - name: Install pip - run: pip install -r requirements/pip.txt + - name: Install pip and pip-tools + run: pip install -r requirements/pip-tools.txt - name: Install Dependencies run: pip install setuptools wheel diff --git a/Makefile b/Makefile index b1087903..2eedc82f 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ quality: tox -e quality requirements: - pip install -qr requirements/pip.txt + pip install -qr requirements/pip-tools.txt pip install -e . # Install this package and its dependencies pip install -r test-requirements.txt @@ -24,9 +24,7 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements text files based on the requirements/*.in files pip install -qr requirements/pip-tools.txt - pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in - pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in - pip install -qr requirements/pip.txt + pip-compile --upgrade --allow-unsafe -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip-tools.txt pip-compile --upgrade --allow-unsafe -o requirements/base.txt requirements/base.in pip-compile --upgrade -o test-requirements.txt requirements/test.in diff --git a/requirements/base.txt b/requirements/base.txt index 05dc3dcc..09e0c9f5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,21 +4,21 @@ # # make upgrade # -asgiref==3.9.1 +asgiref==3.11.0 # via django -certifi==2025.8.3 +certifi==2026.1.4 # via requests -cffi==1.17.1 +cffi==2.0.0 # via # cryptography # pynacl -charset-normalizer==3.4.3 +charset-normalizer==3.4.4 # via requests -click==8.2.1 +click==8.3.1 # via edx-django-utils -cryptography==45.0.6 +cryptography==46.0.3 # via pyjwt -django==4.2.23 +django==5.2.10 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -34,7 +34,7 @@ django-crum==0.7.9 # via edx-django-utils django-model-utils==5.0.0 # via -r requirements/base.in -django-simple-history==3.10.1 +django-simple-history==3.11.0 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -47,11 +47,11 @@ djangorestframework==3.16.1 # -r requirements/base.in # drf-jwt # edx-drf-extensions -dnspython==2.7.0 +dnspython==2.8.0 # via pymongo drf-jwt==1.19.2 # via edx-drf-extensions -edx-django-utils==8.0.0 +edx-django-utils==8.0.1 # via edx-drf-extensions edx-drf-extensions==10.6.0 # via -r requirements/base.in @@ -59,35 +59,35 @@ edx-opaque-keys==3.0.0 # via # -r requirements/base.in # edx-drf-extensions -idna==3.10 +idna==3.11 # via requests -pillow==11.3.0 +pillow==12.1.0 # via -r requirements/base.in -psutil==7.0.0 +psutil==7.2.1 # via edx-django-utils -pycparser==2.22 +pycparser==2.23 # via cffi pyjwt[crypto]==2.10.1 # via # drf-jwt # edx-drf-extensions -pymongo==4.14.1 +pymongo==4.16.0 # via edx-opaque-keys -pynacl==1.5.0 +pynacl==1.6.2 # via edx-django-utils requests==2.32.5 # via edx-drf-extensions semantic-version==2.10.0 # via edx-drf-extensions -sqlparse==0.5.3 +sqlparse==0.5.5 # via django -stevedore==5.5.0 +stevedore==5.6.0 # via # edx-django-utils # edx-opaque-keys typing-extensions==4.15.0 # via edx-opaque-keys -urllib3==2.5.0 +urllib3==2.6.3 # via requests # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 420f27c1..72cc4cc8 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -12,13 +12,9 @@ # this file from Github directly. It does not require packaging in edx-lint. # using LTS django version -Django<5.0 +Django<6.0 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html # See https://github.com/openedx/edx-platform/issues/35126 for more info elasticsearch<7.14.0 - -# Cause: https://github.com/openedx/edx-lint/issues/458 -# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved. -pip<24.3 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index b19a4faa..f8b99699 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,13 +4,13 @@ # # make upgrade # -build==1.3.0 +build==1.4.0 # via pip-tools -click==8.2.1 +click==8.3.1 # via pip-tools packaging==25.0 # via build -pip-tools==7.5.0 +pip-tools==7.5.2 # via -r requirements/pip-tools.in pyproject-hooks==1.2.0 # via @@ -20,5 +20,7 @@ wheel==0.45.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools +pip==25.3 + # via pip-tools +setuptools==80.9.0 + # via pip-tools diff --git a/requirements/pip.in b/requirements/pip.in deleted file mode 100644 index 309ad8b2..00000000 --- a/requirements/pip.in +++ /dev/null @@ -1,6 +0,0 @@ --c constraints.txt -# Core dependencies for installing other packages - -pip -setuptools -wheel \ No newline at end of file diff --git a/requirements/pip.txt b/requirements/pip.txt deleted file mode 100644 index 8b9f5c86..00000000 --- a/requirements/pip.txt +++ /dev/null @@ -1,16 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# make upgrade -# -wheel==0.45.1 - # via -r requirements/pip.in - -# The following packages are considered to be unsafe in a requirements file: -pip==24.2 - # via - # -c /home/runner/work/edx-organizations/edx-organizations/requirements/common_constraints.txt - # -r requirements/pip.in -setuptools==80.9.0 - # via -r requirements/pip.in diff --git a/test-requirements.txt b/test-requirements.txt index 86c0e379..2cddcd33 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,32 +4,32 @@ # # make upgrade # -asgiref==3.9.1 +asgiref==3.11.0 # via # -r requirements/base.txt # django -astroid==3.3.11 +astroid==4.0.3 # via # pylint # pylint-celery -cachetools==6.2.0 +cachetools==6.2.4 # via tox -certifi==2025.8.3 +certifi==2026.1.4 # via # -r requirements/base.txt # requests -cffi==1.17.1 +cffi==2.0.0 # via # -r requirements/base.txt # cryptography # pynacl chardet==5.2.0 # via tox -charset-normalizer==3.4.3 +charset-normalizer==3.4.4 # via # -r requirements/base.txt # requests -click==8.2.1 +click==8.3.1 # via # -r requirements/base.txt # click-log @@ -42,11 +42,11 @@ code-annotations==2.3.0 # via edx-lint colorama==0.4.6 # via tox -coverage[toml]==7.10.6 +coverage[toml]==7.13.1 # via # -r requirements/test.in # pytest-cov -cryptography==45.0.6 +cryptography==46.0.3 # via # -r requirements/base.txt # pyjwt @@ -73,7 +73,7 @@ django-crum==0.7.9 # edx-django-utils django-model-utils==5.0.0 # via -r requirements/base.txt -django-simple-history==3.10.1 +django-simple-history==3.11.0 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -87,7 +87,7 @@ djangorestframework==3.16.1 # -r requirements/base.txt # drf-jwt # edx-drf-extensions -dnspython==2.7.0 +dnspython==2.8.0 # via # -r requirements/base.txt # pymongo @@ -95,7 +95,7 @@ drf-jwt==1.19.2 # via # -r requirements/base.txt # edx-drf-extensions -edx-django-utils==8.0.0 +edx-django-utils==8.0.1 # via # -r requirements/base.txt # edx-drf-extensions @@ -109,25 +109,25 @@ edx-opaque-keys==3.0.0 # edx-drf-extensions factory-boy==3.3.3 # via -r requirements/test.in -faker==37.6.0 +faker==40.1.2 # via factory-boy -filelock==3.19.1 +filelock==3.20.3 # via # tox # virtualenv httpretty==0.9.7 # via -r requirements/test.in -idna==3.10 +idna==3.11 # via # -r requirements/base.txt # requests -iniconfig==2.1.0 +iniconfig==2.3.0 # via pytest -isort==6.0.1 +isort==7.0.0 # via pylint jinja2==3.1.6 # via code-annotations -markupsafe==3.0.2 +markupsafe==3.0.3 # via jinja2 mccabe==0.7.0 # via pylint @@ -136,9 +136,9 @@ packaging==25.0 # pyproject-api # pytest # tox -pillow==11.3.0 +pillow==12.1.0 # via -r requirements/base.txt -platformdirs==4.4.0 +platformdirs==4.5.1 # via # pylint # tox @@ -148,13 +148,13 @@ pluggy==1.6.0 # pytest # pytest-cov # tox -psutil==7.0.0 +psutil==7.2.1 # via # -r requirements/base.txt # edx-django-utils pycodestyle==2.14.0 # via -r requirements/test.in -pycparser==2.22 +pycparser==2.23 # via # -r requirements/base.txt # cffi @@ -165,7 +165,7 @@ pyjwt[crypto]==2.10.1 # -r requirements/base.txt # drf-jwt # edx-drf-extensions -pylint==3.3.8 +pylint==4.0.4 # via # edx-lint # pylint-celery @@ -173,33 +173,33 @@ pylint==3.3.8 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.6.1 +pylint-django==2.7.0 # via edx-lint pylint-plugin-utils==0.9.0 # via # pylint-celery # pylint-django -pymongo==4.14.1 +pymongo==4.16.0 # via # -r requirements/base.txt # edx-opaque-keys -pynacl==1.5.0 +pynacl==1.6.2 # via # -r requirements/base.txt # edx-django-utils -pyproject-api==1.9.1 +pyproject-api==1.10.0 # via tox -pytest==8.4.1 +pytest==9.0.2 # via # pytest-cov # pytest-django -pytest-cov==6.2.1 +pytest-cov==7.0.0 # via -r requirements/test.in pytest-django==4.11.1 # via -r requirements/test.in python-slugify==8.0.4 # via code-annotations -pyyaml==6.0.2 +pyyaml==6.0.3 # via code-annotations requests==2.32.5 # via @@ -213,11 +213,11 @@ six==1.17.0 # via # edx-lint # httpretty -sqlparse==0.5.3 +sqlparse==0.5.5 # via # -r requirements/base.txt # django -stevedore==5.5.0 +stevedore==5.6.0 # via # -r requirements/base.txt # code-annotations @@ -225,21 +225,19 @@ stevedore==5.5.0 # edx-opaque-keys text-unidecode==1.3 # via python-slugify -tomlkit==0.13.3 +tomlkit==0.14.0 # via pylint -tox==4.29.0 +tox==4.34.1 # via -r requirements/test.in typing-extensions==4.15.0 # via # -r requirements/base.txt # edx-opaque-keys -tzdata==2025.2 - # via faker -urllib3==2.5.0 +urllib3==2.6.3 # via # -r requirements/base.txt # requests -virtualenv==20.34.0 +virtualenv==20.36.1 # via tox # The following packages are considered to be unsafe in a requirements file: