diff --git a/Makefile b/Makefile index b7949de..6c66dcd 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,10 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp mv requirements/common_constraints.tmp requirements/common_constraints.txt pip install -qr requirements/pip-tools.txt + pip-compile --rebuild --upgrade --allow-unsafe -o requirements/pip.txt requirements/pip.in + pip-compile --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in + pip install -qr requirements/pip.txt + pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! # need to do this to remove django-simple-history from common constraint. $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/requirements/base.txt b/requirements/base.txt index 6d52963..643328c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -40,7 +40,7 @@ click-repl==0.3.0 # via celery code-annotations==1.8.0 # via edx-toggles -cryptography==43.0.1 +cryptography==44.0.0 # via pyjwt django==4.2.16 # via @@ -133,7 +133,7 @@ newrelic==9.13.0 # via edx-django-utils openedx-events==9.14.1 # via -r requirements/base.in -packaging==24.1 +packaging==24.2 # via drf-yasg pbr==6.1.0 # via stevedore diff --git a/requirements/ci.txt b/requirements/ci.txt index 833af19..c2b575b 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -18,7 +18,7 @@ filelock==3.15.4 # via # tox # virtualenv -packaging==24.1 +packaging==24.2 # via # pyproject-api # tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index fc95227..c169833 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -12,7 +12,6 @@ # Note: Changes to this file will automatically be used by other repos, referencing # this file from Github directly. It does not require packaging in edx-lint. - # using LTS django version Django<5.0 @@ -24,9 +23,6 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected -# 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 -# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586 -# has been resolved and edx-platform is running with pymongo>=4.4.0 -event-tracking<2.4.1 +# 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/constraints.txt b/requirements/constraints.txt index d1559da..87895b3 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -17,5 +17,14 @@ celery>=5.2.2,<6.0.0 django-simple-history==3.4.0 +# docutils has conflicting version for the dependencies. Reference issue: https://github.com/edx/edx-name-affirmation/issues/231 +# issue to unpin +# Date: 09-12-2024 + +sphinx==8.1.3 +sphinx-book-theme==1.1.3 +docutils==0.21.2 +sphinxcontrib-applehelp==2.0.0 + # Temporary to Support the python 3.11 Upgrade backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library diff --git a/requirements/dev.txt b/requirements/dev.txt index 8a78996..ae0ccdc 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -21,7 +21,7 @@ backports-tarfile==1.2.0 # via # -r requirements/quality.txt # jaraco-context -build==1.2.1 +build==1.2.2.post1 # via # -r requirements/pip-tools.txt # pip-tools @@ -33,10 +33,6 @@ certifi==2024.8.30 # via # -r requirements/quality.txt # requests -cffi==1.17.1 - # via - # -r requirements/quality.txt - # cryptography chardet==5.2.0 # via # -r requirements/ci.txt @@ -69,10 +65,6 @@ colorama==0.4.6 # tox coverage==7.6.1 # via -r requirements/ci.txt -cryptography==43.0.1 - # via - # -r requirements/quality.txt - # secretstorage diff-cover==9.1.1 # via -r requirements/dev.in dill==0.3.8 @@ -90,6 +82,7 @@ django==4.2.16 # edx-i18n-tools docutils==0.21.2 # via + # -c requirements/constraints.txt # -r requirements/quality.txt # readme-renderer # rstcheck-core @@ -127,11 +120,6 @@ jaraco-functools==4.0.2 # via # -r requirements/quality.txt # keyring -jeepney==0.8.0 - # via - # -r requirements/quality.txt - # keyring - # secretstorage jinja2==3.1.4 # via # -r requirements/quality.txt @@ -172,7 +160,7 @@ nh3==0.2.18 # via # -r requirements/quality.txt # readme-renderer -packaging==24.1 +packaging==24.2 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -207,10 +195,6 @@ polib==1.2.0 # via edx-i18n-tools pycodestyle==2.12.1 # via -r requirements/quality.txt -pycparser==2.22 - # via - # -r requirements/quality.txt - # cffi pydantic==2.9.0 # via # -r requirements/quality.txt @@ -251,7 +235,7 @@ pyproject-api==1.7.1 # via # -r requirements/ci.txt # tox -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # -r requirements/pip-tools.txt # build @@ -293,10 +277,6 @@ rstcheck-core==1.2.1 # via # -r requirements/quality.txt # rstcheck -secretstorage==3.3.3 - # via - # -r requirements/quality.txt - # keyring shellingham==1.5.4 # via # -r requirements/quality.txt @@ -352,7 +332,7 @@ virtualenv==20.26.3 # via # -r requirements/ci.txt # tox -wheel==0.44.0 +wheel==0.45.1 # via # -r requirements/pip-tools.txt # pip-tools diff --git a/requirements/doc.txt b/requirements/doc.txt index 0c14434..91a9407 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -15,7 +15,11 @@ asgiref==3.8.1 attrs==24.2.0 # via openedx-events babel==2.16.0 - # via sphinx + # via + # pydata-sphinx-theme + # sphinx +beautifulsoup4==4.12.3 + # via pydata-sphinx-theme billiard==4.2.0 # via celery celery==5.4.0 @@ -46,7 +50,7 @@ click-repl==0.3.0 # via celery code-annotations==1.8.0 # via edx-toggles -cryptography==43.0.1 +cryptography==44.0.0 # via pyjwt django==4.2.16 # via @@ -99,6 +103,7 @@ doc8==1.1.2 # via -r requirements/doc.in docutils==0.21.2 # via + # -c requirements/constraints.txt # doc8 # pydata-sphinx-theme # readme-renderer @@ -123,8 +128,11 @@ edx-django-utils==5.15.0 # openedx-events edx-drf-extensions==10.4.0 # via -r requirements/base.in -edx-opaque-keys==2.11.0 - # via edx-drf-extensions +edx-opaque-keys[django]==2.11.0 + # via + # edx-ccx-keys + # edx-drf-extensions + # openedx-events edx-toggles==5.2.0 # via -r requirements/base.in fastavro==1.9.7 @@ -151,10 +159,9 @@ nh3==0.2.18 # via readme-renderer openedx-events==9.14.1 # via -r requirements/base.in -packaging==24.1 +packaging==24.2 # via # drf-yasg - # pydata-sphinx-theme # sphinx pbr==6.1.0 # via stevedore @@ -166,7 +173,7 @@ psutil==6.0.0 # via edx-django-utils pycparser==2.22 # via cffi -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.16.0 # via sphinx-book-theme pygments==2.18.0 # via @@ -205,6 +212,7 @@ semantic-version==2.10.0 # via edx-drf-extensions six==1.16.0 # via + # edx-ccx-keys # pockets # python-dateutil # sphinxcontrib-napoleon @@ -212,15 +220,20 @@ snowballstemmer==2.2.0 # via sphinx soupsieve==2.5 # via beautifulsoup4 -sphinx==5.3.0 +sphinx==8.1.3 # via + # -c requirements/constraints.txt # -r requirements/doc.in # pydata-sphinx-theme # sphinx-book-theme -sphinx-book-theme==1.0.1 - # via -r requirements/doc.in -sphinxcontrib-applehelp==1.0.4 - # via sphinx +sphinx-book-theme==1.1.3 + # via + # -c requirements/constraints.txt + # -r requirements/doc.in +sphinxcontrib-applehelp==2.0.0 + # via + # -c requirements/constraints.txt + # sphinx sphinxcontrib-devhelp==2.0.0 # via sphinx sphinxcontrib-htmlhelp==2.1.0 @@ -245,11 +258,8 @@ text-unidecode==1.3 # via python-slugify typing-extensions==4.12.2 # via - # asgiref # edx-opaque-keys - # kombu # pydata-sphinx-theme - # via edx-opaque-keys tzdata==2024.1 # via celery uritemplate==4.1.1 @@ -263,6 +273,3 @@ vine==5.1.0 # kombu wcwidth==0.2.13 # via prompt-toolkit - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 189b91e..a0f08f7 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,19 +4,19 @@ # # make upgrade # -build==1.2.1 +build==1.2.2.post1 # via pip-tools click==8.1.7 # via pip-tools -packaging==24.1 +packaging==24.2 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # build # pip-tools -wheel==0.44.0 +wheel==0.45.1 # via # -r requirements/pip-tools.in # pip-tools diff --git a/requirements/pip.in b/requirements/pip.in new file mode 100644 index 0000000..716c6f2 --- /dev/null +++ b/requirements/pip.in @@ -0,0 +1,6 @@ +# Core dependencies for installing other packages +-c constraints.txt + +pip +setuptools +wheel diff --git a/requirements/pip.txt b/requirements/pip.txt new file mode 100644 index 0000000..0bdb9d7 --- /dev/null +++ b/requirements/pip.txt @@ -0,0 +1,16 @@ +# +# 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 requirements/common_constraints.txt + # -r requirements/pip.in +setuptools==75.6.0 + # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 932eade..c0cae48 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -16,8 +16,6 @@ backports-tarfile==1.2.0 # via jaraco-context certifi==2024.8.30 # via requests -cffi==1.17.1 - # via cryptography charset-normalizer==3.3.2 # via requests click==8.1.7 @@ -30,8 +28,6 @@ click-log==0.4.0 # via edx-lint code-annotations==1.8.0 # via edx-lint -cryptography==43.0.1 - # via secretstorage dill==0.3.8 # via pylint django==4.2.16 @@ -40,6 +36,7 @@ django==4.2.16 # -r requirements/quality.in docutils==0.21.2 # via + # -c requirements/constraints.txt # readme-renderer # rstcheck-core edx-lint==5.4.0 @@ -60,10 +57,6 @@ jaraco-context==6.0.1 # via keyring jaraco-functools==4.0.2 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.4 # via code-annotations keyring==25.3.0 @@ -90,8 +83,6 @@ platformdirs==4.2.2 # via pylint pycodestyle==2.12.1 # via -r requirements/quality.in -pycparser==2.22 - # via cffi pydantic==2.9.0 # via rstcheck-core pydantic-core==2.23.2 @@ -138,8 +129,6 @@ rstcheck==6.2.4 # via -r requirements/quality.in rstcheck-core==1.2.1 # via rstcheck -secretstorage==3.3.3 - # via keyring shellingham==1.5.4 # via typer six==1.16.0 diff --git a/requirements/test.txt b/requirements/test.txt index 2e676c3..e9e23eb 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -66,7 +66,7 @@ code-annotations==1.8.0 # edx-toggles coverage[toml]==7.6.1 # via pytest-cov -cryptography==43.0.1 +cryptography==44.0.0 # via # -r requirements/base.txt # pyjwt @@ -193,7 +193,7 @@ newrelic==9.13.0 # edx-django-utils openedx-events==9.14.1 # via -r requirements/base.txt -packaging==24.1 +packaging==24.2 # via # -r requirements/base.txt # drf-yasg