From c359ebb628201389ca3dcd2c8b0b861fbb08f70d Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 27 Aug 2024 11:24:28 -0400 Subject: [PATCH 1/4] chore: Upgrade Python requirements --- requirements/base.txt | 34 ++++++------- requirements/ci.txt | 4 +- requirements/common_constraints.txt | 9 ---- requirements/dev.txt | 76 ++++++++++++++--------------- requirements/doc.txt | 52 ++++++++++---------- requirements/pip-tools.txt | 10 ++-- requirements/pip.txt | 6 +-- requirements/quality.txt | 67 +++++++++++++------------ requirements/test.txt | 38 +++++++-------- 9 files changed, 139 insertions(+), 157 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index f6a9ac2..b345d6b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,7 +10,7 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -attrs==23.2.0 +attrs==24.2.0 # via openedx-events backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via @@ -25,7 +25,7 @@ celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.16.0 +cffi==1.17.0 # via # cryptography # pynacl @@ -49,7 +49,7 @@ code-annotations==1.8.0 # via edx-toggles cryptography==43.0.0 # via pyjwt -django==4.2.14 +django==4.2.15 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -83,7 +83,7 @@ drf-jwt==1.19.2 # via edx-drf-extensions edx-ccx-keys==1.3.0 # via openedx-events -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # edx-drf-extensions # edx-toggles @@ -109,13 +109,13 @@ fastavro==1.9.5 # via openedx-events fs==2.4.16 # via xblock -idna==3.7 +idna==3.8 # via requests jinja2==3.1.4 # via code-annotations -kombu==5.3.7 +kombu==5.4.0 # via celery -lxml==5.2.2 +lxml==5.3.0 # via xblock mako==1.3.5 # via xblock @@ -124,11 +124,11 @@ markupsafe==2.1.5 # jinja2 # mako # xblock -newrelic==9.12.0 +newrelic==9.13.0 # via edx-django-utils -openedx-events==9.11.0 +openedx-events==9.12.0 # via event-tracking -pbr==6.0.0 +pbr==6.1.0 # via stevedore prompt-toolkit==3.0.47 # via click-repl @@ -136,7 +136,7 @@ psutil==6.0.0 # via edx-django-utils pycparser==2.22 # via cffi -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # drf-jwt # edx-drf-extensions @@ -157,7 +157,7 @@ pytz==2024.1 # -r requirements/base.in # event-tracking # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # code-annotations # xblock @@ -165,7 +165,7 @@ requests==2.32.3 # via edx-drf-extensions semantic-version==2.10.0 # via edx-drf-extensions -simplejson==3.19.2 +simplejson==3.19.3 # via xblock six==1.16.0 # via @@ -175,7 +175,7 @@ six==1.16.0 # python-dateutil sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via # code-annotations # edx-django-utils @@ -202,13 +202,13 @@ wcwidth==0.2.13 # via prompt-toolkit web-fragments==2.2.0 # via xblock -webob==1.8.7 +webob==1.8.8 # via xblock -xblock==4.0.1 +xblock==5.1.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: -setuptools==71.1.0 +setuptools==73.0.1 # via # -r requirements/base.in # fs diff --git a/requirements/ci.txt b/requirements/ci.txt index 40f3161..d19de68 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -cachetools==5.4.0 +cachetools==5.5.0 # via tox chardet==5.2.0 # via tox @@ -34,7 +34,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.16.0 +tox==4.18.0 # via -r requirements/ci.in virtualenv==20.26.3 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index b957ec4..31879f7 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -23,15 +23,6 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 -# opentelemetry requires version 6.x at the moment: -# https://github.com/open-telemetry/opentelemetry-python/issues/3570 -# Normally this could be added as a constraint in edx-django-utils, where we're -# adding the opentelemetry dependency. However, when we compile pip-tools.txt, -# that uses version 7.x, and then there's no undoing that when compiling base.txt. -# So we need to pin it globally, for now. -# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 -importlib-metadata<7 - # Cause: https://github.com/openedx/event-tracking/pull/290 # event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform. # We will pin event-tracking to do not break existing installations diff --git a/requirements/dev.txt b/requirements/dev.txt index ff7063b..dd8d162 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -14,7 +14,7 @@ astroid==3.2.4 # via # pylint # pylint-celery -attrs==23.2.0 +attrs==24.2.0 # via openedx-events backports-tarfile==1.2.0 # via jaraco-context @@ -29,13 +29,13 @@ billiard==4.2.0 # via celery build==1.2.1 # via pip-tools -cachetools==5.4.0 +cachetools==5.5.0 # via tox celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.16.0 +cffi==1.17.0 # via # cryptography # pynacl @@ -70,7 +70,7 @@ code-annotations==1.8.0 # edx-toggles colorama==0.4.6 # via tox -coverage[toml]==7.6.0 +coverage[toml]==7.6.1 # via pytest-cov cryptography==43.0.0 # via @@ -84,7 +84,7 @@ dill==0.3.8 # via pylint distlib==0.3.8 # via virtualenv -django==4.2.14 +django==4.2.15 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -121,7 +121,7 @@ drf-jwt==1.19.2 # via edx-drf-extensions edx-ccx-keys==1.3.0 # via openedx-events -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # edx-drf-extensions # edx-toggles @@ -129,9 +129,9 @@ edx-django-utils==5.14.2 # openedx-events edx-drf-extensions==10.3.0 # via -r requirements/base.in -edx-i18n-tools==1.6.0 +edx-i18n-tools==1.6.2 # via -r requirements/dev.in -edx-lint==5.3.7 +edx-lint==5.4.0 # via # -r requirements/dev.in # -r requirements/quality.in @@ -151,9 +151,9 @@ event-tracking==2.4.0 # -r requirements/base.in exceptiongroup==1.2.2 # via pytest -factory-boy==3.3.0 +factory-boy==3.3.1 # via -r requirements/test.in -faker==26.0.0 +faker==28.0.0 # via factory-boy fastavro==1.9.5 # via openedx-events @@ -165,15 +165,14 @@ freezegun==1.5.1 # via -r requirements/test.in fs==2.4.16 # via xblock -idna==3.7 +idna==3.8 # via requests -importlib-metadata==6.11.0 +importlib-metadata==8.4.0 # via - # -c requirements/common_constraints.txt # build # keyring # twine -importlib-resources==6.4.0 +importlib-resources==6.4.4 # via keyring iniconfig==2.0.0 # via pytest @@ -183,9 +182,9 @@ isort==5.13.2 # pylint jaraco-classes==3.4.0 # via keyring -jaraco-context==5.3.0 +jaraco-context==6.0.1 # via keyring -jaraco-functools==4.0.1 +jaraco-functools==4.0.2 # via keyring jeepney==0.8.0 # via @@ -195,17 +194,14 @@ jinja2==3.1.4 # via # code-annotations # diff-cover -keyring==25.2.1 +keyring==25.3.0 # via twine -kombu==5.3.7 +kombu==5.4.0 # via celery -lxml[html-clean]==5.2.2 +lxml==5.3.0 # via # edx-i18n-tools - # lxml-html-clean # xblock -lxml-html-clean==0.1.1 - # via lxml mako==1.3.5 # via xblock markdown-it-py==3.0.0 @@ -221,15 +217,15 @@ mdurl==0.1.2 # via markdown-it-py mock==5.1.0 # via -r requirements/test.in -more-itertools==10.3.0 +more-itertools==10.4.0 # via # jaraco-classes # jaraco-functools -newrelic==9.12.0 +newrelic==9.13.0 # via edx-django-utils nh3==0.2.18 # via readme-renderer -openedx-events==9.11.0 +openedx-events==9.12.0 # via event-tracking packaging==24.1 # via @@ -237,9 +233,9 @@ packaging==24.1 # pyproject-api # pytest # tox -path==16.14.0 +path==16.16.0 # via edx-i18n-tools -pbr==6.0.0 +pbr==6.1.0 # via stevedore pip-tools==7.4.1 # via -r requirements/dev.in @@ -261,7 +257,7 @@ prompt-toolkit==3.0.47 # via click-repl psutil==6.0.0 # via edx-django-utils -pycodestyle==2.12.0 +pycodestyle==2.12.1 # via -r requirements/quality.in pycparser==2.22 # via cffi @@ -272,7 +268,7 @@ pygments==2.18.0 # diff-cover # readme-renderer # rich -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # drf-jwt # edx-drf-extensions @@ -302,7 +298,7 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -pytest==8.3.1 +pytest==8.3.2 # via # pytest-cov # pytest-django @@ -323,7 +319,7 @@ pytz==2024.1 # -r requirements/base.in # event-tracking # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # code-annotations # edx-i18n-tools @@ -339,13 +335,13 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.1 +rich==13.8.0 # via twine secretstorage==3.3.3 # via keyring semantic-version==2.10.0 # via edx-drf-extensions -simplejson==3.19.2 +simplejson==3.19.3 # via xblock six==1.16.0 # via @@ -358,7 +354,7 @@ snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via # code-annotations # edx-django-utils @@ -374,9 +370,9 @@ tomli==2.0.1 # pyproject-api # pytest # tox -tomlkit==0.13.0 +tomlkit==0.13.2 # via pylint -tox==4.16.0 +tox==4.18.0 # via -r requirements/dev.in twine==5.1.1 # via -r requirements/quality.in @@ -407,15 +403,15 @@ wcwidth==0.2.13 # via prompt-toolkit web-fragments==2.2.0 # via xblock -webob==1.8.7 +webob==1.8.8 # via xblock -wheel==0.43.0 +wheel==0.44.0 # via # -r requirements/quality.in # pip-tools -xblock==4.0.1 +xblock==5.1.0 # via -r requirements/base.in -zipp==3.19.2 +zipp==3.20.1 # via # importlib-metadata # importlib-resources diff --git a/requirements/doc.txt b/requirements/doc.txt index b07ddec..71d0b03 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -14,9 +14,9 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -attrs==23.2.0 +attrs==24.2.0 # via openedx-events -babel==2.15.0 +babel==2.16.0 # via # pydata-sphinx-theme # sphinx @@ -35,7 +35,7 @@ celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.16.0 +cffi==1.17.0 # via # cryptography # pynacl @@ -57,13 +57,13 @@ click-repl==0.3.0 # via celery code-annotations==1.8.0 # via edx-toggles -coverage[toml]==7.6.0 +coverage[toml]==7.6.1 # via pytest-cov cryptography==43.0.0 # via pyjwt ddt==1.7.2 # via -r requirements/test.in -django==4.2.14 +django==4.2.15 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -105,7 +105,7 @@ drf-jwt==1.19.2 # via edx-drf-extensions edx-ccx-keys==1.3.0 # via openedx-events -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # edx-drf-extensions # edx-toggles @@ -129,9 +129,9 @@ event-tracking==2.4.0 # -r requirements/base.in exceptiongroup==1.2.2 # via pytest -factory-boy==3.3.0 +factory-boy==3.3.1 # via -r requirements/test.in -faker==26.0.0 +faker==28.0.0 # via factory-boy fastavro==1.9.5 # via openedx-events @@ -139,23 +139,21 @@ freezegun==1.5.1 # via -r requirements/test.in fs==2.4.16 # via xblock -idna==3.7 +idna==3.8 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # sphinx +importlib-metadata==8.4.0 + # via sphinx iniconfig==2.0.0 # via pytest jinja2==3.1.4 # via # code-annotations # sphinx -kombu==5.3.7 +kombu==5.4.0 # via celery -lxml==5.2.2 +lxml==5.3.0 # via xblock mako==1.3.5 # via xblock @@ -166,16 +164,16 @@ markupsafe==2.1.5 # xblock mock==5.1.0 # via -r requirements/test.in -newrelic==9.12.0 +newrelic==9.13.0 # via edx-django-utils -openedx-events==9.11.0 +openedx-events==9.12.0 # via event-tracking packaging==24.1 # via # pydata-sphinx-theme # pytest # sphinx -pbr==6.0.0 +pbr==6.1.0 # via stevedore pluggy==1.5.0 # via pytest @@ -193,7 +191,7 @@ pygments==2.18.0 # doc8 # pydata-sphinx-theme # sphinx -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # drf-jwt # edx-drf-extensions @@ -203,7 +201,7 @@ pymongo==3.13.0 # event-tracking pynacl==1.5.0 # via edx-django-utils -pytest==8.3.1 +pytest==8.3.2 # via # pytest-cov # pytest-django @@ -225,7 +223,7 @@ pytz==2024.1 # babel # event-tracking # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # code-annotations # xblock @@ -237,7 +235,7 @@ restructuredtext-lint==1.4.0 # via doc8 semantic-version==2.10.0 # via edx-drf-extensions -simplejson==3.19.2 +simplejson==3.19.3 # via xblock six==1.16.0 # via @@ -247,7 +245,7 @@ six==1.16.0 # python-dateutil snowballstemmer==2.2.0 # via sphinx -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 sphinx==6.2.1 # via @@ -270,7 +268,7 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via # code-annotations # doc8 @@ -304,11 +302,11 @@ wcwidth==0.2.13 # via prompt-toolkit web-fragments==2.2.0 # via xblock -webob==1.8.7 +webob==1.8.8 # via xblock -xblock==4.0.1 +xblock==5.1.0 # via -r requirements/base.in -zipp==3.19.2 +zipp==3.20.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index f577da4..fc796fd 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,10 +8,8 @@ build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # build +importlib-metadata==8.4.0 + # via build packaging==24.1 # via build pip-tools==7.4.1 @@ -24,9 +22,9 @@ tomli==2.0.1 # via # build # pip-tools -wheel==0.43.0 +wheel==0.44.0 # via pip-tools -zipp==3.19.2 +zipp==3.20.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index ebe14bb..88e142d 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.43.0 +wheel==0.44.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.1.2 +pip==24.2 # via -r requirements/pip.in -setuptools==71.1.0 +setuptools==73.0.1 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 93957c0..68cf7fb 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -14,7 +14,7 @@ astroid==3.2.4 # via # pylint # pylint-celery -attrs==23.2.0 +attrs==24.2.0 # via openedx-events backports-tarfile==1.2.0 # via jaraco-context @@ -31,7 +31,7 @@ celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.16.0 +cffi==1.17.0 # via # cryptography # pynacl @@ -59,7 +59,7 @@ code-annotations==1.8.0 # via # edx-lint # edx-toggles -coverage[toml]==7.6.0 +coverage[toml]==7.6.1 # via pytest-cov cryptography==43.0.0 # via @@ -69,7 +69,7 @@ ddt==1.7.2 # via -r requirements/test.in dill==0.3.8 # via pylint -django==4.2.14 +django==4.2.15 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -105,7 +105,7 @@ drf-jwt==1.19.2 # via edx-drf-extensions edx-ccx-keys==1.3.0 # via openedx-events -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # edx-drf-extensions # edx-toggles @@ -113,7 +113,7 @@ edx-django-utils==5.14.2 # openedx-events edx-drf-extensions==10.3.0 # via -r requirements/base.in -edx-lint==5.3.7 +edx-lint==5.4.0 # via -r requirements/quality.in edx-opaque-keys[django]==2.10.0 # via @@ -131,9 +131,9 @@ event-tracking==2.4.0 # -r requirements/base.in exceptiongroup==1.2.2 # via pytest -factory-boy==3.3.0 +factory-boy==3.3.1 # via -r requirements/test.in -faker==26.0.0 +faker==28.0.0 # via factory-boy fastavro==1.9.5 # via openedx-events @@ -141,14 +141,13 @@ freezegun==1.5.1 # via -r requirements/test.in fs==2.4.16 # via xblock -idna==3.7 +idna==3.8 # via requests -importlib-metadata==6.11.0 +importlib-metadata==8.4.0 # via - # -c requirements/common_constraints.txt # keyring # twine -importlib-resources==6.4.0 +importlib-resources==6.4.4 # via keyring iniconfig==2.0.0 # via pytest @@ -158,9 +157,9 @@ isort==5.13.2 # pylint jaraco-classes==3.4.0 # via keyring -jaraco-context==5.3.0 +jaraco-context==6.0.1 # via keyring -jaraco-functools==4.0.1 +jaraco-functools==4.0.2 # via keyring jeepney==0.8.0 # via @@ -168,11 +167,11 @@ jeepney==0.8.0 # secretstorage jinja2==3.1.4 # via code-annotations -keyring==25.2.1 +keyring==25.3.0 # via twine -kombu==5.3.7 +kombu==5.4.0 # via celery -lxml==5.2.2 +lxml==5.3.0 # via xblock mako==1.3.5 # via xblock @@ -189,19 +188,19 @@ mdurl==0.1.2 # via markdown-it-py mock==5.1.0 # via -r requirements/test.in -more-itertools==10.3.0 +more-itertools==10.4.0 # via # jaraco-classes # jaraco-functools -newrelic==9.12.0 +newrelic==9.13.0 # via edx-django-utils nh3==0.2.18 # via readme-renderer -openedx-events==9.11.0 +openedx-events==9.12.0 # via event-tracking packaging==24.1 # via pytest -pbr==6.0.0 +pbr==6.1.0 # via stevedore pkginfo==1.10.0 # via twine @@ -213,7 +212,7 @@ prompt-toolkit==3.0.47 # via click-repl psutil==6.0.0 # via edx-django-utils -pycodestyle==2.12.0 +pycodestyle==2.12.1 # via -r requirements/quality.in pycparser==2.22 # via cffi @@ -223,7 +222,7 @@ pygments==2.18.0 # via # readme-renderer # rich -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # drf-jwt # edx-drf-extensions @@ -247,7 +246,7 @@ pymongo==3.13.0 # event-tracking pynacl==1.5.0 # via edx-django-utils -pytest==8.3.1 +pytest==8.3.2 # via # pytest-cov # pytest-django @@ -268,7 +267,7 @@ pytz==2024.1 # -r requirements/base.in # event-tracking # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # code-annotations # xblock @@ -283,13 +282,13 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.1 +rich==13.8.0 # via twine secretstorage==3.3.3 # via keyring semantic-version==2.10.0 # via edx-drf-extensions -simplejson==3.19.2 +simplejson==3.19.3 # via xblock six==1.16.0 # via @@ -302,7 +301,7 @@ snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via # code-annotations # edx-django-utils @@ -314,7 +313,7 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.13.0 +tomlkit==0.13.2 # via pylint twine==5.1.1 # via -r requirements/quality.in @@ -343,19 +342,19 @@ wcwidth==0.2.13 # via prompt-toolkit web-fragments==2.2.0 # via xblock -webob==1.8.7 +webob==1.8.8 # via xblock -wheel==0.43.0 +wheel==0.44.0 # via -r requirements/quality.in -xblock==4.0.1 +xblock==5.1.0 # via -r requirements/base.in -zipp==3.19.2 +zipp==3.20.1 # via # importlib-metadata # importlib-resources # The following packages are considered to be unsafe in a requirements file: -setuptools==71.1.0 +setuptools==73.0.1 # via # -r requirements/base.in # fs diff --git a/requirements/test.txt b/requirements/test.txt index 4a012b1..37bd94b 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -10,7 +10,7 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -attrs==23.2.0 +attrs==24.2.0 # via openedx-events backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via @@ -25,7 +25,7 @@ celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.16.0 +cffi==1.17.0 # via # cryptography # pynacl @@ -47,7 +47,7 @@ click-repl==0.3.0 # via celery code-annotations==1.8.0 # via edx-toggles -coverage[toml]==7.6.0 +coverage[toml]==7.6.1 # via pytest-cov cryptography==43.0.0 # via pyjwt @@ -85,7 +85,7 @@ drf-jwt==1.19.2 # via edx-drf-extensions edx-ccx-keys==1.3.0 # via openedx-events -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # edx-drf-extensions # edx-toggles @@ -109,9 +109,9 @@ event-tracking==2.4.0 # -r requirements/base.in exceptiongroup==1.2.2 # via pytest -factory-boy==3.3.0 +factory-boy==3.3.1 # via -r requirements/test.in -faker==26.0.0 +faker==28.0.0 # via factory-boy fastavro==1.9.5 # via openedx-events @@ -119,15 +119,15 @@ freezegun==1.5.1 # via -r requirements/test.in fs==2.4.16 # via xblock -idna==3.7 +idna==3.8 # via requests iniconfig==2.0.0 # via pytest jinja2==3.1.4 # via code-annotations -kombu==5.3.7 +kombu==5.4.0 # via celery -lxml==5.2.2 +lxml==5.3.0 # via xblock mako==1.3.5 # via xblock @@ -138,13 +138,13 @@ markupsafe==2.1.5 # xblock mock==5.1.0 # via -r requirements/test.in -newrelic==9.12.0 +newrelic==9.13.0 # via edx-django-utils -openedx-events==9.11.0 +openedx-events==9.12.0 # via event-tracking packaging==24.1 # via pytest -pbr==6.0.0 +pbr==6.1.0 # via stevedore pluggy==1.5.0 # via pytest @@ -154,7 +154,7 @@ psutil==6.0.0 # via edx-django-utils pycparser==2.22 # via cffi -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # drf-jwt # edx-drf-extensions @@ -164,7 +164,7 @@ pymongo==3.13.0 # event-tracking pynacl==1.5.0 # via edx-django-utils -pytest==8.3.1 +pytest==8.3.2 # via # pytest-cov # pytest-django @@ -185,7 +185,7 @@ pytz==2024.1 # -r requirements/base.in # event-tracking # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # code-annotations # xblock @@ -193,7 +193,7 @@ requests==2.32.3 # via edx-drf-extensions semantic-version==2.10.0 # via edx-drf-extensions -simplejson==3.19.2 +simplejson==3.19.3 # via xblock six==1.16.0 # via @@ -203,7 +203,7 @@ six==1.16.0 # python-dateutil sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via # code-annotations # edx-django-utils @@ -234,9 +234,9 @@ wcwidth==0.2.13 # via prompt-toolkit web-fragments==2.2.0 # via xblock -webob==1.8.7 +webob==1.8.8 # via xblock -xblock==4.0.1 +xblock==5.1.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: From 06e95bde269fa0596cc834ac05074346d9685a07 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Thu, 29 Aug 2024 15:34:31 +0930 Subject: [PATCH 2/4] fix: pin edx-lint<5.4 to avoid quality error with python 3.8 AttributeError: module 'importlib.resources' has no attribute 'files' --- requirements/base.txt | 6 ------ requirements/constraints.txt | 4 ++++ requirements/dev.txt | 9 ++------- requirements/doc.txt | 6 ------ requirements/quality.txt | 12 ++++-------- requirements/test.txt | 6 ------ 6 files changed, 10 insertions(+), 33 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index b345d6b..2f79202 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -25,10 +25,6 @@ celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.17.0 - # via - # cryptography - # pynacl charset-normalizer==3.3.2 # via requests click==8.1.7 @@ -134,8 +130,6 @@ prompt-toolkit==3.0.47 # via click-repl psutil==6.0.0 # via edx-django-utils -pycparser==2.22 - # via cffi pyjwt[crypto]==2.9.0 # via # drf-jwt diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 810e8f0..9e074f5 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -12,3 +12,7 @@ # Temporary to Support the python 3.11 Upgrade backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library + +# Temporary until we drop support for python 3.8 +# Upgrading causes quality error: AttributeError: module 'importlib.resources' has no attribute 'files' +edx-lint<5.4 diff --git a/requirements/dev.txt b/requirements/dev.txt index dd8d162..9ad05ca 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -35,10 +35,6 @@ celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.17.0 - # via - # cryptography - # pynacl chardet==5.2.0 # via # diff-cover @@ -131,8 +127,9 @@ edx-drf-extensions==10.3.0 # via -r requirements/base.in edx-i18n-tools==1.6.2 # via -r requirements/dev.in -edx-lint==5.4.0 +edx-lint==5.3.7 # via + # -c requirements/constraints.txt # -r requirements/dev.in # -r requirements/quality.in edx-opaque-keys[django]==2.10.0 @@ -259,8 +256,6 @@ psutil==6.0.0 # via edx-django-utils pycodestyle==2.12.1 # via -r requirements/quality.in -pycparser==2.22 - # via cffi pydocstyle==6.3.0 # via -r requirements/quality.in pygments==2.18.0 diff --git a/requirements/doc.txt b/requirements/doc.txt index 71d0b03..5eb7c09 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -35,10 +35,6 @@ celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.17.0 - # via - # cryptography - # pynacl charset-normalizer==3.3.2 # via requests click==8.1.7 @@ -181,8 +177,6 @@ prompt-toolkit==3.0.47 # via click-repl psutil==6.0.0 # via edx-django-utils -pycparser==2.22 - # via cffi pydata-sphinx-theme==0.14.4 # via sphinx-book-theme pygments==2.18.0 diff --git a/requirements/quality.txt b/requirements/quality.txt index 68cf7fb..12cf9d3 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -31,10 +31,6 @@ celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.17.0 - # via - # cryptography - # pynacl charset-normalizer==3.3.2 # via requests click==8.1.7 @@ -113,8 +109,10 @@ edx-django-utils==5.15.0 # openedx-events edx-drf-extensions==10.3.0 # via -r requirements/base.in -edx-lint==5.4.0 - # via -r requirements/quality.in +edx-lint==5.3.7 + # via + # -c requirements/constraints.txt + # -r requirements/quality.in edx-opaque-keys[django]==2.10.0 # via # -r requirements/base.in @@ -214,8 +212,6 @@ psutil==6.0.0 # via edx-django-utils pycodestyle==2.12.1 # via -r requirements/quality.in -pycparser==2.22 - # via cffi pydocstyle==6.3.0 # via -r requirements/quality.in pygments==2.18.0 diff --git a/requirements/test.txt b/requirements/test.txt index 37bd94b..c724d1a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -25,10 +25,6 @@ celery==5.4.0 # via event-tracking certifi==2024.7.4 # via requests -cffi==1.17.0 - # via - # cryptography - # pynacl charset-normalizer==3.3.2 # via requests click==8.1.7 @@ -152,8 +148,6 @@ prompt-toolkit==3.0.47 # via click-repl psutil==6.0.0 # via edx-django-utils -pycparser==2.22 - # via cffi pyjwt[crypto]==2.9.0 # via # drf-jwt From 91a96c77ff88207266ef0ef058341f073f4615a0 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Thu, 29 Aug 2024 15:34:58 +0930 Subject: [PATCH 3/4] build: add compile-requirements make target --- Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index eada5b9..957b066 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: clean compile_translations coverage docs dummy_translations \ extract_translations fake_translations help pull_translations push_translations \ - quality requirements selfcheck test test-all upgrade validate + quality requirements selfcheck test test-all compile-requirements upgrade validate .DEFAULT_GOAL := help @@ -46,20 +46,20 @@ COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt $(COMMON_CONSTRAINTS_TXT): wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)" -upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade -upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in +compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade +compile-requirements: $(COMMON_CONSTRAINTS_TXT) ## 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 --rebuild -o requirements/pip.txt requirements/pip.in - pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in + pip-compile ${COMPILE_OPTS} --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in + pip-compile ${COMPILE_OPTS} -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt - pip-compile --upgrade --allow-unsafe -o requirements/base.txt requirements/base.in - pip-compile --upgrade -o requirements/test.txt requirements/test.in - pip-compile --upgrade -o requirements/doc.txt requirements/doc.in - pip-compile --upgrade --allow-unsafe -o requirements/quality.txt requirements/quality.in - pip-compile --upgrade -o requirements/ci.txt requirements/ci.in - pip-compile --upgrade -o requirements/dev.txt requirements/dev.in + pip-compile ${COMPILE_OPTS} --allow-unsafe -o requirements/base.txt requirements/base.in + pip-compile ${COMPILE_OPTS} -o requirements/test.txt requirements/test.in + pip-compile ${COMPILE_OPTS} -o requirements/doc.txt requirements/doc.in + pip-compile ${COMPILE_OPTS} --allow-unsafe -o requirements/quality.txt requirements/quality.in + pip-compile ${COMPILE_OPTS} -o requirements/ci.txt requirements/ci.in + pip-compile ${COMPILE_OPTS} -o requirements/dev.txt requirements/dev.in # Let tox control the Django version for tests sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp mv requirements/test.tmp requirements/test.txt @@ -67,6 +67,8 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with sed '/^[dD]jangorestframework==/d' requirements/test.txt > requirements/test.tmp mv requirements/test.tmp requirements/test.txt +upgrade: ## update the pip requirements files to use the latest releases satisfying our constraints + $(MAKE) compile-requirements COMPILE_OPTS="--upgrade" quality: ## check coding style with pycodestyle and pylint tox -e quality From 80c8a9fc96e8f1070f13e53017308a17868a1616 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Thu, 29 Aug 2024 15:35:25 +0930 Subject: [PATCH 4/4] chore: bumps version to 4.6.8 --- completion/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/completion/__init__.py b/completion/__init__.py index 61dd145..068402b 100644 --- a/completion/__init__.py +++ b/completion/__init__.py @@ -3,4 +3,4 @@ """ -__version__ = '4.6.7' +__version__ = '4.6.8'