From c9f3f40ba1937ec709922b5c44a6e842d305928f Mon Sep 17 00:00:00 2001 From: Jawayria Date: Mon, 27 Jun 2022 20:41:46 +0500 Subject: [PATCH 01/11] fix: Install pip and pip-tools in upgrade script --- Makefile | 10 +- requirements/base.txt | 15 +-- requirements/ci.txt | 24 +++-- requirements/common_constraints.txt | 25 +++++ requirements/constraints.txt | 2 + requirements/dev.txt | 141 ++++++++++++++-------------- requirements/doc.txt | 74 +++++++-------- requirements/pip-tools.txt | 8 +- requirements/pip.in | 1 + requirements/pip.txt | 10 +- requirements/quality.txt | 114 +++++++++++----------- requirements/test.txt | 43 ++++----- 12 files changed, 255 insertions(+), 212 deletions(-) create mode 100644 requirements/common_constraints.txt diff --git a/Makefile b/Makefile index 4c701e17..867900f8 100644 --- a/Makefile +++ b/Makefile @@ -32,12 +32,20 @@ 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 "$(@)" + 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 pip install -r requirements/pip-tools.txt # Make sure to compile files after any other files they include! $(PIP_COMPILE) --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in + pip install -r requirements/pip.txt pip install -r requirements/pip-tools.txt $(PIP_COMPILE) -o requirements/base.txt requirements/base.in $(PIP_COMPILE) -o requirements/test.txt requirements/test.in diff --git a/requirements/base.txt b/requirements/base.txt index 83883b2f..6dc6163b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,21 +4,22 @@ # # make upgrade # -attrs==21.2.0 +attrs==21.4.0 # via -r requirements/base.in -django==2.2.24 +django==2.2.28 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in -edx-opaque-keys[django]==2.2.2 +edx-opaque-keys[django]==2.3.0 # via -r requirements/base.in -fastavro==1.4.7 +fastavro==1.5.1 # via -r requirements/base.in -pbr==5.8.0 +pbr==5.9.0 # via stevedore -pymongo==3.12.1 +pymongo==3.12.3 # via edx-opaque-keys -pytz==2021.3 +pytz==2022.1 # via django sqlparse==0.4.2 # via django diff --git a/requirements/ci.txt b/requirements/ci.txt index 48bd1863..7e0de281 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,19 +4,17 @@ # # make upgrade # -backports.entry-points-selectable==1.1.1 - # via virtualenv -certifi==2021.10.8 +certifi==2022.6.15 # via requests -charset-normalizer==2.0.7 +charset-normalizer==2.0.12 # via requests codecov==2.1.12 # via -r requirements/ci.in -coverage==6.1.2 +coverage==6.4.1 # via codecov -distlib==0.3.3 +distlib==0.3.4 # via virtualenv -filelock==3.4.0 +filelock==3.7.1 # via # tox # virtualenv @@ -24,15 +22,15 @@ idna==3.3 # via requests packaging==21.3 # via tox -platformdirs==2.4.0 +platformdirs==2.5.2 # via virtualenv pluggy==1.0.0 # via tox py==1.11.0 # via tox -pyparsing==3.0.6 +pyparsing==3.0.9 # via packaging -requests==2.26.0 +requests==2.28.0 # via codecov six==1.16.0 # via @@ -40,9 +38,9 @@ six==1.16.0 # virtualenv toml==0.10.2 # via tox -tox==3.24.4 +tox==3.25.0 # via -r requirements/ci.in -urllib3==1.26.7 +urllib3==1.26.9 # via requests -virtualenv==20.10.0 +virtualenv==20.15.0 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt new file mode 100644 index 00000000..cca3ccd3 --- /dev/null +++ b/requirements/common_constraints.txt @@ -0,0 +1,25 @@ +# 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 +Django<4.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 +elasticsearch<7.14.0 + +setuptools<60 + +# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected +django-simple-history==3.0.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 12ca3d41..fce38492 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -8,5 +8,7 @@ # pin when possible. Writing an issue against the offending project and # linking to it here is good. +-c common_constraints.txt + # edX opaque keys Django constraint django < 3.0, >= 2.2 diff --git a/requirements/dev.txt b/requirements/dev.txt index e1e229e4..6e49a7e5 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,36 +4,32 @@ # # make upgrade # -astroid==2.8.6 +astroid==2.11.6 # via # -r requirements/quality.txt # pylint # pylint-celery -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/quality.txt # pytest -backports.entry-points-selectable==1.1.1 - # via - # -r requirements/ci.txt - # virtualenv -bleach==4.1.0 +bleach==5.0.0 # via # -r requirements/quality.txt # readme-renderer -certifi==2021.10.8 +certifi==2022.6.15 # via # -r requirements/ci.txt # -r requirements/quality.txt # requests -chardet==4.0.0 +chardet==5.0.0 # via diff-cover -charset-normalizer==2.0.7 +charset-normalizer==2.0.12 # via # -r requirements/ci.txt # -r requirements/quality.txt # requests -click==8.0.3 +click==8.1.3 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt @@ -41,49 +37,54 @@ click==8.0.3 # code-annotations # edx-lint # pip-tools -click-log==0.3.2 +click-log==0.4.0 # via # -r requirements/quality.txt # edx-lint -code-annotations==1.2.0 +code-annotations==1.3.0 # via # -r requirements/quality.txt # edx-lint codecov==2.1.12 # via -r requirements/ci.txt -colorama==0.4.4 +commonmark==0.9.1 # via # -r requirements/quality.txt - # twine -coverage[toml]==6.1.2 + # rich +coverage[toml]==6.4.1 # via # -r requirements/ci.txt # -r requirements/quality.txt # codecov # pytest-cov -ddt==1.4.4 +ddt==1.5.0 # via -r requirements/quality.txt -diff-cover==6.4.2 +diff-cover==6.5.1 # via -r requirements/dev.in -distlib==0.3.3 +dill==0.3.5.1 + # via + # -r requirements/quality.txt + # pylint +distlib==0.3.4 # via # -r requirements/ci.txt # virtualenv -django==2.2.24 +django==2.2.28 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/quality.txt -docutils==0.18 +docutils==0.18.1 # via # -r requirements/quality.txt # readme-renderer -edx-lint==5.2.1 +edx-lint==5.2.4 # via -r requirements/quality.txt -edx-opaque-keys[django]==2.2.2 +edx-opaque-keys[django]==2.3.0 # via -r requirements/quality.txt -fastavro==1.4.7 +fastavro==1.5.1 # via -r requirements/quality.txt -filelock==3.4.0 +filelock==3.7.1 # via # -r requirements/ci.txt # tox @@ -93,13 +94,11 @@ idna==3.3 # -r requirements/ci.txt # -r requirements/quality.txt # requests -importlib-metadata==4.8.2 +importlib-metadata==4.12.0 # via # -r requirements/quality.txt # keyring # twine -inflect==5.3.0 - # via jinja2-pluralize iniconfig==1.1.1 # via # -r requirements/quality.txt @@ -108,27 +107,24 @@ isort==5.10.1 # via # -r requirements/quality.txt # pylint -jinja2==3.0.3 +jinja2==3.1.2 # via # -r requirements/quality.txt # code-annotations # diff-cover - # jinja2-pluralize -jinja2-pluralize==0.3.0 - # via diff-cover -keyring==23.2.1 +keyring==23.6.0 # via # -r requirements/quality.txt # twine -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.7.1 # via # -r requirements/quality.txt # astroid -markupsafe==2.0.1 +markupsafe==2.1.1 # via # -r requirements/quality.txt # jinja2 -mccabe==0.6.1 +mccabe==0.7.0 # via # -r requirements/quality.txt # pylint @@ -136,10 +132,9 @@ packaging==21.3 # via # -r requirements/ci.txt # -r requirements/quality.txt - # bleach # pytest # tox -pbr==5.8.0 +pbr==5.9.0 # via # -r requirements/quality.txt # stevedore @@ -147,13 +142,13 @@ pep517==0.12.0 # via # -r requirements/pip-tools.txt # pip-tools -pip-tools==6.4.0 +pip-tools==6.6.2 # via -r requirements/pip-tools.txt -pkginfo==1.8.1 +pkginfo==1.8.3 # via # -r requirements/quality.txt # twine -platformdirs==2.4.0 +platformdirs==2.5.2 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -176,12 +171,13 @@ pycodestyle==2.8.0 # via -r requirements/quality.txt pydocstyle==6.1.1 # via -r requirements/quality.txt -pygments==2.10.0 +pygments==2.12.0 # via # -r requirements/quality.txt # diff-cover # readme-renderer -pylint==2.11.1 + # rich +pylint==2.14.3 # via # -r requirements/quality.txt # edx-lint @@ -192,38 +188,38 @@ pylint-celery==0.3 # via # -r requirements/quality.txt # edx-lint -pylint-django==2.4.4 +pylint-django==2.5.3 # via # -r requirements/quality.txt # edx-lint -pylint-plugin-utils==0.6 +pylint-plugin-utils==0.7 # via # -r requirements/quality.txt # pylint-celery # pylint-django -pymongo==3.12.1 +pymongo==3.12.3 # via # -r requirements/quality.txt # edx-opaque-keys -pyparsing==3.0.6 +pyparsing==3.0.9 # via # -r requirements/ci.txt # -r requirements/quality.txt # packaging -pytest==6.2.5 +pytest==7.1.2 # via # -r requirements/quality.txt # pytest-cov # pytest-django pytest-cov==3.0.0 # via -r requirements/quality.txt -pytest-django==4.4.0 +pytest-django==4.5.2 # via -r requirements/quality.txt -python-slugify==5.0.2 +python-slugify==6.1.2 # via # -r requirements/quality.txt # code-annotations -pytz==2021.3 +pytz==2022.1 # via # -r requirements/quality.txt # django @@ -231,11 +227,11 @@ pyyaml==6.0 # via # -r requirements/quality.txt # code-annotations -readme-renderer==30.0 +readme-renderer==35.0 # via # -r requirements/quality.txt # twine -requests==2.26.0 +requests==2.28.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -246,7 +242,11 @@ requests-toolbelt==0.9.1 # via # -r requirements/quality.txt # twine -rfc3986==1.5.0 +rfc3986==2.0.0 + # via + # -r requirements/quality.txt + # twine +rich==12.4.4 # via # -r requirements/quality.txt # twine @@ -278,39 +278,40 @@ text-unidecode==1.3 toml==0.10.2 # via # -r requirements/ci.txt - # -r requirements/quality.txt - # pylint - # pytest # tox -tomli==1.2.2 +tomli==2.0.1 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt # coverage # pep517 -tox==3.24.4 + # pylint + # pytest +tomlkit==0.11.0 + # via + # -r requirements/quality.txt + # pylint +tox==3.25.0 # via # -r requirements/ci.txt # tox-battery tox-battery==0.6.1 # via -r requirements/dev.in -tqdm==4.62.3 - # via - # -r requirements/quality.txt - # twine -twine==3.6.0 +twine==4.0.1 # via -r requirements/quality.txt -typing-extensions==4.0.0 +typing-extensions==4.2.0 # via # -r requirements/quality.txt # astroid # pylint -urllib3==1.26.7 + # rich +urllib3==1.26.9 # via # -r requirements/ci.txt # -r requirements/quality.txt # requests -virtualenv==20.10.0 + # twine +virtualenv==20.15.0 # via # -r requirements/ci.txt # tox @@ -318,15 +319,15 @@ webencodings==0.5.1 # via # -r requirements/quality.txt # bleach -wheel==0.37.0 +wheel==0.37.1 # via # -r requirements/pip-tools.txt # pip-tools -wrapt==1.13.3 +wrapt==1.14.1 # via # -r requirements/quality.txt # astroid -zipp==3.6.0 +zipp==3.8.0 # via # -r requirements/quality.txt # importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index abe33d07..45df1e27 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -6,72 +6,74 @@ # alabaster==0.7.12 # via sphinx -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/test.txt # pytest -babel==2.9.1 +babel==2.10.3 # via sphinx -bleach==4.1.0 +bleach==5.0.0 # via readme-renderer -certifi==2021.10.8 +certifi==2022.6.15 # via requests -charset-normalizer==2.0.7 +charset-normalizer==2.0.12 # via requests -click==8.0.3 +click==8.1.3 # via # -r requirements/test.txt # code-annotations -code-annotations==1.2.0 +code-annotations==1.3.0 # via -r requirements/test.txt -coverage[toml]==6.1.2 +coverage[toml]==6.4.1 # via # -r requirements/test.txt # pytest-cov -ddt==1.4.4 +ddt==1.5.0 # via -r requirements/test.txt -django==2.2.24 +django==2.2.28 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt -doc8==0.10.1 +doc8==0.11.2 # via -r requirements/doc.in -docutils==0.17.1 +docutils==0.18.1 # via # doc8 # readme-renderer # restructuredtext-lint # sphinx -edx-opaque-keys[django]==2.2.2 +edx-opaque-keys[django]==2.3.0 # via -r requirements/test.txt edx-sphinx-theme==3.0.0 # via -r requirements/doc.in -fastavro==1.4.7 +fastavro==1.5.1 # via -r requirements/test.txt idna==3.3 # via requests imagesize==1.3.0 # via sphinx +importlib-metadata==4.12.0 + # via sphinx iniconfig==1.1.1 # via # -r requirements/test.txt # pytest -jinja2==3.0.3 +jinja2==3.1.2 # via # -r requirements/test.txt # code-annotations # sphinx -markupsafe==2.0.1 +markupsafe==2.1.1 # via # -r requirements/test.txt # jinja2 packaging==21.3 # via # -r requirements/test.txt - # bleach # pytest # sphinx -pbr==5.8.0 +pbr==5.9.0 # via # -r requirements/test.txt # stevedore @@ -83,33 +85,33 @@ py==1.11.0 # via # -r requirements/test.txt # pytest -pygments==2.10.0 +pygments==2.12.0 # via # doc8 # readme-renderer # sphinx -pymongo==3.12.1 +pymongo==3.12.3 # via # -r requirements/test.txt # edx-opaque-keys -pyparsing==3.0.6 +pyparsing==3.0.9 # via # -r requirements/test.txt # packaging -pytest==6.2.5 +pytest==7.1.2 # via # -r requirements/test.txt # pytest-cov # pytest-django pytest-cov==3.0.0 # via -r requirements/test.txt -pytest-django==4.4.0 +pytest-django==4.5.2 # via -r requirements/test.txt -python-slugify==5.0.2 +python-slugify==6.1.2 # via # -r requirements/test.txt # code-annotations -pytz==2021.3 +pytz==2022.1 # via # -r requirements/test.txt # babel @@ -118,11 +120,11 @@ pyyaml==6.0 # via # -r requirements/test.txt # code-annotations -readme-renderer==30.0 +readme-renderer==35.0 # via -r requirements/doc.in -requests==2.26.0 +requests==2.28.0 # via sphinx -restructuredtext-lint==1.3.2 +restructuredtext-lint==1.4.0 # via doc8 six==1.16.0 # via @@ -130,7 +132,7 @@ six==1.16.0 # edx-sphinx-theme snowballstemmer==2.2.0 # via sphinx -sphinx==4.3.0 +sphinx==5.0.2 # via # -r requirements/doc.in # edx-sphinx-theme @@ -160,18 +162,14 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -toml==0.10.2 - # via - # -r requirements/test.txt - # pytest -tomli==1.2.2 +tomli==2.0.1 # via # -r requirements/test.txt # coverage -urllib3==1.26.7 + # pytest +urllib3==1.26.9 # via requests webencodings==0.5.1 # via bleach - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +zipp==3.8.0 + # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 51eb3dc3..ce56f4c7 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,15 +4,15 @@ # # make upgrade # -click==8.0.3 +click==8.1.3 # via pip-tools pep517==0.12.0 # via pip-tools -pip-tools==6.4.0 +pip-tools==6.6.2 # via -r requirements/pip-tools.in -tomli==1.2.2 +tomli==2.0.1 # via pep517 -wheel==0.37.0 +wheel==0.37.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.in b/requirements/pip.in index 21ce8e9d..b419ce6d 100644 --- a/requirements/pip.in +++ b/requirements/pip.in @@ -1,3 +1,4 @@ +-c constraints.txt # Core dependencies for installing other packages pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 8dc64274..8a667c4a 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,13 @@ # # make upgrade # -wheel==0.37.0 +wheel==0.37.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==21.3.1 - # via -r requirements/pip.in -setuptools==59.2.0 +pip==22.1.2 # via -r requirements/pip.in +setuptools==59.8.0 + # via + # -c requirements/common_constraints.txt + # -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 42e0eefd..44c37fcf 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,55 +4,58 @@ # # make upgrade # -astroid==2.8.6 +astroid==2.11.6 # via # pylint # pylint-celery -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/test.txt # pytest -bleach==4.1.0 +bleach==5.0.0 # via readme-renderer -certifi==2021.10.8 +certifi==2022.6.15 # via requests -charset-normalizer==2.0.7 +charset-normalizer==2.0.12 # via requests -click==8.0.3 +click==8.1.3 # via # -r requirements/test.txt # click-log # code-annotations # edx-lint -click-log==0.3.2 +click-log==0.4.0 # via edx-lint -code-annotations==1.2.0 +code-annotations==1.3.0 # via # -r requirements/test.txt # edx-lint -colorama==0.4.4 - # via twine -coverage[toml]==6.1.2 +commonmark==0.9.1 + # via rich +coverage[toml]==6.4.1 # via # -r requirements/test.txt # pytest-cov -ddt==1.4.4 +ddt==1.5.0 # via -r requirements/test.txt -django==2.2.24 +dill==0.3.5.1 + # via pylint +django==2.2.28 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt -docutils==0.18 +docutils==0.18.1 # via readme-renderer -edx-lint==5.2.1 +edx-lint==5.2.4 # via -r requirements/quality.in -edx-opaque-keys[django]==2.2.2 +edx-opaque-keys[django]==2.3.0 # via -r requirements/test.txt -fastavro==1.4.7 +fastavro==1.5.1 # via -r requirements/test.txt idna==3.3 # via requests -importlib-metadata==4.8.2 +importlib-metadata==4.12.0 # via # keyring # twine @@ -64,32 +67,31 @@ isort==5.10.1 # via # -r requirements/quality.in # pylint -jinja2==3.0.3 +jinja2==3.1.2 # via # -r requirements/test.txt # code-annotations -keyring==23.2.1 +keyring==23.6.0 # via twine -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.7.1 # via astroid -markupsafe==2.0.1 +markupsafe==2.1.1 # via # -r requirements/test.txt # jinja2 -mccabe==0.6.1 +mccabe==0.7.0 # via pylint packaging==21.3 # via # -r requirements/test.txt - # bleach # pytest -pbr==5.8.0 +pbr==5.9.0 # via # -r requirements/test.txt # stevedore -pkginfo==1.8.1 +pkginfo==1.8.3 # via twine -platformdirs==2.4.0 +platformdirs==2.5.2 # via pylint pluggy==1.0.0 # via @@ -103,9 +105,11 @@ pycodestyle==2.8.0 # via -r requirements/quality.in pydocstyle==6.1.1 # via -r requirements/quality.in -pygments==2.10.0 - # via readme-renderer -pylint==2.11.1 +pygments==2.12.0 + # via + # readme-renderer + # rich +pylint==2.14.3 # via # edx-lint # pylint-celery @@ -113,34 +117,34 @@ pylint==2.11.1 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.4.4 +pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.6 +pylint-plugin-utils==0.7 # via # pylint-celery # pylint-django -pymongo==3.12.1 +pymongo==3.12.3 # via # -r requirements/test.txt # edx-opaque-keys -pyparsing==3.0.6 +pyparsing==3.0.9 # via # -r requirements/test.txt # packaging -pytest==6.2.5 +pytest==7.1.2 # via # -r requirements/test.txt # pytest-cov # pytest-django pytest-cov==3.0.0 # via -r requirements/test.txt -pytest-django==4.4.0 +pytest-django==4.5.2 # via -r requirements/test.txt -python-slugify==5.0.2 +python-slugify==6.1.2 # via # -r requirements/test.txt # code-annotations -pytz==2021.3 +pytz==2022.1 # via # -r requirements/test.txt # django @@ -148,15 +152,17 @@ pyyaml==6.0 # via # -r requirements/test.txt # code-annotations -readme-renderer==30.0 +readme-renderer==35.0 # via twine -requests==2.26.0 +requests==2.28.0 # via # requests-toolbelt # twine requests-toolbelt==0.9.1 # via twine -rfc3986==1.5.0 +rfc3986==2.0.0 + # via twine +rich==12.4.4 # via twine six==1.16.0 # via @@ -177,30 +183,30 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -toml==0.10.2 +tomli==2.0.1 # via # -r requirements/test.txt + # coverage # pylint # pytest -tomli==1.2.2 - # via - # -r requirements/test.txt - # coverage -tqdm==4.62.3 - # via twine -twine==3.6.0 +tomlkit==0.11.0 + # via pylint +twine==4.0.1 # via -r requirements/quality.in -typing-extensions==4.0.0 +typing-extensions==4.2.0 # via # astroid # pylint -urllib3==1.26.7 - # via requests + # rich +urllib3==1.26.9 + # via + # requests + # twine webencodings==0.5.1 # via bleach -wrapt==1.13.3 +wrapt==1.14.1 # via astroid -zipp==3.6.0 +zipp==3.8.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 282d555d..6242a8a8 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,35 +4,36 @@ # # make upgrade # -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/base.txt # pytest -click==8.0.3 +click==8.1.3 # via code-annotations -code-annotations==1.2.0 +code-annotations==1.3.0 # via -r requirements/test.in -coverage[toml]==6.1.2 +coverage[toml]==6.4.1 # via pytest-cov -ddt==1.4.4 +ddt==1.5.0 # via -r requirements/test.in -django==2.2.24 +django==2.2.28 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.txt -edx-opaque-keys[django]==2.2.2 +edx-opaque-keys[django]==2.3.0 # via -r requirements/base.txt -fastavro==1.4.7 +fastavro==1.5.1 # via -r requirements/base.txt iniconfig==1.1.1 # via pytest -jinja2==3.0.3 +jinja2==3.1.2 # via code-annotations -markupsafe==2.0.1 +markupsafe==2.1.1 # via jinja2 packaging==21.3 # via pytest -pbr==5.8.0 +pbr==5.9.0 # via # -r requirements/base.txt # stevedore @@ -40,23 +41,23 @@ pluggy==1.0.0 # via pytest py==1.11.0 # via pytest -pymongo==3.12.1 +pymongo==3.12.3 # via # -r requirements/base.txt # edx-opaque-keys -pyparsing==3.0.6 +pyparsing==3.0.9 # via packaging -pytest==6.2.5 +pytest==7.1.2 # via # pytest-cov # pytest-django pytest-cov==3.0.0 # via -r requirements/test.in -pytest-django==4.4.0 +pytest-django==4.5.2 # via -r requirements/test.in -python-slugify==5.0.2 +python-slugify==6.1.2 # via code-annotations -pytz==2021.3 +pytz==2022.1 # via # -r requirements/base.txt # django @@ -73,7 +74,7 @@ stevedore==3.5.0 # edx-opaque-keys text-unidecode==1.3 # via python-slugify -toml==0.10.2 - # via pytest -tomli==1.2.2 - # via coverage +tomli==2.0.1 + # via + # coverage + # pytest From 26da4fc5b95cd776e135228f0516691408359af7 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Mon, 27 Jun 2022 20:52:48 +0500 Subject: [PATCH 02/11] fix: upgrade --- requirements/doc.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/doc.txt b/requirements/doc.txt index 45df1e27..a7df7b34 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -37,7 +37,7 @@ django==2.2.28 # -r requirements/test.txt doc8==0.11.2 # via -r requirements/doc.in -docutils==0.18.1 +docutils==0.17.1 # via # doc8 # readme-renderer @@ -132,7 +132,7 @@ six==1.16.0 # edx-sphinx-theme snowballstemmer==2.2.0 # via sphinx -sphinx==5.0.2 +sphinx==4.5.0 # via # -r requirements/doc.in # edx-sphinx-theme From e4b55cabf1ee70cae0c4f2f07b5ad77f1fd2b590 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Mon, 27 Jun 2022 21:00:28 +0500 Subject: [PATCH 03/11] fix: update --- pylintrc | 106 ++----------------------------------------------------- 1 file changed, 2 insertions(+), 104 deletions(-) diff --git a/pylintrc b/pylintrc index 7bf1ad22..56831cdc 100644 --- a/pylintrc +++ b/pylintrc @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.1 +# Generated by edx-lint version: 5.2.4 # ------------------------------ [MASTER] ignore = migrations @@ -102,20 +102,12 @@ enable = cell-var-from-loop, confusing-with-statement, continue-in-finally, - cyclical-import, dangerous-default-value, - dict-items-not-iterating, - dict-keys-not-iterating, - dict-values-not-iterating, duplicate-argument-name, duplicate-bases, duplicate-except, duplicate-key, - eq-without-hash, - exception-escape, - exception-message-attribute, expression-not-assigned, - filter-builtin-not-iterating, format-combined-specification, format-needs-mapping, function-redefined, @@ -123,33 +115,26 @@ enable = import-error, import-self, inconsistent-mro, - indexing-exception, inherit-non-class, init-is-generator, invalid-all-object, - invalid-encoded-data, invalid-format-index, invalid-length-returned, invalid-sequence-index, invalid-slice-index, invalid-slots-object, invalid-slots, - invalid-str-codec, invalid-unary-operand-type, logging-too-few-args, logging-too-many-args, logging-unsupported-format, lost-exception, - map-builtin-not-iterating, method-hidden, misplaced-bare-raise, misplaced-future, missing-format-argument-key, missing-format-attribute, missing-format-string-key, - missing-super-argument, - mixed-fomat-string, - model-unicode-not-callable, no-member, no-method-argument, no-name-in-module, @@ -158,8 +143,6 @@ enable = non-iterator-returned, non-parent-method-called, nonexistent-operator, - nonimplemented-raised, - nonstandard-exception, not-a-mapping, not-an-iterable, not-callable, @@ -167,35 +150,25 @@ enable = not-in-loop, pointless-statement, pointless-string-statement, - property-on-old-class, raising-bad-type, raising-non-exception, - raising-string, - range-builtin-not-iterating, redefined-builtin, - redefined-in-handler, redefined-outer-name, - redefined-variable-type, redundant-keyword-arg, - relative-import, repeated-keyword, return-arg-in-generator, return-in-init, return-outside-function, signature-differs, - slots-on-old-class, super-init-not-called, super-method-not-called, - super-on-old-class, syntax-error, - sys-max-int, test-inherits-tests, too-few-format-args, too-many-format-args, too-many-function-args, translation-of-non-string, truncated-format-string, - unbalance-tuple-unpacking, undefined-all-variable, undefined-loop-variable, undefined-variable, @@ -211,11 +184,8 @@ enable = used-before-assignment, using-constant-test, yield-outside-function, - zip-builtin-not-iterating, astroid-error, - django-not-available-placeholder, - django-not-available, fatal, method-check-failed, parse-error, @@ -237,7 +207,6 @@ enable = bad-classmethod-argument, bad-mcs-classmethod-argument, bad-mcs-method-argument, - bad-whitespace, bare-except, broad-except, consider-iterating-dictionary, @@ -247,16 +216,10 @@ enable = literal-used-as-attribute, logging-format-interpolation, logging-not-lazy, - metaclass-assignment, - model-has-unicode, - model-missing-unicode, - model-no-explicit-unicode, multiple-imports, multiple-statements, no-classmethod-decorator, no-staticmethod-decorator, - old-raise-syntax, - old-style-class, protected-access, redundant-unittest-assert, reimported, @@ -284,7 +247,6 @@ enable = wrong-import-position, missing-final-newline, - mixed-indentation, mixed-line-endings, trailing-newlines, trailing-whitespace, @@ -295,25 +257,7 @@ enable = deprecated-pragma, unrecognized-inline-option, useless-suppression, - - cmp-method, - coerce-method, - delslice-method, - dict-iter-method, - dict-view-method, - div-method, - getslice-method, - hex-method, - idiv-method, - next-method-called, - next-method-defined, - nonzero-method, - oct-method, - rdiv-method, - setslice-method, - using-cmp-argument, disable = - bad-continuation, bad-indentation, consider-using-f-string, duplicate-code, @@ -322,12 +266,7 @@ disable = global-statement, invalid-name, locally-disabled, - locally-enabled, - lowercase-l-suffix, - misplaced-comparison-constant, no-else-return, - no-init, - no-self-use, suppressed-message, too-few-public-methods, too-many-ancestors, @@ -346,54 +285,14 @@ disable = feature-toggle-needs-doc, illegal-waffle-usage, - apply-builtin, - backtick, - bad-python3-import, - basestring-builtin, - buffer-builtin, - cmp-builtin, - coerce-builtin, - deprecated-itertools-function, - deprecated-operator-function, - deprecated-str-translate-call, - deprecated-string-function, - deprecated-sys-function, - deprecated-types-field, - deprecated-urllib-function, - execfile-builtin, - file-builtin, - import-star-module-level, - input-builtin, - intern-builtin, - long-builtin, - long-suffix, - no-absolute-import, - non-ascii-bytes-literal, - old-division, - old-ne-operator, - old-octal-literal, - parameter-unpacking, - print-statement, - raw_input-builtin, - reduce-builtin, - reload-builtin, - round-builtin, - standarderror-builtin, - unichr-builtin, - unicode-builtin, - unpacking-in-except, - xrange-builtin, - logging-fstring-interpolation, [REPORTS] output-format = text -files-output = no reports = no score = no [BASIC] -bad-functions = map,filter,apply,input module-rgx = (([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$ class-rgx = [A-Z_][a-zA-Z0-9]+$ @@ -413,7 +312,6 @@ docstring-min-length = 5 max-line-length = 120 ignore-long-lines = ^\s*(# )?((?)|(\.\. \w+: .*))$ single-line-if-stmt = no -no-space-check = trailing-comma,dict-separator max-module-lines = 1000 indent-string = ' ' @@ -484,4 +382,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception -# 4aab3dcb4fa137c503562dcd26a3be774bc1055e +# 2c4e77ce27e7bedab7f88fb0e58e08afe979524d From 1ab5d6ad90bc3ed2e382abcbf08f35289e0f2e65 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Mon, 27 Jun 2022 21:04:02 +0500 Subject: [PATCH 04/11] fix: upgrade --- openedx_events/event_bus/avro/custom_serializers.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openedx_events/event_bus/avro/custom_serializers.py b/openedx_events/event_bus/avro/custom_serializers.py index 0a89de64..0cf62e1f 100644 --- a/openedx_events/event_bus/avro/custom_serializers.py +++ b/openedx_events/event_bus/avro/custom_serializers.py @@ -22,13 +22,11 @@ class BaseCustomTypeAvroSerializer(ABC): @abstractmethod def serialize(obj) -> str: """Abstract method to serialize obj into string.""" - ... @staticmethod @abstractmethod def deserialize(data: str) -> object: """Abstract method to deserialize string into obj.""" - ... class CourseKeyAvroSerializer(BaseCustomTypeAvroSerializer): From 36aec82df577c3e084dc48f59278cc67c9e1000a Mon Sep 17 00:00:00 2001 From: Jawayria Date: Wed, 29 Jun 2022 18:33:49 +0500 Subject: [PATCH 05/11] fix: tests --- requirements/base.txt | 2 +- requirements/ci.txt | 2 +- requirements/dev.txt | 18 +++++++++++++----- requirements/doc.txt | 6 +++--- requirements/pip-tools.txt | 14 +++++++++++--- requirements/quality.txt | 4 ++-- requirements/test.txt | 2 +- 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 6dc6163b..2d8dbd81 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -13,7 +13,7 @@ django==2.2.28 # -r requirements/base.in edx-opaque-keys[django]==2.3.0 # via -r requirements/base.in -fastavro==1.5.1 +fastavro==1.5.2 # via -r requirements/base.in pbr==5.9.0 # via stevedore diff --git a/requirements/ci.txt b/requirements/ci.txt index 7e0de281..31c98f50 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -42,5 +42,5 @@ tox==3.25.0 # via -r requirements/ci.in urllib3==1.26.9 # via requests -virtualenv==20.15.0 +virtualenv==20.15.1 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 6e49a7e5..58dfe6d1 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -13,10 +13,14 @@ attrs==21.4.0 # via # -r requirements/quality.txt # pytest -bleach==5.0.0 +bleach==5.0.1 # via # -r requirements/quality.txt # readme-renderer +build==0.8.0 + # via + # -r requirements/pip-tools.txt + # pip-tools certifi==2022.6.15 # via # -r requirements/ci.txt @@ -82,7 +86,7 @@ edx-lint==5.2.4 # via -r requirements/quality.txt edx-opaque-keys[django]==2.3.0 # via -r requirements/quality.txt -fastavro==1.5.1 +fastavro==1.5.2 # via -r requirements/quality.txt filelock==3.7.1 # via @@ -131,7 +135,9 @@ mccabe==0.7.0 packaging==21.3 # via # -r requirements/ci.txt + # -r requirements/pip-tools.txt # -r requirements/quality.txt + # build # pytest # tox pbr==5.9.0 @@ -141,8 +147,8 @@ pbr==5.9.0 pep517==0.12.0 # via # -r requirements/pip-tools.txt - # pip-tools -pip-tools==6.6.2 + # build +pip-tools==6.7.0 # via -r requirements/pip-tools.txt pkginfo==1.8.3 # via @@ -204,6 +210,7 @@ pymongo==3.12.3 pyparsing==3.0.9 # via # -r requirements/ci.txt + # -r requirements/pip-tools.txt # -r requirements/quality.txt # packaging pytest==7.1.2 @@ -283,6 +290,7 @@ tomli==2.0.1 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt + # build # coverage # pep517 # pylint @@ -311,7 +319,7 @@ urllib3==1.26.9 # -r requirements/quality.txt # requests # twine -virtualenv==20.15.0 +virtualenv==20.15.1 # via # -r requirements/ci.txt # tox diff --git a/requirements/doc.txt b/requirements/doc.txt index a7df7b34..04d58711 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,7 +12,7 @@ attrs==21.4.0 # pytest babel==2.10.3 # via sphinx -bleach==5.0.0 +bleach==5.0.1 # via readme-renderer certifi==2022.6.15 # via requests @@ -35,7 +35,7 @@ django==2.2.28 # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt -doc8==0.11.2 +doc8==0.10.1 # via -r requirements/doc.in docutils==0.17.1 # via @@ -47,7 +47,7 @@ edx-opaque-keys[django]==2.3.0 # via -r requirements/test.txt edx-sphinx-theme==3.0.0 # via -r requirements/doc.in -fastavro==1.5.1 +fastavro==1.5.2 # via -r requirements/test.txt idna==3.3 # via requests diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index ce56f4c7..97f4ed93 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,14 +4,22 @@ # # make upgrade # +build==0.8.0 + # via pip-tools click==8.1.3 # via pip-tools +packaging==21.3 + # via build pep517==0.12.0 - # via pip-tools -pip-tools==6.6.2 + # via build +pip-tools==6.7.0 # via -r requirements/pip-tools.in +pyparsing==3.0.9 + # via packaging tomli==2.0.1 - # via pep517 + # via + # build + # pep517 wheel==0.37.1 # via pip-tools diff --git a/requirements/quality.txt b/requirements/quality.txt index 44c37fcf..62a29e5e 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -12,7 +12,7 @@ attrs==21.4.0 # via # -r requirements/test.txt # pytest -bleach==5.0.0 +bleach==5.0.1 # via readme-renderer certifi==2022.6.15 # via requests @@ -51,7 +51,7 @@ edx-lint==5.2.4 # via -r requirements/quality.in edx-opaque-keys[django]==2.3.0 # via -r requirements/test.txt -fastavro==1.5.1 +fastavro==1.5.2 # via -r requirements/test.txt idna==3.3 # via requests diff --git a/requirements/test.txt b/requirements/test.txt index 6242a8a8..e38d1db8 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -23,7 +23,7 @@ django==2.2.28 # -r requirements/base.txt edx-opaque-keys[django]==2.3.0 # via -r requirements/base.txt -fastavro==1.5.1 +fastavro==1.5.2 # via -r requirements/base.txt iniconfig==1.1.1 # via pytest From bc4ee194282bfce4630e7c7b5c80e4c2f9dfeba3 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Wed, 29 Jun 2022 20:03:46 +0500 Subject: [PATCH 06/11] fix: docs test --- requirements/dev.txt | 2 +- requirements/doc.txt | 2 +- requirements/quality.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 58dfe6d1..28b1f84b 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -183,7 +183,7 @@ pygments==2.12.0 # diff-cover # readme-renderer # rich -pylint==2.14.3 +pylint==2.14.4 # via # -r requirements/quality.txt # edx-lint diff --git a/requirements/doc.txt b/requirements/doc.txt index 04d58711..1a3c2c9f 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -120,7 +120,7 @@ pyyaml==6.0 # via # -r requirements/test.txt # code-annotations -readme-renderer==35.0 +readme-renderer==30.0 # via -r requirements/doc.in requests==2.28.0 # via sphinx diff --git a/requirements/quality.txt b/requirements/quality.txt index 62a29e5e..c84cbf6a 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -109,7 +109,7 @@ pygments==2.12.0 # via # readme-renderer # rich -pylint==2.14.3 +pylint==2.14.4 # via # edx-lint # pylint-celery From c888f5efb00a1e31ace55cf9b95339956e9d0474 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Thu, 30 Jun 2022 14:57:32 +0500 Subject: [PATCH 07/11] fix: test --- requirements/ci.txt | 6 +++--- requirements/dev.txt | 8 ++++---- requirements/doc.in | 8 ++++---- requirements/doc.txt | 4 ++-- requirements/pip-tools.txt | 2 +- requirements/quality.txt | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index 31c98f50..efac9bca 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,7 +6,7 @@ # certifi==2022.6.15 # via requests -charset-normalizer==2.0.12 +charset-normalizer==2.1.0 # via requests codecov==2.1.12 # via -r requirements/ci.in @@ -30,7 +30,7 @@ py==1.11.0 # via tox pyparsing==3.0.9 # via packaging -requests==2.28.0 +requests==2.28.1 # via codecov six==1.16.0 # via @@ -38,7 +38,7 @@ six==1.16.0 # virtualenv toml==0.10.2 # via tox -tox==3.25.0 +tox==3.25.1 # via -r requirements/ci.in urllib3==1.26.9 # via requests diff --git a/requirements/dev.txt b/requirements/dev.txt index 28b1f84b..4ca20035 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -28,7 +28,7 @@ certifi==2022.6.15 # requests chardet==5.0.0 # via diff-cover -charset-normalizer==2.0.12 +charset-normalizer==2.1.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -148,7 +148,7 @@ pep517==0.12.0 # via # -r requirements/pip-tools.txt # build -pip-tools==6.7.0 +pip-tools==6.8.0 # via -r requirements/pip-tools.txt pkginfo==1.8.3 # via @@ -238,7 +238,7 @@ readme-renderer==35.0 # via # -r requirements/quality.txt # twine -requests==2.28.0 +requests==2.28.1 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -299,7 +299,7 @@ tomlkit==0.11.0 # via # -r requirements/quality.txt # pylint -tox==3.25.0 +tox==3.25.1 # via # -r requirements/ci.txt # tox-battery diff --git a/requirements/doc.in b/requirements/doc.in index 690e8e1d..1c278860 100644 --- a/requirements/doc.in +++ b/requirements/doc.in @@ -3,7 +3,7 @@ -r test.txt # Core and testing dependencies for this package -doc8 # reStructuredText style checker -edx_sphinx_theme # edX theme for Sphinx output -readme_renderer # Validates README.rst for usage on PyPI -Sphinx # Documentation builder +doc8==0.10.1 # reStructuredText style checker +edx_sphinx_theme==3.0.0 # edX theme for Sphinx output +readme_renderer==30.0 # Validates README.rst for usage on PyPI +Sphinx==4.5.0 # Documentation builder diff --git a/requirements/doc.txt b/requirements/doc.txt index 1a3c2c9f..5a68b135 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -16,7 +16,7 @@ bleach==5.0.1 # via readme-renderer certifi==2022.6.15 # via requests -charset-normalizer==2.0.12 +charset-normalizer==2.1.0 # via requests click==8.1.3 # via @@ -122,7 +122,7 @@ pyyaml==6.0 # code-annotations readme-renderer==30.0 # via -r requirements/doc.in -requests==2.28.0 +requests==2.28.1 # via sphinx restructuredtext-lint==1.4.0 # via doc8 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 97f4ed93..f49a9d41 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -12,7 +12,7 @@ packaging==21.3 # via build pep517==0.12.0 # via build -pip-tools==6.7.0 +pip-tools==6.8.0 # via -r requirements/pip-tools.in pyparsing==3.0.9 # via packaging diff --git a/requirements/quality.txt b/requirements/quality.txt index c84cbf6a..e2379edb 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -16,7 +16,7 @@ bleach==5.0.1 # via readme-renderer certifi==2022.6.15 # via requests -charset-normalizer==2.0.12 +charset-normalizer==2.1.0 # via requests click==8.1.3 # via @@ -154,7 +154,7 @@ pyyaml==6.0 # code-annotations readme-renderer==35.0 # via twine -requests==2.28.0 +requests==2.28.1 # via # requests-toolbelt # twine From a2319f5c1ebbcfb4ec3494c6daebacbc115f81c9 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Thu, 30 Jun 2022 14:59:48 +0500 Subject: [PATCH 08/11] fix: upgrade --- requirements/doc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/doc.txt b/requirements/doc.txt index 5a68b135..47812703 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -124,7 +124,7 @@ readme-renderer==30.0 # via -r requirements/doc.in requests==2.28.1 # via sphinx -restructuredtext-lint==1.4.0 +restructuredtext-lint==1.3.0 # via doc8 six==1.16.0 # via From 1843e71d3a1968f6a749bf2ce8b72cf8db82ad4a Mon Sep 17 00:00:00 2001 From: Jawayria Date: Fri, 5 Aug 2022 20:25:34 +0500 Subject: [PATCH 09/11] fix: test latest versions --- requirements/base.txt | 6 +++--- requirements/ci.txt | 12 +++++------- requirements/dev.txt | 35 +++++++++++++++++------------------ requirements/doc.in | 8 ++++---- requirements/doc.txt | 25 +++++++++++++------------ requirements/pip-tools.txt | 2 +- requirements/pip.txt | 2 +- requirements/quality.txt | 28 ++++++++++++++-------------- requirements/test.txt | 8 ++++---- 9 files changed, 62 insertions(+), 64 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 2d8dbd81..a8d3c900 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,7 +4,7 @@ # # make upgrade # -attrs==21.4.0 +attrs==22.1.0 # via -r requirements/base.in django==2.2.28 # via @@ -13,7 +13,7 @@ django==2.2.28 # -r requirements/base.in edx-opaque-keys[django]==2.3.0 # via -r requirements/base.in -fastavro==1.5.2 +fastavro==1.5.4 # via -r requirements/base.in pbr==5.9.0 # via stevedore @@ -23,5 +23,5 @@ pytz==2022.1 # via django sqlparse==0.4.2 # via django -stevedore==3.5.0 +stevedore==4.0.0 # via edx-opaque-keys diff --git a/requirements/ci.txt b/requirements/ci.txt index efac9bca..de0feac8 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,9 +10,9 @@ charset-normalizer==2.1.0 # via requests codecov==2.1.12 # via -r requirements/ci.in -coverage==6.4.1 +coverage==6.4.2 # via codecov -distlib==0.3.4 +distlib==0.3.5 # via virtualenv filelock==3.7.1 # via @@ -33,14 +33,12 @@ pyparsing==3.0.9 requests==2.28.1 # via codecov six==1.16.0 - # via - # tox - # virtualenv + # via tox toml==0.10.2 # via tox tox==3.25.1 # via -r requirements/ci.in -urllib3==1.26.9 +urllib3==1.26.11 # via requests -virtualenv==20.15.1 +virtualenv==20.16.3 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 4ca20035..bb7f1d24 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,12 +4,12 @@ # # make upgrade # -astroid==2.11.6 +astroid==2.11.7 # via # -r requirements/quality.txt # pylint # pylint-celery -attrs==21.4.0 +attrs==22.1.0 # via # -r requirements/quality.txt # pytest @@ -55,7 +55,7 @@ commonmark==0.9.1 # via # -r requirements/quality.txt # rich -coverage[toml]==6.4.1 +coverage[toml]==6.4.2 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -69,7 +69,7 @@ dill==0.3.5.1 # via # -r requirements/quality.txt # pylint -distlib==0.3.4 +distlib==0.3.5 # via # -r requirements/ci.txt # virtualenv @@ -78,7 +78,7 @@ django==2.2.28 # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/quality.txt -docutils==0.18.1 +docutils==0.19 # via # -r requirements/quality.txt # readme-renderer @@ -86,7 +86,7 @@ edx-lint==5.2.4 # via -r requirements/quality.txt edx-opaque-keys[django]==2.3.0 # via -r requirements/quality.txt -fastavro==1.5.2 +fastavro==1.5.4 # via -r requirements/quality.txt filelock==3.7.1 # via @@ -116,7 +116,7 @@ jinja2==3.1.2 # -r requirements/quality.txt # code-annotations # diff-cover -keyring==23.6.0 +keyring==23.7.0 # via # -r requirements/quality.txt # twine @@ -144,7 +144,7 @@ pbr==5.9.0 # via # -r requirements/quality.txt # stevedore -pep517==0.12.0 +pep517==0.13.0 # via # -r requirements/pip-tools.txt # build @@ -173,7 +173,7 @@ py==1.11.0 # -r requirements/quality.txt # pytest # tox -pycodestyle==2.8.0 +pycodestyle==2.9.1 # via -r requirements/quality.txt pydocstyle==6.1.1 # via -r requirements/quality.txt @@ -183,7 +183,7 @@ pygments==2.12.0 # diff-cover # readme-renderer # rich -pylint==2.14.4 +pylint==2.14.5 # via # -r requirements/quality.txt # edx-lint @@ -253,7 +253,7 @@ rfc3986==2.0.0 # via # -r requirements/quality.txt # twine -rich==12.4.4 +rich==12.5.1 # via # -r requirements/quality.txt # twine @@ -264,7 +264,6 @@ six==1.16.0 # bleach # edx-lint # tox - # virtualenv snowballstemmer==2.2.0 # via # -r requirements/quality.txt @@ -273,7 +272,7 @@ sqlparse==0.4.2 # via # -r requirements/quality.txt # django -stevedore==3.5.0 +stevedore==4.0.0 # via # -r requirements/quality.txt # code-annotations @@ -295,7 +294,7 @@ tomli==2.0.1 # pep517 # pylint # pytest -tomlkit==0.11.0 +tomlkit==0.11.1 # via # -r requirements/quality.txt # pylint @@ -307,19 +306,19 @@ tox-battery==0.6.1 # via -r requirements/dev.in twine==4.0.1 # via -r requirements/quality.txt -typing-extensions==4.2.0 +typing-extensions==4.3.0 # via # -r requirements/quality.txt # astroid # pylint # rich -urllib3==1.26.9 +urllib3==1.26.11 # via # -r requirements/ci.txt # -r requirements/quality.txt # requests # twine -virtualenv==20.15.1 +virtualenv==20.16.3 # via # -r requirements/ci.txt # tox @@ -335,7 +334,7 @@ wrapt==1.14.1 # via # -r requirements/quality.txt # astroid -zipp==3.8.0 +zipp==3.8.1 # via # -r requirements/quality.txt # importlib-metadata diff --git a/requirements/doc.in b/requirements/doc.in index 1c278860..690e8e1d 100644 --- a/requirements/doc.in +++ b/requirements/doc.in @@ -3,7 +3,7 @@ -r test.txt # Core and testing dependencies for this package -doc8==0.10.1 # reStructuredText style checker -edx_sphinx_theme==3.0.0 # edX theme for Sphinx output -readme_renderer==30.0 # Validates README.rst for usage on PyPI -Sphinx==4.5.0 # Documentation builder +doc8 # reStructuredText style checker +edx_sphinx_theme # edX theme for Sphinx output +readme_renderer # Validates README.rst for usage on PyPI +Sphinx # Documentation builder diff --git a/requirements/doc.txt b/requirements/doc.txt index 47812703..6c43cf6a 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -6,7 +6,7 @@ # alabaster==0.7.12 # via sphinx -attrs==21.4.0 +attrs==22.1.0 # via # -r requirements/test.txt # pytest @@ -24,7 +24,7 @@ click==8.1.3 # code-annotations code-annotations==1.3.0 # via -r requirements/test.txt -coverage[toml]==6.4.1 +coverage[toml]==6.4.2 # via # -r requirements/test.txt # pytest-cov @@ -35,9 +35,9 @@ django==2.2.28 # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt -doc8==0.10.1 +doc8==1.0.0 # via -r requirements/doc.in -docutils==0.17.1 +docutils==0.19 # via # doc8 # readme-renderer @@ -47,11 +47,11 @@ edx-opaque-keys[django]==2.3.0 # via -r requirements/test.txt edx-sphinx-theme==3.0.0 # via -r requirements/doc.in -fastavro==1.5.2 +fastavro==1.5.4 # via -r requirements/test.txt idna==3.3 # via requests -imagesize==1.3.0 +imagesize==1.4.1 # via sphinx importlib-metadata==4.12.0 # via sphinx @@ -120,11 +120,11 @@ pyyaml==6.0 # via # -r requirements/test.txt # code-annotations -readme-renderer==30.0 +readme-renderer==35.0 # via -r requirements/doc.in requests==2.28.1 # via sphinx -restructuredtext-lint==1.3.0 +restructuredtext-lint==1.4.0 # via doc8 six==1.16.0 # via @@ -132,7 +132,7 @@ six==1.16.0 # edx-sphinx-theme snowballstemmer==2.2.0 # via sphinx -sphinx==4.5.0 +sphinx==5.1.1 # via # -r requirements/doc.in # edx-sphinx-theme @@ -152,7 +152,7 @@ sqlparse==0.4.2 # via # -r requirements/test.txt # django -stevedore==3.5.0 +stevedore==4.0.0 # via # -r requirements/test.txt # code-annotations @@ -166,10 +166,11 @@ tomli==2.0.1 # via # -r requirements/test.txt # coverage + # doc8 # pytest -urllib3==1.26.9 +urllib3==1.26.11 # via requests webencodings==0.5.1 # via bleach -zipp==3.8.0 +zipp==3.8.1 # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index f49a9d41..ebb8aa6a 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.3 # via pip-tools packaging==21.3 # via build -pep517==0.12.0 +pep517==0.13.0 # via build pip-tools==6.8.0 # via -r requirements/pip-tools.in diff --git a/requirements/pip.txt b/requirements/pip.txt index 8a667c4a..35b87891 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.37.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.1.2 +pip==22.2.2 # via -r requirements/pip.in setuptools==59.8.0 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index e2379edb..693c0530 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,11 +4,11 @@ # # make upgrade # -astroid==2.11.6 +astroid==2.11.7 # via # pylint # pylint-celery -attrs==21.4.0 +attrs==22.1.0 # via # -r requirements/test.txt # pytest @@ -32,7 +32,7 @@ code-annotations==1.3.0 # edx-lint commonmark==0.9.1 # via rich -coverage[toml]==6.4.1 +coverage[toml]==6.4.2 # via # -r requirements/test.txt # pytest-cov @@ -45,13 +45,13 @@ django==2.2.28 # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt -docutils==0.18.1 +docutils==0.19 # via readme-renderer edx-lint==5.2.4 # via -r requirements/quality.in edx-opaque-keys[django]==2.3.0 # via -r requirements/test.txt -fastavro==1.5.2 +fastavro==1.5.4 # via -r requirements/test.txt idna==3.3 # via requests @@ -71,7 +71,7 @@ jinja2==3.1.2 # via # -r requirements/test.txt # code-annotations -keyring==23.6.0 +keyring==23.7.0 # via twine lazy-object-proxy==1.7.1 # via astroid @@ -101,7 +101,7 @@ py==1.11.0 # via # -r requirements/test.txt # pytest -pycodestyle==2.8.0 +pycodestyle==2.9.1 # via -r requirements/quality.in pydocstyle==6.1.1 # via -r requirements/quality.in @@ -109,7 +109,7 @@ pygments==2.12.0 # via # readme-renderer # rich -pylint==2.14.4 +pylint==2.14.5 # via # edx-lint # pylint-celery @@ -162,7 +162,7 @@ requests-toolbelt==0.9.1 # via twine rfc3986==2.0.0 # via twine -rich==12.4.4 +rich==12.5.1 # via twine six==1.16.0 # via @@ -174,7 +174,7 @@ sqlparse==0.4.2 # via # -r requirements/test.txt # django -stevedore==3.5.0 +stevedore==4.0.0 # via # -r requirements/test.txt # code-annotations @@ -189,16 +189,16 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.11.0 +tomlkit==0.11.1 # via pylint twine==4.0.1 # via -r requirements/quality.in -typing-extensions==4.2.0 +typing-extensions==4.3.0 # via # astroid # pylint # rich -urllib3==1.26.9 +urllib3==1.26.11 # via # requests # twine @@ -206,7 +206,7 @@ webencodings==0.5.1 # via bleach wrapt==1.14.1 # via astroid -zipp==3.8.0 +zipp==3.8.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index e38d1db8..794dc122 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # make upgrade # -attrs==21.4.0 +attrs==22.1.0 # via # -r requirements/base.txt # pytest @@ -12,7 +12,7 @@ click==8.1.3 # via code-annotations code-annotations==1.3.0 # via -r requirements/test.in -coverage[toml]==6.4.1 +coverage[toml]==6.4.2 # via pytest-cov ddt==1.5.0 # via -r requirements/test.in @@ -23,7 +23,7 @@ django==2.2.28 # -r requirements/base.txt edx-opaque-keys[django]==2.3.0 # via -r requirements/base.txt -fastavro==1.5.2 +fastavro==1.5.4 # via -r requirements/base.txt iniconfig==1.1.1 # via pytest @@ -67,7 +67,7 @@ sqlparse==0.4.2 # via # -r requirements/base.txt # django -stevedore==3.5.0 +stevedore==4.0.0 # via # -r requirements/base.txt # code-annotations From 1844e7de61b86a7b8ab45be399cb86c0947e2ff9 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Fri, 5 Aug 2022 20:33:21 +0500 Subject: [PATCH 10/11] fix: test previous versions --- requirements/doc.in | 8 ++++---- requirements/doc.txt | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/requirements/doc.in b/requirements/doc.in index 690e8e1d..1c278860 100644 --- a/requirements/doc.in +++ b/requirements/doc.in @@ -3,7 +3,7 @@ -r test.txt # Core and testing dependencies for this package -doc8 # reStructuredText style checker -edx_sphinx_theme # edX theme for Sphinx output -readme_renderer # Validates README.rst for usage on PyPI -Sphinx # Documentation builder +doc8==0.10.1 # reStructuredText style checker +edx_sphinx_theme==3.0.0 # edX theme for Sphinx output +readme_renderer==30.0 # Validates README.rst for usage on PyPI +Sphinx==4.5.0 # Documentation builder diff --git a/requirements/doc.txt b/requirements/doc.txt index 6c43cf6a..e44b759b 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -35,9 +35,9 @@ django==2.2.28 # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt -doc8==1.0.0 +doc8==0.10.1 # via -r requirements/doc.in -docutils==0.19 +docutils==0.17.1 # via # doc8 # readme-renderer @@ -120,7 +120,7 @@ pyyaml==6.0 # via # -r requirements/test.txt # code-annotations -readme-renderer==35.0 +readme-renderer==30.0 # via -r requirements/doc.in requests==2.28.1 # via sphinx @@ -132,7 +132,7 @@ six==1.16.0 # edx-sphinx-theme snowballstemmer==2.2.0 # via sphinx -sphinx==5.1.1 +sphinx==4.5.0 # via # -r requirements/doc.in # edx-sphinx-theme @@ -166,7 +166,6 @@ tomli==2.0.1 # via # -r requirements/test.txt # coverage - # doc8 # pytest urllib3==1.26.11 # via requests From 837ba2b600dfc8859e0997ceb5e2425be1f7c738 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Fri, 5 Aug 2022 20:41:40 +0500 Subject: [PATCH 11/11] ix: test setuptools --- requirements/pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/pip.txt b/requirements/pip.txt index 35b87891..09add5bc 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,7 +10,7 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.2.2 # via -r requirements/pip.in -setuptools==59.8.0 +setuptools==59.2.0 # via # -c requirements/common_constraints.txt # -r requirements/pip.in