diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b905834..ee11789 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,8 +28,8 @@ jobs: with: mongodb-version: 4.0 - - 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 test.setup install diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 0886c12..4906379 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -17,8 +17,8 @@ jobs: with: python-version: 3.11 - - 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 d0963ff..d10b721 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,6 @@ report: ## generate reports for quality checks and code coverage coverage xml -o coverage.xml requirements: ## install development environment requirements - pip install -r requirements/pip.txt pip install -r requirements/pip-tools.txt pip-sync requirements/dev.txt requirements/private.* @@ -61,9 +60,7 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! - 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 -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 -o requirements/base.txt requirements/base.in pip-compile --upgrade -o requirements/test.txt requirements/test.in diff --git a/requirements/base.txt b/requirements/base.txt index 0e4e695..06f9c80 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,19 +6,19 @@ # amqp==5.3.1 # via kombu -asgiref==3.10.0 +asgiref==3.11.0 # via django attrs==25.4.0 # via openedx-events -billiard==4.2.2 +billiard==4.2.4 # via celery -celery==5.5.3 +celery==5.6.2 # via # -c requirements/constraints.txt # -r requirements/base.in cffi==2.0.0 # via pynacl -click==8.3.0 +click==8.3.1 # via # celery # click-didyoumean @@ -34,7 +34,7 @@ click-repl==0.3.0 # via celery code-annotations==2.3.0 # via edx-toggles -django==4.2.25 +django==5.2.10 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in @@ -70,7 +70,7 @@ fastavro==1.12.1 # via openedx-events jinja2==3.1.6 # via code-annotations -kombu==5.5.4 +kombu==5.6.2 # via celery markupsafe==3.0.3 # via jinja2 @@ -80,15 +80,15 @@ packaging==25.0 # via kombu prompt-toolkit==3.0.52 # via click-repl -psutil==7.1.1 +psutil==7.2.1 # via edx-django-utils pycparser==2.23 # via cffi -pymongo==4.15.3 +pymongo==4.16.0 # via # -r requirements/base.in # edx-opaque-keys -pynacl==1.6.0 +pynacl==1.6.2 # via edx-django-utils python-dateutil==2.9.0.post0 # via celery @@ -103,9 +103,9 @@ six==1.17.0 # -r requirements/base.in # edx-ccx-keys # python-dateutil -sqlparse==0.5.3 +sqlparse==0.5.5 # via django -stevedore==5.5.0 +stevedore==5.6.0 # via # code-annotations # edx-django-utils @@ -114,8 +114,10 @@ text-unidecode==1.3 # via python-slugify typing-extensions==4.15.0 # via edx-opaque-keys -tzdata==2025.2 +tzdata==2025.3 # via kombu +tzlocal==5.3.1 + # via celery vine==5.1.0 # via # amqp diff --git a/requirements/celery54.txt b/requirements/celery54.txt index 43e9a53..3d6a7cf 100644 --- a/requirements/celery54.txt +++ b/requirements/celery54.txt @@ -1,9 +1,9 @@ amqp==5.3.1 -billiard==4.2.2 -celery==5.5.3 -click==8.3.0 +billiard==4.2.4 +celery==5.6.2 +click==8.3.1 click-didyoumean==0.3.1 click-repl==0.3.0 -kombu==5.5.4 +kombu==5.6.2 prompt-toolkit==3.0.52 vine==5.1.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index 29cd365..8725510 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,17 +4,17 @@ # # make upgrade # -cachetools==6.2.1 +cachetools==6.2.4 # via tox chardet==5.2.0 # via tox colorama==0.4.6 # via tox -coverage==7.11.0 +coverage==7.13.1 # via -r requirements/ci.in distlib==0.4.0 # via virtualenv -filelock==3.20.0 +filelock==3.20.3 # via # tox # virtualenv @@ -22,7 +22,7 @@ packaging==25.0 # via # pyproject-api # tox -platformdirs==4.5.0 +platformdirs==4.5.1 # via # tox # virtualenv @@ -30,7 +30,7 @@ pluggy==1.6.0 # via tox pyproject-api==1.10.0 # via tox -tox==4.31.0 +tox==4.34.1 # via -r requirements/ci.in -virtualenv==20.35.3 +virtualenv==20.36.1 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index f0c37dc..703a0fa 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -10,11 +10,11 @@ amqp==5.3.1 # via # -r requirements/test.txt # kombu -asgiref==3.10.0 +asgiref==3.11.0 # via # -r requirements/test.txt # django -astroid==3.3.11 +astroid==4.0.3 # via # -r requirements/test.txt # pylint @@ -25,23 +25,23 @@ attrs==25.4.0 # openedx-events babel==2.17.0 # via sphinx -billiard==4.2.2 +billiard==4.2.4 # via # -r requirements/test.txt # celery -build==1.3.0 +build==1.4.0 # via # -r requirements/pip-tools.txt # pip-tools -cachetools==6.2.1 +cachetools==6.2.4 # via # -r requirements/ci.txt # tox -celery==5.5.3 +celery==5.6.2 # via # -c requirements/constraints.txt # -r requirements/test.txt -certifi==2025.10.5 +certifi==2026.1.4 # via requests cffi==2.0.0 # via @@ -53,7 +53,7 @@ chardet==5.2.0 # tox charset-normalizer==3.4.4 # via requests -click==8.3.0 +click==8.3.1 # via # -r requirements/pip-tools.txt # -r requirements/test.txt @@ -91,7 +91,7 @@ colorama==0.4.6 # via # -r requirements/ci.txt # tox -coverage[toml]==7.11.0 +coverage[toml]==7.13.1 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -106,7 +106,7 @@ distlib==0.4.0 # via # -r requirements/ci.txt # virtualenv -django==4.2.25 +django==5.2.10 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -129,7 +129,7 @@ dnspython==2.8.0 # via # -r requirements/test.txt # pymongo -docutils==0.21.2 +docutils==0.22.4 # via sphinx edx-ccx-keys==2.0.2 # via @@ -155,7 +155,7 @@ fastavro==1.12.1 # via # -r requirements/test.txt # openedx-events -filelock==3.20.0 +filelock==3.20.3 # via # -r requirements/ci.txt # tox @@ -168,7 +168,7 @@ iniconfig==2.3.0 # via # -r requirements/test.txt # pytest -isort==6.1.0 +isort==7.0.0 # via # -r requirements/test.txt # pylint @@ -177,7 +177,7 @@ jinja2==3.1.6 # -r requirements/test.txt # code-annotations # sphinx -kombu==5.5.4 +kombu==5.6.2 # via # -r requirements/test.txt # celery @@ -204,11 +204,11 @@ packaging==25.0 # pytest # sphinx # tox -pip-tools==7.5.1 +pip-tools==7.5.2 # via # -r requirements/dev.in # -r requirements/pip-tools.txt -platformdirs==4.5.0 +platformdirs==4.5.1 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -226,7 +226,7 @@ prompt-toolkit==3.0.52 # via # -r requirements/test.txt # click-repl -psutil==7.1.1 +psutil==7.2.1 # via # -r requirements/test.txt # edx-django-utils @@ -243,7 +243,7 @@ pygments==2.19.2 # -r requirements/test.txt # pytest # sphinx -pylint==3.3.9 +pylint==4.0.4 # via # -r requirements/test.txt # edx-lint @@ -254,7 +254,7 @@ pylint-celery==0.3 # via # -r requirements/test.txt # edx-lint -pylint-django==2.6.1 +pylint-django==2.7.0 # via # -r requirements/test.txt # edx-lint @@ -263,11 +263,11 @@ pylint-plugin-utils==0.9.0 # -r requirements/test.txt # pylint-celery # pylint-django -pymongo==4.15.3 +pymongo==4.16.0 # via # -r requirements/test.txt # edx-opaque-keys -pynacl==1.6.0 +pynacl==1.6.2 # via # -r requirements/test.txt # edx-django-utils @@ -280,7 +280,7 @@ pyproject-hooks==1.2.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.4.2 +pytest==9.0.2 # via # -r requirements/test.txt # pytest-cov @@ -302,7 +302,7 @@ pyyaml==6.0.3 # code-annotations requests==2.32.5 # via sphinx -roman-numerals-py==3.1.0 +roman-numerals==4.1.0 # via sphinx six==1.17.0 # via @@ -312,7 +312,7 @@ six==1.17.0 # python-dateutil snowballstemmer==3.0.1 # via sphinx -sphinx==8.2.3 +sphinx==9.0.4 # via -r requirements/dev.in sphinxcontrib-applehelp==2.0.0 # via sphinx @@ -326,11 +326,11 @@ sphinxcontrib-qthelp==2.0.0 # via sphinx sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.5.3 +sqlparse==0.5.5 # via # -r requirements/test.txt # django -stevedore==5.5.0 +stevedore==5.6.0 # via # -r requirements/test.txt # code-annotations @@ -340,11 +340,11 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomlkit==0.13.3 +tomlkit==0.14.0 # via # -r requirements/test.txt # pylint -tox==4.31.0 +tox==4.34.1 # via # -r requirements/ci.txt # -r requirements/dev.in @@ -352,11 +352,15 @@ typing-extensions==4.15.0 # via # -r requirements/test.txt # edx-opaque-keys -tzdata==2025.2 +tzdata==2025.3 # via # -r requirements/test.txt # kombu -urllib3==2.5.0 +tzlocal==5.3.1 + # via + # -r requirements/test.txt + # celery +urllib3==2.6.3 # via requests vine==5.1.0 # via @@ -364,7 +368,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.35.3 +virtualenv==20.36.1 # via # -r requirements/ci.txt # tox diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index e97cb1b..f8b9969 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.3.0 +click==8.3.1 # via pip-tools packaging==25.0 # via build -pip-tools==7.5.1 +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 716c6f2..0000000 --- a/requirements/pip.in +++ /dev/null @@ -1,6 +0,0 @@ -# Core dependencies for installing other packages --c constraints.txt - -pip -setuptools -wheel diff --git a/requirements/pip.txt b/requirements/pip.txt deleted file mode 100644 index dec1587..0000000 --- a/requirements/pip.txt +++ /dev/null @@ -1,14 +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==25.2 - # via -r requirements/pip.in -setuptools==80.9.0 - # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 713cef5..bb6c622 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -7,11 +7,11 @@ # via # -r requirements/base.txt # kombu -asgiref==3.10.0 +asgiref==3.11.0 # via # -r requirements/base.txt # django -astroid==3.3.11 +astroid==4.0.3 # via # pylint # pylint-celery @@ -56,7 +56,7 @@ code-annotations==2.3.0 # -r requirements/base.txt # edx-lint # edx-toggles -coverage[toml]==7.11.0 +coverage[toml]==7.13.1 # via pytest-cov ddt==1.7.2 # via -r requirements/test.in @@ -108,7 +108,7 @@ fastavro==1.12.1 # openedx-events iniconfig==2.3.0 # via pytest -isort==6.1.0 +isort==7.0.0 # via pylint jinja2==3.1.6 # via @@ -132,7 +132,7 @@ packaging==25.0 # -r requirements/base.txt # kombu # pytest -platformdirs==4.5.0 +platformdirs==4.5.1 # via pylint pluggy==1.6.0 # via @@ -141,7 +141,7 @@ pluggy==1.6.0 # via # -r requirements/base.txt # click-repl -psutil==7.1.1 +psutil==7.2.1 # via # -r requirements/base.txt # edx-django-utils @@ -153,7 +153,7 @@ pycparser==2.23 # cffi pygments==2.19.2 # via pytest -pylint==3.3.9 +pylint==4.0.4 # via # edx-lint # pylint-celery @@ -161,21 +161,21 @@ pylint==3.3.9 # 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.15.3 +pymongo==4.16.0 # via # -r requirements/base.txt # edx-opaque-keys -pynacl==1.6.0 +pynacl==1.6.2 # via # -r requirements/base.txt # edx-django-utils -pytest==8.4.2 +pytest==9.0.2 # via pytest-cov pytest-cov==7.0.0 # via -r requirements/test.in @@ -199,11 +199,11 @@ six==1.17.0 # edx-ccx-keys # edx-lint # python-dateutil -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 @@ -213,16 +213,20 @@ text-unidecode==1.3 # via # -r requirements/base.txt # python-slugify -tomlkit==0.13.3 +tomlkit==0.14.0 # via pylint typing-extensions==4.15.0 # via # -r requirements/base.txt # edx-opaque-keys -tzdata==2025.2 +tzdata==2025.3 # via # -r requirements/base.txt # kombu +tzlocal==5.3.1 + # via + # -r requirements/base.txt + # celery # via # -r requirements/base.txt # amqp