diff --git a/Makefile b/Makefile index 3334362..a2fb9b5 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,16 @@ docs: ## generate Sphinx HTML documentation, including API docs # Define PIP_COMPILE_OPTS=-v to get more information during make upgrade. PIP_COMPILE = pip-compile --upgrade $(PIP_COMPILE_OPTS) +COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt +.PHONY: $(COMMON_CONSTRAINTS_TXT) +$(COMMON_CONSTRAINTS_TXT): + wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)" + echo "$(COMMON_CONSTRAINTS_TEMP_COMMENT)" | cat - $(@) > temp && mv temp $(@) + upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade -upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in +upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in + sed 's/Django<4.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 # Make sure to compile files after any other files they include! $(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in diff --git a/requirements/base.txt b/requirements/base.txt index b0adcf4..8b9cbf4 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,32 +8,33 @@ asgiref==3.7.2 # via django attrs==23.1.0 # via openedx-events -django==3.2.19 +backports-zoneinfo==0.2.1 + # via django +django==4.2.6 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # django-model-utils # openedx-events # openedx-filters django-model-utils==4.3.1 # via -r requirements/base.in -edx-opaque-keys[django]==2.3.0 +edx-opaque-keys[django]==2.5.1 # via openedx-events -fastavro==1.7.4 +fastavro==1.8.4 # via openedx-events -openedx-events==8.0.1 +openedx-events==9.0.0 # via -r requirements/base.in -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via -r requirements/base.in pbr==5.11.1 # via stevedore pymongo==3.13.0 # via edx-opaque-keys -pytz==2023.3 - # via django sqlparse==0.4.4 # via django stevedore==5.1.0 # via edx-opaque-keys -typing-extensions==4.6.3 - # via asgiref +typing-extensions==4.8.0 + # via + # asgiref + # edx-opaque-keys diff --git a/requirements/ci.in b/requirements/ci.in index 3797849..3586cbe 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -3,4 +3,3 @@ -c constraints.txt tox # Virtualenv management for tests -tox-battery # Makes tox aware of requirements file changes diff --git a/requirements/ci.txt b/requirements/ci.txt index 0989b5e..fefb1df 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,17 +4,17 @@ # # make upgrade # -distlib==0.3.6 +distlib==0.3.7 # via virtualenv -filelock==3.12.2 +filelock==3.12.4 # via # tox # virtualenv -packaging==23.1 +packaging==23.2 # via tox -platformdirs==3.5.3 +platformdirs==3.11.0 # via virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via tox py==1.11.0 # via tox @@ -24,10 +24,7 @@ tomli==2.0.1 # via tox tox==3.28.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/common_constraints.txt # -r requirements/ci.in - # tox-battery -tox-battery==0.6.1 - # via -r requirements/ci.in -virtualenv==20.23.0 +virtualenv==20.24.6 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt new file mode 100644 index 0000000..e236582 --- /dev/null +++ b/requirements/common_constraints.txt @@ -0,0 +1,28 @@ + +# A central location for most common version constraints +# (across edx repos) for pip-installation. +# +# Similar to other constraint files this file doesn't install any packages. +# It specifies version constraints that will be applied if a package is needed. +# When pinning something here, please provide an explanation of why it is a good +# idea to pin this package across all edx repos, Ideally, link to other information +# that will help people in the future to remove the pin when possible. +# Writing an issue against the offending project and linking to it here is good. +# +# 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 + + +# 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 +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 + +# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. +# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 +tox<4.0.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index d91704b..a51cb08 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -9,4 +9,4 @@ # linking to it here is good. # Common constraints for edx repos --c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt +-c common_constraints.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 5cf39a0..c5bacd2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,15 +8,15 @@ appdirs==1.4.4 # via # -r requirements/quality.txt # fs -arrow==1.2.3 +arrow==1.3.0 # via # -r requirements/quality.txt - # jinja2-time + # cookiecutter asgiref==3.7.2 # via # -r requirements/quality.txt # django -astroid==2.15.5 +astroid==3.0.1 # via # -r requirements/quality.txt # pylint @@ -25,37 +25,41 @@ attrs==23.1.0 # via # -r requirements/quality.txt # openedx-events +backports-zoneinfo==0.2.1 + # via + # -r requirements/quality.txt + # django binaryornot==0.4.4 # via # -r requirements/quality.txt # cookiecutter -boto3==1.26.153 +boto3==1.28.72 # via # -r requirements/quality.txt # fs-s3fs -botocore==1.29.153 +botocore==1.31.72 # via # -r requirements/quality.txt # boto3 # s3transfer -build==0.10.0 +build==1.0.3 # via # -r requirements/pip-tools.txt # pip-tools -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/quality.txt # requests -chardet==5.1.0 +chardet==5.2.0 # via # -r requirements/quality.txt # binaryornot # diff-cover -charset-normalizer==3.1.0 +charset-normalizer==3.3.1 # via # -r requirements/quality.txt # requests -click==8.1.3 +click==8.1.7 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt @@ -68,36 +72,35 @@ click-log==0.4.0 # via # -r requirements/quality.txt # edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via # -r requirements/quality.txt # edx-lint -cookiecutter==2.1.1 +cookiecutter==2.4.0 # via # -r requirements/quality.txt # xblock-sdk -coverage[toml]==7.2.7 +coverage[toml]==7.3.2 # via # -r requirements/quality.txt + # coverage # pytest-cov -diff-cover==7.6.0 +diff-cover==7.7.0 # via -r requirements/dev.in -dill==0.3.6 +dill==0.3.7 # via # -r requirements/quality.txt # pylint -distlib==0.3.6 +distlib==0.3.7 # via # -r requirements/ci.txt # virtualenv -django==3.2.19 +django==4.2.6 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # django-model-utils # djangorestframework # edx-i18n-tools - # openedx-django-pyfs # openedx-events # openedx-filters # xblock-sdk @@ -105,23 +108,24 @@ django-model-utils==4.3.1 # via -r requirements/quality.txt djangorestframework==3.14.0 # via -r requirements/quality.txt -edx-i18n-tools==0.9.2 +edx-i18n-tools==1.3.0 # via -r requirements/dev.in -edx-lint==5.3.4 +edx-lint==5.3.6 # via -r requirements/quality.txt -edx-opaque-keys[django]==2.3.0 +edx-opaque-keys[django]==2.5.1 # via # -r requirements/quality.txt + # edx-opaque-keys # openedx-events -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # -r requirements/quality.txt # pytest -fastavro==1.7.4 +fastavro==1.8.4 # via # -r requirements/quality.txt # openedx-events -filelock==3.12.2 +filelock==3.12.4 # via # -r requirements/ci.txt # tox @@ -130,17 +134,19 @@ fs==2.4.16 # via # -r requirements/quality.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/quality.txt - # openedx-django-pyfs # xblock-sdk idna==3.4 # via # -r requirements/quality.txt # requests +importlib-metadata==6.8.0 + # via + # -r requirements/pip-tools.txt + # build iniconfig==2.0.0 # via # -r requirements/quality.txt @@ -155,49 +161,46 @@ jinja2==3.1.2 # code-annotations # cookiecutter # diff-cover - # jinja2-time -jinja2-time==0.2.0 - # via - # -r requirements/quality.txt - # cookiecutter jmespath==1.0.1 # via # -r requirements/quality.txt # boto3 # botocore -lazy==1.5 +lxml==4.9.3 # via # -r requirements/quality.txt + # edx-i18n-tools # xblock -lazy-object-proxy==1.9.0 + # xblock-sdk +mako==1.2.4 # via # -r requirements/quality.txt - # astroid -lxml==4.9.2 + # xblock +markdown-it-py==3.0.0 # via # -r requirements/quality.txt - # xblock - # xblock-sdk + # rich markupsafe==2.1.3 # via # -r requirements/quality.txt # jinja2 + # mako # xblock mccabe==0.7.0 # via # -r requirements/quality.txt # pylint -mock==5.0.2 - # via -r requirements/quality.txt -openedx-django-pyfs==3.3.0 +mdurl==0.1.2 # via # -r requirements/quality.txt - # xblock -openedx-events==8.0.1 + # markdown-it-py +mock==5.1.0 # via -r requirements/quality.txt -openedx-filters==1.3.0 +openedx-events==9.0.0 # via -r requirements/quality.txt -packaging==23.1 +openedx-filters==1.6.0 + # via -r requirements/quality.txt +packaging==23.2 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -205,21 +208,21 @@ packaging==23.1 # build # pytest # tox -path==16.6.0 +path==16.7.1 # via edx-i18n-tools pbr==5.11.1 # via # -r requirements/quality.txt # stevedore -pip-tools==6.13.0 +pip-tools==7.3.0 # via -r requirements/pip-tools.txt -platformdirs==3.5.3 +platformdirs==3.11.0 # via # -r requirements/ci.txt # -r requirements/quality.txt # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -232,13 +235,16 @@ py==1.11.0 # via # -r requirements/ci.txt # tox -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via -r requirements/quality.txt pydocstyle==6.3.0 # via -r requirements/quality.txt -pygments==2.15.1 - # via diff-cover -pylint==2.17.4 +pygments==2.16.1 + # via + # -r requirements/quality.txt + # diff-cover + # rich +pylint==3.0.2 # via # -r requirements/quality.txt # edx-lint @@ -249,7 +255,7 @@ pylint-celery==0.3 # via # -r requirements/quality.txt # edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via # -r requirements/quality.txt # edx-lint @@ -270,7 +276,7 @@ pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt # build -pytest==7.3.2 +pytest==7.4.3 # via # -r requirements/quality.txt # pytest-cov @@ -290,13 +296,12 @@ python-slugify==8.0.1 # -r requirements/quality.txt # code-annotations # cookiecutter -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/quality.txt - # django # djangorestframework # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/quality.txt # code-annotations @@ -308,13 +313,18 @@ requests==2.31.0 # -r requirements/quality.txt # cookiecutter # xblock-sdk -s3transfer==0.6.1 +rich==13.6.0 + # via + # -r requirements/quality.txt + # cookiecutter +s3transfer==0.7.0 # via # -r requirements/quality.txt # boto3 -simplejson==3.19.1 +simplejson==3.19.2 # via # -r requirements/quality.txt + # xblock # xblock-sdk six==1.16.0 # via @@ -349,37 +359,41 @@ tomli==2.0.1 # -r requirements/quality.txt # build # coverage + # pip-tools # pylint # pyproject-hooks # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/quality.txt # pylint tox==3.28.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/common_constraints.txt # -r requirements/ci.txt - # tox-battery -tox-battery==0.6.1 - # via -r requirements/ci.txt -typing-extensions==4.6.3 +types-python-dateutil==2.8.19.14 + # via + # -r requirements/quality.txt + # arrow +typing-extensions==4.8.0 # via # -r requirements/quality.txt # asgiref # astroid + # edx-opaque-keys # pylint -urllib3==1.26.16 + # rich +urllib3==1.26.18 # via # -r requirements/quality.txt # botocore # requests -virtualenv==20.23.0 +virtualenv==20.24.6 # via # -r requirements/ci.txt # tox -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/quality.txt # xblock @@ -389,20 +403,20 @@ webob==1.8.7 # -r requirements/quality.txt # xblock # xblock-sdk -wheel==0.40.0 +wheel==0.41.2 # via # -r requirements/pip-tools.txt # pip-tools -wrapt==1.15.0 - # via - # -r requirements/quality.txt - # astroid -xblock[django]==1.6.2 +xblock==1.8.1 # via # -r requirements/quality.txt # xblock-sdk -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/quality.txt +zipp==3.17.0 + # via + # -r requirements/pip-tools.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/doc.txt b/requirements/doc.txt index 11774ae..3bae72e 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -10,10 +10,10 @@ appdirs==1.4.4 # via # -r requirements/test.txt # fs -arrow==1.2.3 +arrow==1.3.0 # via # -r requirements/test.txt - # jinja2-time + # cookiecutter asgiref==3.7.2 # via # -r requirements/test.txt @@ -22,63 +22,60 @@ attrs==23.1.0 # via # -r requirements/test.txt # openedx-events -babel==2.12.1 +babel==2.13.1 # via sphinx +backports-zoneinfo==0.2.1 + # via + # -r requirements/test.txt + # django binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -bleach==6.0.0 - # via readme-renderer -boto3==1.26.153 +boto3==1.28.72 # via # -r requirements/test.txt # fs-s3fs -botocore==1.29.153 +botocore==1.31.72 # via # -r requirements/test.txt # boto3 # s3transfer -build==0.10.0 +build==1.0.3 # via -r requirements/doc.in -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/test.txt # requests -cffi==1.15.1 - # via cryptography -chardet==5.1.0 +chardet==5.2.0 # via # -r requirements/test.txt # binaryornot -charset-normalizer==3.1.0 +charset-normalizer==3.3.1 # via # -r requirements/test.txt # requests -click==8.1.3 +click==8.1.7 # via # -r requirements/test.txt # code-annotations # cookiecutter -code-annotations==1.3.0 +code-annotations==1.5.0 # via -r requirements/test.txt -cookiecutter==2.1.1 +cookiecutter==2.4.0 # via # -r requirements/test.txt # xblock-sdk -coverage[toml]==7.2.7 +coverage[toml]==7.3.2 # via # -r requirements/test.txt + # coverage # pytest-cov -cryptography==41.0.1 - # via secretstorage -django==3.2.19 +django==4.2.6 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-model-utils # djangorestframework - # openedx-django-pyfs # openedx-events # openedx-filters # xblock-sdk @@ -88,21 +85,22 @@ djangorestframework==3.14.0 # via -r requirements/test.txt doc8==1.1.1 # via -r requirements/doc.in -docutils==0.19 +docutils==0.20.1 # via # doc8 # readme-renderer # restructuredtext-lint # sphinx -edx-opaque-keys[django]==2.3.0 +edx-opaque-keys[django]==2.5.1 # via # -r requirements/test.txt + # edx-opaque-keys # openedx-events -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # -r requirements/test.txt # pytest -fastavro==1.7.4 +fastavro==1.8.4 # via # -r requirements/test.txt # openedx-events @@ -110,12 +108,10 @@ fs==2.4.16 # via # -r requirements/test.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/test.txt - # openedx-django-pyfs # xblock-sdk idna==3.4 # via @@ -123,72 +119,67 @@ idna==3.4 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.6.0 +importlib-metadata==6.8.0 # via + # build # keyring # sphinx # twine -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via keyring iniconfig==2.0.0 # via # -r requirements/test.txt # pytest -jaraco-classes==3.2.3 +jaraco-classes==3.3.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.2 # via # -r requirements/test.txt # code-annotations # cookiecutter - # jinja2-time # sphinx -jinja2-time==0.2.0 - # via - # -r requirements/test.txt - # cookiecutter jmespath==1.0.1 # via # -r requirements/test.txt # boto3 # botocore -keyring==23.13.1 +keyring==24.2.0 # via twine -lazy==1.5 +lxml==4.9.3 # via # -r requirements/test.txt # xblock -lxml==4.9.2 + # xblock-sdk +mako==1.2.4 # via # -r requirements/test.txt # xblock - # xblock-sdk markdown-it-py==3.0.0 - # via rich + # via + # -r requirements/test.txt + # rich markupsafe==2.1.3 # via # -r requirements/test.txt # jinja2 + # mako # xblock mdurl==0.1.2 - # via markdown-it-py -mock==5.0.2 - # via -r requirements/test.txt -more-itertools==9.1.0 - # via jaraco-classes -openedx-django-pyfs==3.3.0 # via # -r requirements/test.txt - # xblock -openedx-events==8.0.1 + # markdown-it-py +mock==5.1.0 # via -r requirements/test.txt -openedx-filters==1.3.0 +more-itertools==10.1.0 + # via jaraco-classes +nh3==0.2.14 + # via readme-renderer +openedx-events==9.0.0 # via -r requirements/test.txt -packaging==23.1 +openedx-filters==1.6.0 + # via -r requirements/test.txt +packaging==23.2 # via # -r requirements/test.txt # build @@ -200,14 +191,13 @@ pbr==5.11.1 # stevedore pkginfo==1.9.6 # via twine -pluggy==1.0.0 +pluggy==1.3.0 # via # -r requirements/test.txt # pytest -pycparser==2.21 - # via cffi -pygments==2.15.1 +pygments==2.16.1 # via + # -r requirements/test.txt # doc8 # readme-renderer # rich @@ -222,7 +212,7 @@ pypng==0.20220715.0 # xblock-sdk pyproject-hooks==1.0.0 # via build -pytest==7.3.2 +pytest==7.4.3 # via # -r requirements/test.txt # pytest-cov @@ -242,20 +232,19 @@ python-slugify==8.0.1 # -r requirements/test.txt # code-annotations # cookiecutter -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/test.txt # babel - # django # djangorestframework # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/test.txt # code-annotations # cookiecutter # xblock -readme-renderer==37.3 +readme-renderer==42.0 # via twine requests==2.31.0 # via @@ -271,31 +260,30 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.4.2 - # via twine -s3transfer==0.6.1 +rich==13.6.0 + # via + # -r requirements/test.txt + # cookiecutter + # twine +s3transfer==0.7.0 # via # -r requirements/test.txt # boto3 -secretstorage==3.3.3 - # via keyring -simplejson==3.19.1 +simplejson==3.19.2 # via # -r requirements/test.txt + # xblock # xblock-sdk six==1.16.0 # via # -r requirements/test.txt - # bleach # fs # fs-s3fs # python-dateutil snowballstemmer==2.2.0 # via sphinx -sphinx==5.3.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # -r requirements/doc.in +sphinx==7.1.2 + # via -r requirements/doc.in sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 @@ -332,36 +320,39 @@ tomli==2.0.1 # pytest twine==4.0.2 # via -r requirements/doc.in -typing-extensions==4.6.3 +types-python-dateutil==2.8.19.14 + # via + # -r requirements/test.txt + # arrow +typing-extensions==4.8.0 # via # -r requirements/test.txt # asgiref + # edx-opaque-keys # rich -urllib3==1.26.16 +urllib3==1.26.18 # via # -r requirements/test.txt # botocore # requests # twine -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/test.txt # xblock # xblock-sdk -webencodings==0.5.1 - # via bleach webob==1.8.7 # via # -r requirements/test.txt # xblock # xblock-sdk -xblock[django]==1.6.2 +xblock==1.8.1 # via # -r requirements/test.txt # xblock-sdk -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/test.txt -zipp==3.15.0 +zipp==3.17.0 # via # importlib-metadata # importlib-resources diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index fd0cc1c..50d35f2 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,20 +4,27 @@ # # make upgrade # -build==0.10.0 +build==1.0.3 # via pip-tools -click==8.1.3 +click==8.1.7 # via pip-tools -packaging==23.1 +importlib-metadata==6.8.0 # via build -pip-tools==6.13.0 +packaging==23.2 + # via build +pip-tools==7.3.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build tomli==2.0.1 - # via build -wheel==0.40.0 + # via + # build + # pip-tools + # pyproject-hooks +wheel==0.41.2 # via pip-tools +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 5a5ce22..0c788d6 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.40.0 +wheel==0.41.2 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.1.2 +pip==23.3.1 # via -r requirements/pip.in -setuptools==67.8.0 +setuptools==68.2.2 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index fe02305..d101cf0 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,15 +8,15 @@ appdirs==1.4.4 # via # -r requirements/test.txt # fs -arrow==1.2.3 +arrow==1.3.0 # via # -r requirements/test.txt - # jinja2-time + # cookiecutter asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.5 +astroid==3.0.1 # via # pylint # pylint-celery @@ -24,32 +24,36 @@ attrs==23.1.0 # via # -r requirements/test.txt # openedx-events +backports-zoneinfo==0.2.1 + # via + # -r requirements/test.txt + # django binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.26.153 +boto3==1.28.72 # via # -r requirements/test.txt # fs-s3fs -botocore==1.29.153 +botocore==1.31.72 # via # -r requirements/test.txt # boto3 # s3transfer -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/test.txt # requests -chardet==5.1.0 +chardet==5.2.0 # via # -r requirements/test.txt # binaryornot -charset-normalizer==3.1.0 +charset-normalizer==3.3.1 # via # -r requirements/test.txt # requests -click==8.1.3 +click==8.1.7 # via # -r requirements/test.txt # click-log @@ -58,27 +62,26 @@ click==8.1.3 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via # -r requirements/test.txt # edx-lint -cookiecutter==2.1.1 +cookiecutter==2.4.0 # via # -r requirements/test.txt # xblock-sdk -coverage[toml]==7.2.7 +coverage[toml]==7.3.2 # via # -r requirements/test.txt + # coverage # pytest-cov -dill==0.3.6 +dill==0.3.7 # via pylint -django==3.2.19 +django==4.2.6 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-model-utils # djangorestframework - # openedx-django-pyfs # openedx-events # openedx-filters # xblock-sdk @@ -86,17 +89,18 @@ django-model-utils==4.3.1 # via -r requirements/test.txt djangorestframework==3.14.0 # via -r requirements/test.txt -edx-lint==5.3.4 +edx-lint==5.3.6 # via -r requirements/quality.in -edx-opaque-keys[django]==2.3.0 +edx-opaque-keys[django]==2.5.1 # via # -r requirements/test.txt + # edx-opaque-keys # openedx-events -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # -r requirements/test.txt # pytest -fastavro==1.7.4 +fastavro==1.8.4 # via # -r requirements/test.txt # openedx-events @@ -104,12 +108,10 @@ fs==2.4.16 # via # -r requirements/test.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/test.txt - # openedx-django-pyfs # xblock-sdk idna==3.4 # via @@ -128,45 +130,43 @@ jinja2==3.1.2 # -r requirements/test.txt # code-annotations # cookiecutter - # jinja2-time -jinja2-time==0.2.0 - # via - # -r requirements/test.txt - # cookiecutter jmespath==1.0.1 # via # -r requirements/test.txt # boto3 # botocore -lazy==1.5 +lxml==4.9.3 # via # -r requirements/test.txt # xblock -lazy-object-proxy==1.9.0 - # via astroid -lxml==4.9.2 + # xblock-sdk +mako==1.2.4 # via # -r requirements/test.txt # xblock - # xblock-sdk +markdown-it-py==3.0.0 + # via + # -r requirements/test.txt + # rich markupsafe==2.1.3 # via # -r requirements/test.txt # jinja2 + # mako # xblock mccabe==0.7.0 # via pylint -mock==5.0.2 - # via -r requirements/test.txt -openedx-django-pyfs==3.3.0 +mdurl==0.1.2 # via # -r requirements/test.txt - # xblock -openedx-events==8.0.1 + # markdown-it-py +mock==5.1.0 + # via -r requirements/test.txt +openedx-events==9.0.0 # via -r requirements/test.txt -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via -r requirements/test.txt -packaging==23.1 +packaging==23.2 # via # -r requirements/test.txt # pytest @@ -174,17 +174,21 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.5.3 +platformdirs==3.11.0 # via pylint -pluggy==1.0.0 +pluggy==1.3.0 # via # -r requirements/test.txt # pytest -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==2.17.4 +pygments==2.16.1 + # via + # -r requirements/test.txt + # rich +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -192,7 +196,7 @@ pylint==2.17.4 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via edx-lint pylint-plugin-utils==0.8.2 # via @@ -206,7 +210,7 @@ pypng==0.20220715.0 # via # -r requirements/test.txt # xblock-sdk -pytest==7.3.2 +pytest==7.4.3 # via # -r requirements/test.txt # pytest-cov @@ -226,13 +230,12 @@ python-slugify==8.0.1 # -r requirements/test.txt # code-annotations # cookiecutter -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/test.txt - # django # djangorestframework # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/test.txt # code-annotations @@ -243,13 +246,18 @@ requests==2.31.0 # -r requirements/test.txt # cookiecutter # xblock-sdk -s3transfer==0.6.1 +rich==13.6.0 + # via + # -r requirements/test.txt + # cookiecutter +s3transfer==0.7.0 # via # -r requirements/test.txt # boto3 -simplejson==3.19.1 +simplejson==3.19.2 # via # -r requirements/test.txt + # xblock # xblock-sdk six==1.16.0 # via @@ -279,20 +287,26 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint -typing-extensions==4.6.3 +types-python-dateutil==2.8.19.14 + # via + # -r requirements/test.txt + # arrow +typing-extensions==4.8.0 # via # -r requirements/test.txt # asgiref # astroid + # edx-opaque-keys # pylint -urllib3==1.26.16 + # rich +urllib3==1.26.18 # via # -r requirements/test.txt # botocore # requests -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/test.txt # xblock @@ -302,13 +316,11 @@ webob==1.8.7 # -r requirements/test.txt # xblock # xblock-sdk -wrapt==1.15.0 - # via astroid -xblock[django]==1.6.2 +xblock==1.8.1 # via # -r requirements/test.txt # xblock-sdk -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/test.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 6a82293..55a2000 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,8 +6,8 @@ # appdirs==1.4.4 # via fs -arrow==1.2.3 - # via jinja2-time +arrow==1.3.0 + # via cookiecutter asgiref==3.7.2 # via # -r requirements/base.txt @@ -16,36 +16,40 @@ attrs==23.1.0 # via # -r requirements/base.txt # openedx-events +backports-zoneinfo==0.2.1 + # via + # -r requirements/base.txt + # django binaryornot==0.4.4 # via cookiecutter -boto3==1.26.153 +boto3==1.28.72 # via fs-s3fs -botocore==1.29.153 +botocore==1.31.72 # via # boto3 # s3transfer -certifi==2023.5.7 +certifi==2023.7.22 # via requests -chardet==5.1.0 +chardet==5.2.0 # via binaryornot -charset-normalizer==3.1.0 +charset-normalizer==3.3.1 # via requests -click==8.1.3 +click==8.1.7 # via # code-annotations # cookiecutter -code-annotations==1.3.0 +code-annotations==1.5.0 # via -r requirements/test.in -cookiecutter==2.1.1 +cookiecutter==2.4.0 # via xblock-sdk -coverage[toml]==7.2.7 - # via pytest-cov +coverage[toml]==7.3.2 + # via + # coverage + # pytest-cov # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # django-model-utils # djangorestframework - # openedx-django-pyfs # openedx-events # openedx-filters # xblock-sdk @@ -53,25 +57,23 @@ django-model-utils==4.3.1 # via -r requirements/base.txt djangorestframework==3.14.0 # via -r requirements/test.in -edx-opaque-keys[django]==2.3.0 +edx-opaque-keys[django]==2.5.1 # via # -r requirements/base.txt + # edx-opaque-keys # openedx-events -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via pytest -fastavro==1.7.4 +fastavro==1.8.4 # via # -r requirements/base.txt # openedx-events fs==2.4.16 # via # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 - # via - # openedx-django-pyfs - # xblock-sdk + # via xblock-sdk idna==3.4 # via requests iniconfig==2.0.0 @@ -80,46 +82,48 @@ jinja2==3.1.2 # via # code-annotations # cookiecutter - # jinja2-time -jinja2-time==0.2.0 - # via cookiecutter jmespath==1.0.1 # via # boto3 # botocore -lazy==1.5 - # via xblock -lxml==4.9.2 +lxml==4.9.3 # via # xblock # xblock-sdk +mako==1.2.4 + # via xblock +markdown-it-py==3.0.0 + # via rich markupsafe==2.1.3 # via # jinja2 + # mako # xblock -mock==5.0.2 +mdurl==0.1.2 + # via markdown-it-py +mock==5.1.0 # via -r requirements/test.in -openedx-django-pyfs==3.3.0 - # via xblock -openedx-events==8.0.1 +openedx-events==9.0.0 # via -r requirements/base.txt -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via -r requirements/base.txt -packaging==23.1 +packaging==23.2 # via pytest pbr==5.11.1 # via # -r requirements/base.txt # stevedore -pluggy==1.0.0 +pluggy==1.3.0 # via pytest +pygments==2.16.1 + # via rich pymongo==3.13.0 # via # -r requirements/base.txt # edx-opaque-keys pypng==0.20220715.0 # via xblock-sdk -pytest==7.3.2 +pytest==7.4.3 # via # pytest-cov # pytest-django @@ -136,13 +140,11 @@ python-slugify==8.0.1 # via # code-annotations # cookiecutter -pytz==2023.3 +pytz==2023.3.post1 # via - # -r requirements/base.txt - # django # djangorestframework # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # code-annotations # cookiecutter @@ -151,10 +153,14 @@ requests==2.31.0 # via # cookiecutter # xblock-sdk -s3transfer==0.6.1 +rich==13.6.0 + # via cookiecutter +s3transfer==0.7.0 # via boto3 -simplejson==3.19.1 - # via xblock-sdk +simplejson==3.19.2 + # via + # xblock + # xblock-sdk six==1.16.0 # via # fs @@ -175,15 +181,19 @@ tomli==2.0.1 # via # coverage # pytest -typing-extensions==4.6.3 +types-python-dateutil==2.8.19.14 + # via arrow +typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref -urllib3==1.26.16 + # edx-opaque-keys + # rich +urllib3==1.26.18 # via # botocore # requests -web-fragments==2.0.0 +web-fragments==2.1.0 # via # xblock # xblock-sdk @@ -191,9 +201,9 @@ webob==1.8.7 # via # xblock # xblock-sdk -xblock[django]==1.6.2 +xblock==1.8.1 # via xblock-sdk -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/test.in # The following packages are considered to be unsafe in a requirements file: diff --git a/tox.ini b/tox.ini index ce71be9..cdeb3f0 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ addopts = --cov skill_tagging --cov-report term-missing --cov-report xml norecursedirs = .* docs requirements site-packages [testenv] -whitelist_externals = +allowlist_externals = make deps = @@ -33,7 +33,7 @@ commands = [testenv:quality] -whitelist_externals = +allowlist_externals = make rm touch