From ef2f6c1e99b7d3b500b6eff3975d63085bc35f36 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Wed, 14 Jun 2023 19:17:18 +0500 Subject: [PATCH 01/12] fix: django42 upgrade support added --- CHANGELOG.rst | 5 +++++ bulk_grades/__init__.py | 2 +- setup.py | 2 ++ tox.ini | 6 ++++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b69aad3..ded9505 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,6 +13,11 @@ Change Log Unreleased + + +[1.0.2] - 2023-06-14 +~~~~~~~~~~ +* Support added for Django 4.2. * Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is deprecated diff --git a/bulk_grades/__init__.py b/bulk_grades/__init__.py index 81b7f88..86de805 100644 --- a/bulk_grades/__init__.py +++ b/bulk_grades/__init__.py @@ -2,6 +2,6 @@ Support for bulk scoring and grading. """ -__version__ = '1.0.1' +__version__ = '1.0.2' default_app_config = 'bulk_grades.apps.BulkGradesConfig' # pylint: disable=invalid-name diff --git a/setup.py b/setup.py index f96e10a..aa1e01a 100644 --- a/setup.py +++ b/setup.py @@ -85,6 +85,8 @@ def is_requirement(line): 'Framework :: Django', 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.0', + 'Framework :: Django :: 4.1', + 'Framework :: Django :: 4.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Natural Language :: English', diff --git a/tox.ini b/tox.ini index 6a93aa9..77bbccc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] -envlist = py38-django{32,40}-celery{44,50},quality,docs,pii_check +envlist = py38-django{32,40, 41,42}-celery{44,50},quality,docs,pii_check [pytest] -DJANGO_SETTINGS_MODULE = test_settings +django_settings_module = test_settings addopts = --cov bulk_grades --cov-report term-missing --cov-report xml norecursedirs = .* docs requirements site-packages @@ -12,6 +12,8 @@ setenv = deps = -r{toxinidir}/requirements/test.txt django32: Django>=3.2,<4.0 + django41: Django>=4.1,<4.2 + django42: Django>=4.2,<4.3 django40: Django>=4.0,<4.1 celery44: -r{toxinidir}/requirements/celery44.txt celery50: -r{toxinidir}/requirements/celery50.txt From 7557df69c9a61cedd8a714a64a815d9cd2432372 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Thu, 15 Jun 2023 13:50:08 +0500 Subject: [PATCH 02/12] fix: const name made capital. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 77bbccc..1e7e7f2 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = py38-django{32,40, 41,42}-celery{44,50},quality,docs,pii_check [pytest] -django_settings_module = test_settings +DJANGO_SETTINGS_MODULE = test_settings addopts = --cov bulk_grades --cov-report term-missing --cov-report xml norecursedirs = .* docs requirements site-packages From 75d4bc8b4c21f46f81fc19e39153f97aaef22357 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Thu, 15 Jun 2023 13:56:21 +0500 Subject: [PATCH 03/12] fix: rst format fixed --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ded9505..d593962 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,7 +16,7 @@ Unreleased [1.0.2] - 2023-06-14 -~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~ * Support added for Django 4.2. * Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is deprecated From c94e94543097c21fc4bff0e240220a529c8b3054 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Thu, 15 Jun 2023 14:42:52 +0500 Subject: [PATCH 04/12] fix: django envs updated for ci --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 007b8f7..e9f77cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,8 @@ jobs: django32-celery50, django40-celery44, django40-celery50, + django41-celery50, + django42-celery50, ] steps: From 969d741f3c3547ff951f5fac43cdd55d7d867a83 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Thu, 15 Jun 2023 15:45:09 +0500 Subject: [PATCH 05/12] fix: coveragee toxenv updated --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9f77cd..b8e1982 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: run: tox - name: Run Coverage - if: matrix.python-version == '3.8' && matrix.toxenv=='django32-celery44' + if: matrix.python-version == '3.8' && matrix.toxenv=='django42-celery50' uses: codecov/codecov-action@v3 with: flags: unittests From 1a1767ebab56282514a6cea4186895f603f67cc4 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 25 Jul 2023 14:37:33 +0500 Subject: [PATCH 06/12] fix: celery53 added --- .github/workflows/ci.yml | 8 ++------ requirements/celery53.txt | 9 +++++++++ tox.ini | 5 +---- 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 requirements/celery53.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8e1982..1baacd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,12 +20,8 @@ jobs: quality, docs, pii_check, - django32-celery44, - django32-celery50, - django40-celery44, - django40-celery50, - django41-celery50, - django42-celery50, + django32-celery53, + django42-celery53, ] steps: diff --git a/requirements/celery53.txt b/requirements/celery53.txt new file mode 100644 index 0000000..c5c93b7 --- /dev/null +++ b/requirements/celery53.txt @@ -0,0 +1,9 @@ +amqp==5.1.1 +billiard==3.6.4.0 +celery==5.3.1 +click==8.1.3 +click-didyoumean==0.3.0 +click-repl==0.2.0 +kombu==5.2.4 +prompt-toolkit==3.0.38 +vine==5.0.0 diff --git a/tox.ini b/tox.ini index 1e7e7f2..8f6a020 100644 --- a/tox.ini +++ b/tox.ini @@ -12,11 +12,8 @@ setenv = deps = -r{toxinidir}/requirements/test.txt django32: Django>=3.2,<4.0 - django41: Django>=4.1,<4.2 django42: Django>=4.2,<4.3 - django40: Django>=4.0,<4.1 - celery44: -r{toxinidir}/requirements/celery44.txt - celery50: -r{toxinidir}/requirements/celery50.txt + celery53: -r{toxinidir}/requirements/celery53.txt commands = python -Wd -m pytest {posargs} From e95ae8c8fc512273f0679104ef1ce1f45f81d2da Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 25 Jul 2023 14:45:11 +0500 Subject: [PATCH 07/12] fix: billiard 41 added --- requirements/celery53.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/celery53.txt b/requirements/celery53.txt index c5c93b7..20bb2fd 100644 --- a/requirements/celery53.txt +++ b/requirements/celery53.txt @@ -1,5 +1,5 @@ amqp==5.1.1 -billiard==3.6.4.0 +billiard==4.1.0 celery==5.3.1 click==8.1.3 click-didyoumean==0.3.0 From f60d6e85c3698ba4e6b1d660ac7f37a0d4c13a52 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 25 Jul 2023 14:52:01 +0500 Subject: [PATCH 08/12] fix: all celery53 requirements updated --- requirements/celery53.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/celery53.txt b/requirements/celery53.txt index 20bb2fd..ddf4bbd 100644 --- a/requirements/celery53.txt +++ b/requirements/celery53.txt @@ -1,9 +1,9 @@ amqp==5.1.1 billiard==4.1.0 celery==5.3.1 -click==8.1.3 +click==8.1.6 click-didyoumean==0.3.0 click-repl==0.2.0 -kombu==5.2.4 -prompt-toolkit==3.0.38 +kombu==5.3.1 +prompt-toolkit==3.0.39 vine==5.0.0 From ce23bd8f33d4ade137d746b2b350f9b12852608a Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 25 Jul 2023 15:26:51 +0500 Subject: [PATCH 09/12] fix: click bumped to 8.1.6 in test.txt --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index 47591da..fa3fa14 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -30,7 +30,7 @@ charset-normalizer==3.1.0 # via # -r requirements/base.txt # requests -click==8.1.3 +click==8.1.6 # via # -r requirements/base.txt # celery From 9d90ba6fd919999afd726424ac6a4b6e14cadcb0 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 25 Jul 2023 15:40:39 +0500 Subject: [PATCH 10/12] chore: packages upgraded --- requirements/base.txt | 51 +++++++++------ requirements/celery50.txt | 12 ++-- requirements/ci.txt | 26 +++----- requirements/dev.txt | 113 +++++++++++++++++--------------- requirements/doc.txt | 128 ++++++++++++++++++++----------------- requirements/pii_check.txt | 62 +++++++++++------- requirements/pip-tools.txt | 12 ++-- requirements/quality.txt | 88 ++++++++++++++----------- requirements/test.txt | 66 ++++++++++++------- 9 files changed, 316 insertions(+), 242 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index edb3dbc..e04172b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,21 +6,25 @@ # amqp==5.1.1 # via kombu -asgiref==3.6.0 +asgiref==3.7.2 # via django -billiard==3.6.4.0 +backports-zoneinfo[tzdata]==0.2.1 + # via + # celery + # kombu +billiard==4.1.0 # via celery -celery==5.2.7 +celery==5.3.1 # via # -c requirements/constraints.txt # edx-celeryutils -certifi==2022.12.7 +certifi==2023.7.22 # via requests cffi==1.15.1 # via pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.6 # via # celery # click-didyoumean @@ -31,9 +35,9 @@ click-didyoumean==0.3.0 # via celery click-plugins==1.1.1 # via celery -click-repl==0.2.0 +click-repl==0.3.0 # via celery -django==3.2.18 +django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -60,7 +64,7 @@ djangorestframework==3.14.0 # via super-csv edx-celeryutils==1.2.2 # via super-csv -edx-django-utils==5.3.0 +edx-django-utils==5.6.0 # via super-csv edx-opaque-keys==2.3.0 # via -r requirements/base.in @@ -68,15 +72,15 @@ idna==3.4 # via requests jsonfield==3.1.0 # via edx-celeryutils -kombu==5.2.4 +kombu==5.3.1 # via celery -newrelic==8.8.0 +newrelic==8.8.1 # via edx-django-utils pbr==5.11.1 # via stevedore -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via click-repl -psutil==5.9.4 +psutil==5.9.5 # via edx-django-utils pycparser==2.21 # via cffi @@ -84,30 +88,39 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils +python-dateutil==2.8.2 + # via celery pytz==2023.3 # via - # celery # django # djangorestframework -requests==2.28.2 +requests==2.31.0 # via # -r requirements/base.in # slumber simplejson==3.19.1 # via super-csv six==1.16.0 - # via click-repl + # via python-dateutil slumber==0.7.1 # via -r requirements/base.in -sqlparse==0.4.3 +sqlparse==0.4.4 # via django -stevedore==5.0.0 +stevedore==5.1.0 # via # edx-django-utils # edx-opaque-keys super-csv==3.0.1 # via -r requirements/base.in -urllib3==1.26.15 +typing-extensions==4.7.1 + # via + # asgiref + # kombu +tzdata==2023.3 + # via + # backports-zoneinfo + # celery +urllib3==2.0.4 # via requests vine==5.0.0 # via diff --git a/requirements/celery50.txt b/requirements/celery50.txt index 08d3cb4..e87760f 100644 --- a/requirements/celery50.txt +++ b/requirements/celery50.txt @@ -1,9 +1,9 @@ amqp==5.1.1 -billiard==3.6.4.0 -celery==5.2.7 -click==8.1.3 +billiard==4.1.0 +celery==5.3.1 +click==8.1.6 click-didyoumean==0.3.0 -click-repl==0.2.0 -kombu==5.2.4 -prompt-toolkit==3.0.38 +click-repl==0.3.0 +kombu==5.3.1 +prompt-toolkit==3.0.39 vine==5.0.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index 91cc6c7..aba98fa 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,30 +4,22 @@ # # make upgrade # -certifi==2022.12.7 - # via requests -charset-normalizer==3.1.0 - # via requests -coverage==7.2.3 - # via codecov -distlib==0.3.6 +coverage==7.2.7 + # via -r requirements/ci.in +distlib==0.3.7 # via virtualenv -filelock==3.11.0 +filelock==3.12.2 # via # tox # virtualenv -idna==3.4 - # via requests -packaging==23.0 +packaging==23.1 # via tox -platformdirs==3.2.0 +platformdirs==3.9.1 # via virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via tox py==1.11.0 # via tox -requests==2.28.2 - # via codecov six==1.16.0 # via tox tomli==2.0.1 @@ -39,7 +31,5 @@ tox==3.28.0 # tox-battery tox-battery==0.6.1 # via -r requirements/ci.in -urllib3==1.26.15 - # via requests -virtualenv==20.21.0 +virtualenv==20.24.2 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 860e2b4..08324bd 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,16 +8,21 @@ amqp==5.1.1 # via # -r requirements/quality.txt # kombu -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/quality.txt # django -astroid==2.15.2 +astroid==2.15.6 # via # -r requirements/quality.txt # pylint # pylint-celery -billiard==3.6.4.0 +backports-zoneinfo[tzdata]==0.2.1 + # via + # -r requirements/quality.txt + # celery + # kombu +billiard==4.1.0 # via # -r requirements/quality.txt # celery @@ -25,14 +30,13 @@ build==0.10.0 # via # -r requirements/pip-tools.txt # pip-tools -celery==5.2.7 +celery==5.3.1 # via # -c requirements/constraints.txt # -r requirements/quality.txt # edx-celeryutils -certifi==2022.12.7 +certifi==2023.7.22 # via - # -r requirements/ci.txt # -r requirements/quality.txt # requests cffi==1.15.1 @@ -41,12 +45,11 @@ cffi==1.15.1 # pynacl chardet==5.1.0 # via diff-cover -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via - # -r requirements/ci.txt # -r requirements/quality.txt # requests -click==8.1.3 +click==8.1.6 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt @@ -71,33 +74,32 @@ click-plugins==1.1.1 # via # -r requirements/quality.txt # celery -click-repl==0.2.0 +click-repl==0.3.0 # via # -r requirements/quality.txt # celery -code-annotations==1.3.0 +code-annotations==1.5.0 # via # -r requirements/quality.txt # edx-lint -coverage[toml]==7.2.3 +coverage[toml]==7.2.7 # via # -r requirements/ci.txt # -r requirements/quality.txt - # codecov # pytest-cov ddt==1.6.0 # via -r requirements/quality.txt -diff-cover==7.5.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.18 +django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -132,28 +134,27 @@ edx-celeryutils==1.2.2 # via # -r requirements/quality.txt # super-csv -edx-django-utils==5.3.0 +edx-django-utils==5.6.0 # via # -r requirements/quality.txt # super-csv -edx-i18n-tools==0.9.2 +edx-i18n-tools==1.0.0 # via -r requirements/dev.in edx-lint==5.3.4 # via -r requirements/quality.txt edx-opaque-keys==2.3.0 # via -r requirements/quality.txt -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via # -r requirements/quality.txt # pytest -filelock==3.11.0 +filelock==3.12.2 # via # -r requirements/ci.txt # tox # virtualenv idna==3.4 # via - # -r requirements/ci.txt # -r requirements/quality.txt # requests iniconfig==2.0.0 @@ -173,7 +174,7 @@ jsonfield==3.1.0 # via # -r requirements/quality.txt # edx-celeryutils -kombu==5.2.4 +kombu==5.3.1 # via # -r requirements/quality.txt # celery @@ -181,7 +182,7 @@ lazy-object-proxy==1.9.0 # via # -r requirements/quality.txt # astroid -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/quality.txt # jinja2 @@ -189,13 +190,13 @@ mccabe==0.7.0 # via # -r requirements/quality.txt # pylint -mock==5.0.1 +mock==5.1.0 # via -r requirements/quality.txt -newrelic==8.8.0 +newrelic==8.8.1 # via # -r requirements/quality.txt # edx-django-utils -packaging==23.0 +packaging==23.1 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -203,21 +204,21 @@ packaging==23.0 # 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.1.0 # via -r requirements/pip-tools.txt -platformdirs==3.2.0 +platformdirs==3.9.1 # via # -r requirements/ci.txt # -r requirements/quality.txt # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -226,11 +227,11 @@ pluggy==1.0.0 # tox polib==1.2.0 # via edx-i18n-tools -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/quality.txt # click-repl -psutil==5.9.4 +psutil==5.9.5 # via # -r requirements/quality.txt # edx-django-utils @@ -246,9 +247,9 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.txt -pygments==2.14.0 +pygments==2.15.1 # via diff-cover -pylint==2.17.2 +pylint==2.17.4 # via # -r requirements/quality.txt # edx-lint @@ -263,7 +264,7 @@ pylint-django==2.5.3 # via # -r requirements/quality.txt # edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.2 # via # -r requirements/quality.txt # pylint-celery @@ -280,15 +281,19 @@ pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt # build -pytest==7.3.0 +pytest==7.4.0 # via # -r requirements/quality.txt # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/quality.txt pytest-django==4.5.2 # via -r requirements/quality.txt +python-dateutil==2.8.2 + # via + # -r requirements/quality.txt + # celery python-slugify==8.0.1 # via # -r requirements/quality.txt @@ -296,19 +301,16 @@ python-slugify==8.0.1 pytz==2023.3 # via # -r requirements/quality.txt - # celery # django # djangorestframework -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/quality.txt # code-annotations # edx-i18n-tools -requests==2.28.2 +requests==2.31.0 # via - # -r requirements/ci.txt # -r requirements/quality.txt - # codecov # slumber simplejson==3.19.1 # via @@ -318,8 +320,8 @@ six==1.16.0 # via # -r requirements/ci.txt # -r requirements/quality.txt - # click-repl # edx-lint + # python-dateutil # tox slumber==0.7.1 # via -r requirements/quality.txt @@ -327,11 +329,11 @@ snowballstemmer==2.2.0 # via # -r requirements/quality.txt # pydocstyle -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/quality.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/quality.txt # code-annotations @@ -350,11 +352,12 @@ tomli==2.0.1 # -r requirements/quality.txt # build # coverage + # pip-tools # pylint # pyproject-hooks # pytest # tox -tomlkit==0.11.7 +tomlkit==0.11.8 # via # -r requirements/quality.txt # pylint @@ -365,14 +368,20 @@ tox==3.28.0 # tox-battery tox-battery==0.6.1 # via -r requirements/ci.txt -typing-extensions==4.5.0 +typing-extensions==4.7.1 # via # -r requirements/quality.txt + # asgiref # astroid + # kombu # pylint -urllib3==1.26.15 +tzdata==2023.3 + # via + # -r requirements/quality.txt + # backports-zoneinfo + # celery +urllib3==2.0.4 # via - # -r requirements/ci.txt # -r requirements/quality.txt # requests vine==5.0.0 @@ -381,7 +390,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.21.0 +virtualenv==20.24.2 # via # -r requirements/ci.txt # tox @@ -389,7 +398,7 @@ wcwidth==0.2.6 # via # -r requirements/quality.txt # prompt-toolkit -wheel==0.40.0 +wheel==0.41.0 # via # -r requirements/pip-tools.txt # pip-tools diff --git a/requirements/doc.txt b/requirements/doc.txt index 9f26edd..ca44ac8 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,39 +12,45 @@ amqp==5.1.1 # via # -r requirements/test.txt # kombu -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/test.txt # django babel==2.12.1 - # via sphinx -beautifulsoup4==4.12.0 + # via + # pydata-sphinx-theme + # sphinx +backports-zoneinfo[tzdata]==0.2.1 + # via + # -r requirements/test.txt + # celery + # kombu +beautifulsoup4==4.12.2 # via pydata-sphinx-theme -billiard==3.6.4.0 +billiard==4.1.0 # via # -r requirements/test.txt # celery bleach==6.0.0 # via readme-renderer -celery==5.2.7 +celery==5.3.1 # via # -c requirements/constraints.txt # -r requirements/test.txt # edx-celeryutils -certifi==2022.12.7 +certifi==2023.7.22 # via # -r requirements/test.txt # requests cffi==1.15.1 # via # -r requirements/test.txt - # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/test.txt # requests -click==8.1.3 +click==8.1.6 # via # -r requirements/test.txt # celery @@ -61,21 +67,19 @@ click-plugins==1.1.1 # via # -r requirements/test.txt # celery -click-repl==0.2.0 +click-repl==0.3.0 # via # -r requirements/test.txt # celery -code-annotations==1.3.0 +code-annotations==1.5.0 # via -r requirements/test.txt -coverage[toml]==7.2.3 +coverage[toml]==7.2.7 # via # -r requirements/test.txt # pytest-cov -cryptography==40.0.1 - # via secretstorage ddt==1.6.0 # via -r requirements/test.txt -django==3.2.18 +django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -118,15 +122,13 @@ edx-celeryutils==1.2.2 # via # -r requirements/test.txt # super-csv -edx-django-utils==5.3.0 +edx-django-utils==5.6.0 # via # -r requirements/test.txt # super-csv edx-opaque-keys==2.3.0 # via -r requirements/test.txt -edx-sphinx-theme==3.1.0 - # via -r requirements/doc.in -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via # -r requirements/test.txt # pytest @@ -136,23 +138,19 @@ idna==3.4 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.2.1 +importlib-metadata==6.8.0 # via # keyring # sphinx # twine -importlib-resources==5.12.0 +importlib-resources==6.0.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 @@ -162,29 +160,29 @@ jsonfield==3.1.0 # via # -r requirements/test.txt # edx-celeryutils -keyring==23.13.1 +keyring==24.2.0 # via twine -kombu==5.2.4 +kombu==5.3.1 # via # -r requirements/test.txt # celery -markdown-it-py==2.2.0 +markdown-it-py==3.0.0 # via rich -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/test.txt # jinja2 mdurl==0.1.2 # via markdown-it-py -mock==5.0.1 +mock==5.1.0 # via -r requirements/test.txt -more-itertools==9.1.0 +more-itertools==10.0.0 # via jaraco-classes -newrelic==8.8.0 +newrelic==8.8.1 # via # -r requirements/test.txt # edx-django-utils -packaging==23.0 +packaging==23.1 # via # -r requirements/test.txt # pydata-sphinx-theme @@ -196,15 +194,15 @@ pbr==5.11.1 # stevedore pkginfo==1.9.6 # via twine -pluggy==1.0.0 +pluggy==1.2.0 # via # -r requirements/test.txt # pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/test.txt # click-repl -psutil==5.9.4 +psutil==5.9.5 # via # -r requirements/test.txt # edx-django-utils @@ -212,9 +210,9 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pydata-sphinx-theme==0.13.1 +pydata-sphinx-theme==0.13.3 # via sphinx-book-theme -pygments==2.14.0 +pygments==2.15.1 # via # accessible-pygments # doc8 @@ -230,15 +228,19 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==7.3.0 +pytest==7.4.0 # via # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.txt pytest-django==4.5.2 # via -r requirements/test.txt +python-dateutil==2.8.2 + # via + # -r requirements/test.txt + # celery python-slugify==8.0.1 # via # -r requirements/test.txt @@ -247,34 +249,31 @@ pytz==2023.3 # via # -r requirements/test.txt # babel - # celery # django # djangorestframework -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/test.txt # code-annotations -readme-renderer==37.3 +readme-renderer==40.0 # via # -r requirements/doc.in # twine -requests==2.28.2 +requests==2.31.0 # via # -r requirements/test.txt # requests-toolbelt # slumber # sphinx # twine -requests-toolbelt==0.10.1 +requests-toolbelt==1.0.0 # via twine restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.3.3 +rich==13.4.2 # via twine -secretstorage==3.3.3 - # via keyring simplejson==3.19.1 # via # -r requirements/test.txt @@ -283,20 +282,19 @@ six==1.16.0 # via # -r requirements/test.txt # bleach - # click-repl + # python-dateutil slumber==0.7.1 # via -r requirements/test.txt snowballstemmer==2.2.0 # via sphinx -soupsieve==2.4 +soupsieve==2.4.1 # via beautifulsoup4 -sphinx==5.3.0 +sphinx==6.2.1 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/doc.in # pydata-sphinx-theme # sphinx-book-theme -sphinx-book-theme==1.0.0 +sphinx-book-theme==1.0.1 # via -r requirements/doc.in sphinxcontrib-applehelp==1.0.4 # via sphinx @@ -310,11 +308,11 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/test.txt # code-annotations @@ -335,9 +333,19 @@ tomli==2.0.1 # pytest twine==4.0.2 # via -r requirements/doc.in -typing-extensions==4.5.0 - # via rich -urllib3==1.26.15 +typing-extensions==4.7.1 + # via + # -r requirements/test.txt + # asgiref + # kombu + # pydata-sphinx-theme + # rich +tzdata==2023.3 + # via + # -r requirements/test.txt + # backports-zoneinfo + # celery +urllib3==2.0.4 # via # -r requirements/test.txt # requests @@ -354,7 +362,7 @@ wcwidth==0.2.6 # prompt-toolkit webencodings==0.5.1 # via bleach -zipp==3.15.0 +zipp==3.16.2 # via # importlib-metadata # importlib-resources diff --git a/requirements/pii_check.txt b/requirements/pii_check.txt index 904e9e0..dc26130 100644 --- a/requirements/pii_check.txt +++ b/requirements/pii_check.txt @@ -8,20 +8,25 @@ amqp==5.1.1 # via # -r requirements/base.txt # kombu -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/base.txt # django -billiard==3.6.4.0 +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery -celery==5.2.7 + # kombu +billiard==4.1.0 + # via + # -r requirements/base.txt + # celery +celery==5.3.1 # via # -c requirements/constraints.txt # -r requirements/base.txt # edx-celeryutils -certifi==2022.12.7 +certifi==2023.7.22 # via # -r requirements/base.txt # requests @@ -29,11 +34,11 @@ cffi==1.15.1 # via # -r requirements/base.txt # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests -click==8.1.3 +click==8.1.6 # via # -r requirements/base.txt # celery @@ -50,13 +55,13 @@ click-plugins==1.1.1 # via # -r requirements/base.txt # celery -click-repl==0.2.0 +click-repl==0.3.0 # via # -r requirements/base.txt # celery -code-annotations==1.3.0 +code-annotations==1.5.0 # via -r requirements/pii_check.in -django==3.2.18 +django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -90,7 +95,7 @@ edx-celeryutils==1.2.2 # via # -r requirements/base.txt # super-csv -edx-django-utils==5.3.0 +edx-django-utils==5.6.0 # via # -r requirements/base.txt # super-csv @@ -106,13 +111,13 @@ jsonfield==3.1.0 # via # -r requirements/base.txt # edx-celeryutils -kombu==5.2.4 +kombu==5.3.1 # via # -r requirements/base.txt # celery -markupsafe==2.1.2 +markupsafe==2.1.3 # via jinja2 -newrelic==8.8.0 +newrelic==8.8.1 # via # -r requirements/base.txt # edx-django-utils @@ -120,11 +125,11 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/base.txt # click-repl -psutil==5.9.4 +psutil==5.9.5 # via # -r requirements/base.txt # edx-django-utils @@ -140,17 +145,20 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils +python-dateutil==2.8.2 + # via + # -r requirements/base.txt + # celery python-slugify==8.0.1 # via code-annotations pytz==2023.3 # via # -r requirements/base.txt - # celery # django # djangorestframework -pyyaml==6.0 +pyyaml==6.0.1 # via code-annotations -requests==2.28.2 +requests==2.31.0 # via # -r requirements/base.txt # slumber @@ -161,14 +169,14 @@ simplejson==3.19.1 six==1.16.0 # via # -r requirements/base.txt - # click-repl + # python-dateutil slumber==0.7.1 # via -r requirements/base.txt -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/base.txt # code-annotations @@ -178,7 +186,17 @@ super-csv==3.0.1 # via -r requirements/base.txt text-unidecode==1.3 # via python-slugify -urllib3==1.26.15 +typing-extensions==4.7.1 + # via + # -r requirements/base.txt + # asgiref + # kombu +tzdata==2023.3 + # via + # -r requirements/base.txt + # backports-zoneinfo + # celery +urllib3==2.0.4 # via # -r requirements/base.txt # requests diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 73e7934..8baa56d 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,17 +6,19 @@ # build==0.10.0 # via pip-tools -click==8.1.3 +click==8.1.6 # via pip-tools -packaging==23.0 +packaging==23.1 # via build -pip-tools==6.13.0 +pip-tools==7.1.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 +wheel==0.41.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/quality.txt b/requirements/quality.txt index 3ea1c31..99299dc 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,24 +8,29 @@ amqp==5.1.1 # via # -r requirements/test.txt # kombu -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.2 +astroid==2.15.6 # via # pylint # pylint-celery -billiard==3.6.4.0 +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt # celery -celery==5.2.7 + # kombu +billiard==4.1.0 + # via + # -r requirements/test.txt + # celery +celery==5.3.1 # via # -c requirements/constraints.txt # -r requirements/test.txt # edx-celeryutils -certifi==2022.12.7 +certifi==2023.7.22 # via # -r requirements/test.txt # requests @@ -33,11 +38,11 @@ cffi==1.15.1 # via # -r requirements/test.txt # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/test.txt # requests -click==8.1.3 +click==8.1.6 # via # -r requirements/test.txt # celery @@ -58,23 +63,23 @@ click-plugins==1.1.1 # via # -r requirements/test.txt # celery -click-repl==0.2.0 +click-repl==0.3.0 # via # -r requirements/test.txt # celery -code-annotations==1.3.0 +code-annotations==1.5.0 # via # -r requirements/test.txt # edx-lint -coverage[toml]==7.2.3 +coverage[toml]==7.2.7 # via # -r requirements/test.txt # pytest-cov ddt==1.6.0 # via -r requirements/test.txt -dill==0.3.6 +dill==0.3.7 # via pylint -django==3.2.18 +django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -108,7 +113,7 @@ edx-celeryutils==1.2.2 # via # -r requirements/test.txt # super-csv -edx-django-utils==5.3.0 +edx-django-utils==5.6.0 # via # -r requirements/test.txt # super-csv @@ -116,7 +121,7 @@ edx-lint==5.3.4 # via -r requirements/quality.in edx-opaque-keys==2.3.0 # via -r requirements/test.txt -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via # -r requirements/test.txt # pytest @@ -140,25 +145,25 @@ jsonfield==3.1.0 # via # -r requirements/test.txt # edx-celeryutils -kombu==5.2.4 +kombu==5.3.1 # via # -r requirements/test.txt # celery lazy-object-proxy==1.9.0 # via astroid -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/test.txt # jinja2 mccabe==0.7.0 # via pylint -mock==5.0.1 +mock==5.1.0 # via -r requirements/test.txt -newrelic==8.8.0 +newrelic==8.8.1 # via # -r requirements/test.txt # edx-django-utils -packaging==23.0 +packaging==23.1 # via # -r requirements/test.txt # pytest @@ -166,17 +171,17 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.2.0 +platformdirs==3.9.1 # via pylint -pluggy==1.0.0 +pluggy==1.2.0 # via # -r requirements/test.txt # pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/test.txt # click-repl -psutil==5.9.4 +psutil==5.9.5 # via # -r requirements/test.txt # edx-django-utils @@ -188,7 +193,7 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==2.17.2 +pylint==2.17.4 # via # edx-lint # pylint-celery @@ -198,7 +203,7 @@ pylint-celery==0.3 # via edx-lint pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django @@ -210,15 +215,19 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==7.3.0 +pytest==7.4.0 # via # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.txt pytest-django==4.5.2 # via -r requirements/test.txt +python-dateutil==2.8.2 + # via + # -r requirements/test.txt + # celery python-slugify==8.0.1 # via # -r requirements/test.txt @@ -226,14 +235,13 @@ python-slugify==8.0.1 pytz==2023.3 # via # -r requirements/test.txt - # celery # django # djangorestframework -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/test.txt # code-annotations -requests==2.28.2 +requests==2.31.0 # via # -r requirements/test.txt # slumber @@ -244,17 +252,17 @@ simplejson==3.19.1 six==1.16.0 # via # -r requirements/test.txt - # click-repl # edx-lint + # python-dateutil slumber==0.7.1 # via -r requirements/test.txt snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/test.txt # code-annotations @@ -272,13 +280,21 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.11.7 +tomlkit==0.11.8 # via pylint -typing-extensions==4.5.0 +typing-extensions==4.7.1 # via + # -r requirements/test.txt + # asgiref # astroid + # kombu # pylint -urllib3==1.26.15 +tzdata==2023.3 + # via + # -r requirements/test.txt + # backports-zoneinfo + # celery +urllib3==2.0.4 # via # -r requirements/test.txt # requests diff --git a/requirements/test.txt b/requirements/test.txt index fa3fa14..d206141 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -7,10 +7,15 @@ # via # -r requirements/base.txt # kombu -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/base.txt # django +backports-zoneinfo[tzdata]==0.2.1 + # via + # -r requirements/base.txt + # celery + # kombu # via # -r requirements/base.txt # celery @@ -18,7 +23,7 @@ asgiref==3.6.0 # -c requirements/constraints.txt # -r requirements/base.txt # edx-celeryutils -certifi==2022.12.7 +certifi==2023.7.22 # via # -r requirements/base.txt # requests @@ -26,7 +31,7 @@ cffi==1.15.1 # via # -r requirements/base.txt # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests @@ -47,13 +52,13 @@ click-plugins==1.1.1 # via # -r requirements/base.txt # celery -click-repl==0.2.0 +click-repl==0.3.0 # via # -r requirements/base.txt # celery -code-annotations==1.3.0 +code-annotations==1.5.0 # via -r requirements/test.in -coverage[toml]==7.2.3 +coverage[toml]==7.2.7 # via pytest-cov ddt==1.6.0 # via -r requirements/test.in @@ -90,13 +95,13 @@ edx-celeryutils==1.2.2 # via # -r requirements/base.txt # super-csv -edx-django-utils==5.3.0 +edx-django-utils==5.6.0 # via # -r requirements/base.txt # super-csv edx-opaque-keys==2.3.0 # via -r requirements/base.txt -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via pytest idna==3.4 # via @@ -113,27 +118,27 @@ jsonfield==3.1.0 # via # -r requirements/base.txt # celery -markupsafe==2.1.2 +markupsafe==2.1.3 # via jinja2 -mock==5.0.1 +mock==5.1.0 # via -r requirements/test.in -newrelic==8.8.0 +newrelic==8.8.1 # via # -r requirements/base.txt # edx-django-utils -packaging==23.0 +packaging==23.1 # via pytest pbr==5.11.1 # via # -r requirements/base.txt # stevedore -pluggy==1.0.0 +pluggy==1.2.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/base.txt # click-repl -psutil==5.9.4 +psutil==5.9.5 # via # -r requirements/base.txt # edx-django-utils @@ -149,25 +154,28 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==7.3.0 +pytest==7.4.0 # via # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in +python-dateutil==2.8.2 + # via + # -r requirements/base.txt + # celery python-slugify==8.0.1 # via code-annotations pytz==2023.3 # via # -r requirements/base.txt - # celery # django # djangorestframework -pyyaml==6.0 +pyyaml==6.0.1 # via code-annotations -requests==2.28.2 +requests==2.31.0 # via # -r requirements/base.txt # slumber @@ -178,14 +186,14 @@ simplejson==3.19.1 six==1.16.0 # via # -r requirements/base.txt - # click-repl + # python-dateutil slumber==0.7.1 # via -r requirements/base.txt -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/base.txt # code-annotations @@ -199,7 +207,17 @@ tomli==2.0.1 # via # coverage # pytest -urllib3==1.26.15 +typing-extensions==4.7.1 + # via + # -r requirements/base.txt + # asgiref + # kombu +tzdata==2023.3 + # via + # -r requirements/base.txt + # backports-zoneinfo + # celery +urllib3==2.0.4 # via # -r requirements/base.txt # requests From 68daeb930a312497d855a9fe8ae668070a2f8ec3 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 25 Jul 2023 16:13:19 +0500 Subject: [PATCH 11/12] fix: celery53 versions fixed --- requirements/celery53.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/celery53.txt b/requirements/celery53.txt index ddf4bbd..e87760f 100644 --- a/requirements/celery53.txt +++ b/requirements/celery53.txt @@ -3,7 +3,7 @@ billiard==4.1.0 celery==5.3.1 click==8.1.6 click-didyoumean==0.3.0 -click-repl==0.2.0 +click-repl==0.3.0 kombu==5.3.1 prompt-toolkit==3.0.39 vine==5.0.0 From 3384f0681ba35f4cc95cd172ac9947ff8ca5c9d1 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 25 Jul 2023 17:28:38 +0500 Subject: [PATCH 12/12] fix: requested changes by usama added --- .github/workflows/ci.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1baacd7..c0553fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: run: tox - name: Run Coverage - if: matrix.python-version == '3.8' && matrix.toxenv=='django42-celery50' + if: matrix.python-version == '3.8' && matrix.toxenv=='django42-celery53' uses: codecov/codecov-action@v3 with: flags: unittests diff --git a/tox.ini b/tox.ini index 8f6a020..fe6d046 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40, 41,42}-celery{44,50},quality,docs,pii_check +envlist = py38-django{32,42}-celery{53},quality,docs,pii_check [pytest] DJANGO_SETTINGS_MODULE = test_settings