From 872d65ef792cb76cda5f978b670177d1323e5af4 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Tue, 20 Feb 2024 17:03:10 +0500 Subject: [PATCH 01/22] chore: update python version support to 3.11 and 3.12 for tests --- .github/workflows/ci.yml | 4 ++-- openedx_learning/__init__.py | 2 +- setup.py | 2 ++ tox.ini | 7 +++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d7624f6..0781a780 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: strategy: matrix: os: [ubuntu-latest] # Add macos-latest later? - python-version: ['3.8'] - toxenv: ["py38-django32", "py38-django42", "package", "quality"] + python-version: ['3.8', '3.11', '3.12'] + toxenv: ["py38-django42", "package", "quality"] # We're only testing against MySQL 8 right now because 5.7 is # incompatible with Djagno 4.2. We'd have to make the tox.ini file more # complicated than it's worth given the short expected shelf-life of diff --git a/openedx_learning/__init__.py b/openedx_learning/__init__.py index a01c57cd..0226308b 100644 --- a/openedx_learning/__init__.py +++ b/openedx_learning/__init__.py @@ -1,4 +1,4 @@ """ Open edX Learning ("Learning Core"). """ -__version__ = "0.6.2" +__version__ = "0.7.0" diff --git a/setup.py b/setup.py index ab642620..78efb73d 100755 --- a/setup.py +++ b/setup.py @@ -91,5 +91,7 @@ def is_requirement(line): 'Natural Language :: English', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], ) diff --git a/tox.ini b/tox.ini index 4f57a857..0c2b1da7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,42}, quality, docs, pii_check, lint-imports +envlist = py{38,311,312}-django{42}, quality, docs, pii_check, lint-imports [doc8] ; D001 = Line too long @@ -36,7 +36,7 @@ norecursedirs = .* docs requirements site-packages [testenv] deps = - django32: Django>=3.2,<3.3 + wheel django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt setenv = @@ -56,6 +56,7 @@ allowlist_externals = make rm deps = + wheel -r{toxinidir}/requirements/doc.txt commands = doc8 --ignore-path docs/_build README.rst docs @@ -71,6 +72,7 @@ allowlist_externals = rm touch deps = + wheel -r{toxinidir}/requirements/quality.txt commands = pylint openedx_learning openedx_tagging tests test_utils manage.py setup.py @@ -92,6 +94,7 @@ commands = deps = build twine + wheel commands = python -m build twine check dist/* From a85e0f88a432f6b5dcf888af14c0e4111b570a55 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Tue, 20 Feb 2024 17:06:46 +0500 Subject: [PATCH 02/22] chore: fix tests --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tox.ini b/tox.ini index 0c2b1da7..38e96f2b 100644 --- a/tox.ini +++ b/tox.ini @@ -37,6 +37,7 @@ norecursedirs = .* docs requirements site-packages [testenv] deps = wheel + setuptools django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt setenv = @@ -73,6 +74,7 @@ allowlist_externals = touch deps = wheel + setuptools -r{toxinidir}/requirements/quality.txt commands = pylint openedx_learning openedx_tagging tests test_utils manage.py setup.py @@ -95,6 +97,7 @@ deps = build twine wheel + setuptools commands = python -m build twine check dist/* From 5b75f450ab94cc86ecd76fb4ce43deeacbbf52d0 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Tue, 20 Feb 2024 17:09:57 +0500 Subject: [PATCH 03/22] chore: fix tests --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 38e96f2b..06c4d5e5 100644 --- a/tox.ini +++ b/tox.ini @@ -88,6 +88,7 @@ commands = setenv = DJANGO_SETTINGS_MODULE = test_settings deps = + setuptools -r{toxinidir}/requirements/test.txt commands = code_annotations django_find_annotations --config_file .pii_annotations.yml --lint --report --coverage From 7d473f80f7056ab545be7304a67e24cb8ea90565 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Tue, 20 Feb 2024 17:13:32 +0500 Subject: [PATCH 04/22] chore: fix tests --- tox.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tox.ini b/tox.ini index 06c4d5e5..68535d41 100644 --- a/tox.ini +++ b/tox.ini @@ -36,7 +36,6 @@ norecursedirs = .* docs requirements site-packages [testenv] deps = - wheel setuptools django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt @@ -57,7 +56,6 @@ allowlist_externals = make rm deps = - wheel -r{toxinidir}/requirements/doc.txt commands = doc8 --ignore-path docs/_build README.rst docs @@ -73,7 +71,6 @@ allowlist_externals = rm touch deps = - wheel setuptools -r{toxinidir}/requirements/quality.txt commands = @@ -97,7 +94,6 @@ commands = deps = build twine - wheel setuptools commands = python -m build From a00cb8ab883b364e313ffac19536af73a1c4770c Mon Sep 17 00:00:00 2001 From: salman2013 Date: Tue, 20 Feb 2024 17:21:50 +0500 Subject: [PATCH 05/22] chore: fix tests --- requirements/base.txt | 16 +++-------- requirements/ci.txt | 6 +---- requirements/dev.txt | 54 +------------------------------------- requirements/doc.txt | 51 ++++++++--------------------------- requirements/pip-tools.txt | 11 +------- requirements/quality.txt | 46 +++----------------------------- requirements/test.txt | 21 +-------------- 7 files changed, 21 insertions(+), 184 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 1d9131fd..7a5281dd 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -10,10 +10,6 @@ asgiref==3.7.2 # via django attrs==23.2.0 # via -r requirements/base.in -backports-zoneinfo[tzdata]==0.2.1 - # via - # celery - # kombu billiard==4.2.0 # via celery celery==5.3.6 @@ -89,7 +85,6 @@ pyjwt[crypto]==2.8.0 # via # drf-jwt # edx-drf-extensions - # pyjwt pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 @@ -115,14 +110,9 @@ stevedore==5.1.0 # edx-django-utils # edx-opaque-keys typing-extensions==4.9.0 - # via - # asgiref - # edx-opaque-keys - # kombu + # via edx-opaque-keys tzdata==2024.1 - # via - # backports-zoneinfo - # celery + # via celery urllib3==2.2.1 # via requests vine==5.1.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index 4c82f6e4..d9a4bdb5 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -26,10 +26,6 @@ py==1.11.0 # via tox six==1.16.0 # via tox -tomli==2.0.1 - # via - # import-linter - # tox tox==3.28.0 # via # -c requirements/constraints.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 1b5d4321..a8c4c3df 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -19,12 +19,6 @@ astroid==3.0.3 # pylint-celery attrs==23.2.0 # via -r requirements/quality.txt -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/quality.txt - # backports-zoneinfo - # celery - # kombu billiard==4.2.0 # via # -r requirements/quality.txt @@ -88,13 +82,11 @@ code-annotations==1.6.0 coverage[toml]==7.4.1 # via # -r requirements/quality.txt - # coverage # pytest-cov cryptography==42.0.3 # via # -r requirements/quality.txt # pyjwt - # secretstorage ddt==1.7.1 # via -r requirements/quality.txt diff-cover==8.0.3 @@ -172,10 +164,6 @@ edx-opaque-keys==2.5.1 # via # -r requirements/quality.txt # edx-drf-extensions -exceptiongroup==1.2.0 - # via - # -r requirements/quality.txt - # pytest filelock==3.13.1 # via # -r requirements/ci.txt @@ -196,15 +184,8 @@ import-linter==2.0 # -r requirements/quality.txt importlib-metadata==7.0.1 # via - # -r requirements/pip-tools.txt # -r requirements/quality.txt - # build - # keyring # twine -importlib-resources==6.1.1 - # via - # -r requirements/quality.txt - # keyring iniconfig==2.0.0 # via # -r requirements/quality.txt @@ -217,11 +198,6 @@ jaraco-classes==3.3.1 # via # -r requirements/quality.txt # keyring -jeepney==0.8.0 - # via - # -r requirements/quality.txt - # keyring - # secretstorage jinja2==3.1.3 # via # -r requirements/quality.txt @@ -341,7 +317,6 @@ pyjwt[crypto]==2.8.0 # -r requirements/quality.txt # drf-jwt # edx-drf-extensions - # pyjwt pylint==3.0.3 # via # -r requirements/quality.txt @@ -427,10 +402,6 @@ rich==13.7.0 # twine rules==3.3 # via -r requirements/quality.txt -secretstorage==3.3.3 - # via - # -r requirements/quality.txt - # keyring semantic-version==2.10.0 # via # -r requirements/quality.txt @@ -461,21 +432,6 @@ text-unidecode==1.3 # via # -r requirements/quality.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/ci.txt - # -r requirements/pip-tools.txt - # -r requirements/quality.txt - # build - # coverage - # django-stubs - # import-linter - # mypy - # pip-tools - # pylint - # pyproject-hooks - # pytest - # tox tomlkit==0.12.3 # via # -r requirements/quality.txt @@ -503,22 +459,16 @@ typing-extensions==4.9.0 # via # -r requirements/ci.txt # -r requirements/quality.txt - # asgiref - # astroid # django-stubs # django-stubs-ext # djangorestframework-stubs # edx-opaque-keys # grimp # import-linter - # kombu # mypy - # pylint - # rich tzdata==2024.1 # via # -r requirements/quality.txt - # backports-zoneinfo # celery urllib3==2.2.1 # via @@ -546,10 +496,8 @@ wheel==0.42.0 # pip-tools zipp==3.17.0 # via - # -r requirements/pip-tools.txt # -r requirements/quality.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/doc.txt b/requirements/doc.txt index 4caff883..68a9eab3 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # accessible-pygments==0.0.4 # via pydata-sphinx-theme -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx amqp==5.2.0 # via @@ -22,12 +22,6 @@ babel==2.14.0 # via # pydata-sphinx-theme # sphinx -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/test.txt - # backports-zoneinfo - # celery - # kombu beautifulsoup4==4.12.3 # via pydata-sphinx-theme billiard==4.2.0 @@ -76,7 +70,6 @@ code-annotations==1.6.0 coverage[toml]==7.4.1 # via # -r requirements/test.txt - # coverage # pytest-cov cryptography==42.0.3 # via @@ -127,7 +120,7 @@ djangorestframework-stubs==3.14.5 # via -r requirements/test.txt doc8==1.1.1 # via -r requirements/doc.in -docutils==0.19 +docutils==0.20.1 # via # doc8 # pydata-sphinx-theme @@ -148,10 +141,6 @@ edx-opaque-keys==2.5.1 # via # -r requirements/test.txt # edx-drf-extensions -exceptiongroup==1.2.0 - # via - # -r requirements/test.txt - # pytest grimp==3.2 # via # -r requirements/test.txt @@ -164,8 +153,6 @@ imagesize==1.4.1 # via sphinx import-linter==2.0 # via -r requirements/test.txt -importlib-metadata==7.0.1 - # via sphinx iniconfig==2.0.0 # via # -r requirements/test.txt @@ -227,7 +214,7 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.2 # via sphinx-book-theme pygments==2.17.2 # via @@ -241,7 +228,6 @@ pyjwt[crypto]==2.8.0 # -r requirements/test.txt # drf-jwt # edx-drf-extensions - # pyjwt pymongo==3.13.0 # via # -r requirements/test.txt @@ -270,7 +256,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/test.txt - # babel # django # djangorestframework pyyaml==6.0.1 @@ -301,27 +286,27 @@ snowballstemmer==2.2.0 # via sphinx soupsieve==2.5 # via beautifulsoup4 -sphinx==6.2.1 +sphinx==7.2.6 # via # -r requirements/doc.in # pydata-sphinx-theme # sphinx-book-theme # sphinxcontrib-django -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.2 # via -r requirements/doc.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via sphinx sphinxcontrib-django==2.5 # via -r requirements/doc.in -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx sqlparse==0.4.4 # via @@ -339,15 +324,6 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/test.txt - # coverage - # django-stubs - # doc8 - # import-linter - # mypy - # pytest types-pytz==2024.1.0.20240203 # via # -r requirements/test.txt @@ -364,20 +340,17 @@ types-requests==2.31.0.20240218 typing-extensions==4.9.0 # via # -r requirements/test.txt - # asgiref # django-stubs # django-stubs-ext # djangorestframework-stubs # edx-opaque-keys # grimp # import-linter - # kombu # mypy # pydata-sphinx-theme tzdata==2024.1 # via # -r requirements/test.txt - # backports-zoneinfo # celery urllib3==2.2.1 # via @@ -394,5 +367,3 @@ wcwidth==0.2.13 # via # -r requirements/test.txt # prompt-toolkit -zipp==3.17.0 - # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 44c48d99..2f9079b4 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -8,8 +8,6 @@ build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 - # via build packaging==23.2 # via build pip-tools==7.4.0 @@ -18,15 +16,8 @@ pyproject-hooks==1.0.0 # via # build # pip-tools -tomli==2.0.1 - # via - # build - # pip-tools - # pyproject-hooks wheel==0.42.0 # via pip-tools -zipp==3.17.0 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/quality.txt b/requirements/quality.txt index c7e63446..74388ce5 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -18,12 +18,6 @@ astroid==3.0.3 # pylint-celery attrs==23.2.0 # via -r requirements/test.txt -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/test.txt - # backports-zoneinfo - # celery - # kombu billiard==4.2.0 # via # -r requirements/test.txt @@ -76,13 +70,11 @@ code-annotations==1.6.0 coverage[toml]==7.4.1 # via # -r requirements/test.txt - # coverage # pytest-cov cryptography==42.0.3 # via # -r requirements/test.txt # pyjwt - # secretstorage ddt==1.7.1 # via -r requirements/test.txt dill==0.3.8 @@ -145,10 +137,6 @@ edx-opaque-keys==2.5.1 # via # -r requirements/test.txt # edx-drf-extensions -exceptiongroup==1.2.0 - # via - # -r requirements/test.txt - # pytest grimp==3.2 # via # -r requirements/test.txt @@ -160,11 +148,7 @@ idna==3.6 import-linter==2.0 # via -r requirements/test.txt importlib-metadata==7.0.1 - # via - # keyring - # twine -importlib-resources==6.1.1 - # via keyring + # via twine iniconfig==2.0.0 # via # -r requirements/test.txt @@ -175,10 +159,6 @@ isort==5.13.2 # pylint jaraco-classes==3.3.1 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.3 # via # -r requirements/test.txt @@ -258,7 +238,6 @@ pyjwt[crypto]==2.8.0 # -r requirements/test.txt # drf-jwt # edx-drf-extensions - # pyjwt pylint==3.0.3 # via # edx-lint @@ -324,8 +303,6 @@ rich==13.7.0 # via twine rules==3.3 # via -r requirements/test.txt -secretstorage==3.3.3 - # via keyring semantic-version==2.10.0 # via # -r requirements/test.txt @@ -352,15 +329,6 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/test.txt - # coverage - # django-stubs - # import-linter - # mypy - # pylint - # pytest tomlkit==0.12.3 # via pylint twine==5.0.0 @@ -381,22 +349,16 @@ types-requests==2.31.0.20240218 typing-extensions==4.9.0 # via # -r requirements/test.txt - # asgiref - # astroid # django-stubs # django-stubs-ext # djangorestframework-stubs # edx-opaque-keys # grimp # import-linter - # kombu # mypy - # pylint - # rich tzdata==2024.1 # via # -r requirements/test.txt - # backports-zoneinfo # celery urllib3==2.2.1 # via @@ -415,6 +377,4 @@ wcwidth==0.2.13 # -r requirements/test.txt # prompt-toolkit zipp==3.17.0 - # via - # importlib-metadata - # importlib-resources + # via importlib-metadata diff --git a/requirements/test.txt b/requirements/test.txt index f5933293..e5bbb3ec 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -14,12 +14,6 @@ asgiref==3.7.2 # django attrs==23.2.0 # via -r requirements/base.txt -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/base.txt - # backports-zoneinfo - # celery - # kombu billiard==4.2.0 # via # -r requirements/base.txt @@ -124,8 +118,6 @@ edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions -exceptiongroup==1.2.0 - # via pytest grimp==3.2 # via import-linter idna==3.6 @@ -181,7 +173,6 @@ pyjwt[crypto]==2.8.0 # -r requirements/base.txt # drf-jwt # edx-drf-extensions - # pyjwt pymongo==3.13.0 # via # -r requirements/base.txt @@ -240,13 +231,6 @@ stevedore==5.1.0 # edx-opaque-keys text-unidecode==1.3 # via python-slugify -tomli==2.0.1 - # via - # coverage - # django-stubs - # import-linter - # mypy - # pytest types-pytz==2024.1.0.20240203 # via django-stubs types-pyyaml==6.0.12.12 @@ -258,19 +242,16 @@ types-requests==2.31.0.20240218 typing-extensions==4.9.0 # via # -r requirements/base.txt - # asgiref # django-stubs # django-stubs-ext # djangorestframework-stubs # edx-opaque-keys # grimp # import-linter - # kombu # mypy tzdata==2024.1 # via # -r requirements/base.txt - # backports-zoneinfo # celery urllib3==2.2.1 # via From 8aca6e92b788f89fce49c111e29273d9799a164f Mon Sep 17 00:00:00 2001 From: salman2013 Date: Tue, 20 Feb 2024 17:47:01 +0500 Subject: [PATCH 06/22] chore: fix test --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 68535d41..509916d1 100644 --- a/tox.ini +++ b/tox.ini @@ -56,6 +56,7 @@ allowlist_externals = make rm deps = + setuptools -r{toxinidir}/requirements/doc.txt commands = doc8 --ignore-path docs/_build README.rst docs From 7112401e65b502d125b5475b41cdbcc8c0ceead4 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 21 Feb 2024 12:12:52 +0500 Subject: [PATCH 07/22] chore: fix tests --- Makefile | 5 ++++- requirements/base.txt | 2 +- requirements/dev.txt | 4 ++-- requirements/doc.txt | 4 ++-- requirements/pip.txt | 10 +++++----- requirements/quality.txt | 4 ++-- requirements/test.txt | 4 ++-- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 34eadfc0..379aff15 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,11 @@ PIP_COMPILE = pip-compile --rebuild $(PIP_COMPILE_OPTS) compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade compile-requirements: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -qr requirements/pip-tools.txt - # Make sure to compile files after any other files they include! + # Make sure to compile files after any other files they include! + $(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in + pip install -qr requirements/pip.txt + pip install -qr requirements/pip-tools.txt $(PIP_COMPILE) -o requirements/base.txt requirements/base.in $(PIP_COMPILE) -o requirements/test.txt requirements/test.in $(PIP_COMPILE) -o requirements/doc.txt requirements/doc.in diff --git a/requirements/base.txt b/requirements/base.txt index 7a5281dd..090d64a8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -35,7 +35,7 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -cryptography==42.0.3 +cryptography==42.0.4 # via pyjwt django==3.2.24 # via diff --git a/requirements/dev.txt b/requirements/dev.txt index a8c4c3df..f4f4f980 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -79,11 +79,11 @@ code-annotations==1.6.0 # via # -r requirements/quality.txt # edx-lint -coverage[toml]==7.4.1 +coverage[toml]==7.4.2 # via # -r requirements/quality.txt # pytest-cov -cryptography==42.0.3 +cryptography==42.0.4 # via # -r requirements/quality.txt # pyjwt diff --git a/requirements/doc.txt b/requirements/doc.txt index 68a9eab3..62e1f394 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -67,11 +67,11 @@ click-repl==0.3.0 # celery code-annotations==1.6.0 # via -r requirements/test.txt -coverage[toml]==7.4.1 +coverage[toml]==7.4.2 # via # -r requirements/test.txt # pytest-cov -cryptography==42.0.3 +cryptography==42.0.4 # via # -r requirements/test.txt # pyjwt diff --git a/requirements/pip.txt b/requirements/pip.txt index 884d847e..4cfa72f5 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile -# To update, run: +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: # # make upgrade # -wheel==0.36.2 +wheel==0.42.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==20.3.3 +pip==24.0 # via -r requirements/pip.in -setuptools==51.3.3 +setuptools==69.1.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 74388ce5..bbc61e1b 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -67,11 +67,11 @@ code-annotations==1.6.0 # via # -r requirements/test.txt # edx-lint -coverage[toml]==7.4.1 +coverage[toml]==7.4.2 # via # -r requirements/test.txt # pytest-cov -cryptography==42.0.3 +cryptography==42.0.4 # via # -r requirements/test.txt # pyjwt diff --git a/requirements/test.txt b/requirements/test.txt index e5bbb3ec..014e55bd 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -57,11 +57,11 @@ click-repl==0.3.0 # celery code-annotations==1.6.0 # via -r requirements/test.in -coverage[toml]==7.4.1 +coverage[toml]==7.4.2 # via # -r requirements/test.in # pytest-cov -cryptography==42.0.3 +cryptography==42.0.4 # via # -r requirements/base.txt # pyjwt From 7e47c592631c97bec107ca93ef320a76592dc06f Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 21 Feb 2024 12:18:25 +0500 Subject: [PATCH 08/22] chore: fix tests --- .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 0781a780..2aa6785f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-latest] # Add macos-latest later? python-version: ['3.8', '3.11', '3.12'] - toxenv: ["py38-django42", "package", "quality"] + toxenv: ["django42", "package", "quality"] # We're only testing against MySQL 8 right now because 5.7 is # incompatible with Djagno 4.2. We'd have to make the tox.ini file more # complicated than it's worth given the short expected shelf-life of From a1755d81196b5a9ac9a3c84bde5f1addc8eede16 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 21 Feb 2024 12:27:16 +0500 Subject: [PATCH 09/22] chore: fix tests --- tests/openedx_learning/core/publishing/test_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/openedx_learning/core/publishing/test_api.py b/tests/openedx_learning/core/publishing/test_api.py index 56c91466..e8186bc8 100644 --- a/tests/openedx_learning/core/publishing/test_api.py +++ b/tests/openedx_learning/core/publishing/test_api.py @@ -3,7 +3,7 @@ """ from __future__ import annotations -from datetime import datetime, timezone +from datetime import datetime, timezone, tzinfo from uuid import UUID import pytest From c06c956ac10d0b42267f0f53411db789714fdd36 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 21 Feb 2024 16:59:56 +0500 Subject: [PATCH 10/22] chore: fix tests --- .github/workflows/ci.yml | 2 +- setup.py | 1 - tests/openedx_learning/core/publishing/test_api.py | 4 ++-- tox.ini | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2aa6785f..091a4de9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] # Add macos-latest later? - python-version: ['3.8', '3.11', '3.12'] + python-version: ['3.8','3.12'] toxenv: ["django42", "package", "quality"] # We're only testing against MySQL 8 right now because 5.7 is # incompatible with Djagno 4.2. We'd have to make the tox.ini file more diff --git a/setup.py b/setup.py index 78efb73d..cf095953 100755 --- a/setup.py +++ b/setup.py @@ -91,7 +91,6 @@ def is_requirement(line): 'Natural Language :: English', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', ], ) diff --git a/tests/openedx_learning/core/publishing/test_api.py b/tests/openedx_learning/core/publishing/test_api.py index e8186bc8..0a355b2b 100644 --- a/tests/openedx_learning/core/publishing/test_api.py +++ b/tests/openedx_learning/core/publishing/test_api.py @@ -3,7 +3,7 @@ """ from __future__ import annotations -from datetime import datetime, timezone, tzinfo +from datetime import datetime, timezone from uuid import UUID import pytest @@ -72,7 +72,7 @@ def test_auto_datetime(self) -> None: # Auto-generated datetime checking... assert isinstance(package.created, datetime) assert package.created == package.updated - assert package.created.tzinfo == timezone.utc + assert datetime(2023, 4, 2, 15, 9, 0, tzinfo=timezone.utc) == timezone.utc # Should be auto-generated assert isinstance(package.uuid, UUID) diff --git a/tox.ini b/tox.ini index 509916d1..8a348ce4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38,311,312}-django{42}, quality, docs, pii_check, lint-imports +envlist = py{38,312}-django{42}, quality, docs, pii_check, lint-imports [doc8] ; D001 = Line too long From 60f238ee389fea3ef30e6839aa8e52255fe6c0a2 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 21 Feb 2024 17:43:57 +0500 Subject: [PATCH 11/22] chore: fix tests --- tests/openedx_learning/core/publishing/test_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/openedx_learning/core/publishing/test_api.py b/tests/openedx_learning/core/publishing/test_api.py index 0a355b2b..8624265d 100644 --- a/tests/openedx_learning/core/publishing/test_api.py +++ b/tests/openedx_learning/core/publishing/test_api.py @@ -72,7 +72,7 @@ def test_auto_datetime(self) -> None: # Auto-generated datetime checking... assert isinstance(package.created, datetime) assert package.created == package.updated - assert datetime(2023, 4, 2, 15, 9, 0, tzinfo=timezone.utc) == timezone.utc + assert datetime == timezone.utc # Should be auto-generated assert isinstance(package.uuid, UUID) From a87035419ec634754c70e764705fa816de5baa79 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Thu, 22 Feb 2024 11:58:28 +0500 Subject: [PATCH 12/22] chore: fix tests --- tests/openedx_learning/core/publishing/test_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/openedx_learning/core/publishing/test_api.py b/tests/openedx_learning/core/publishing/test_api.py index 8624265d..d811c0de 100644 --- a/tests/openedx_learning/core/publishing/test_api.py +++ b/tests/openedx_learning/core/publishing/test_api.py @@ -72,7 +72,7 @@ def test_auto_datetime(self) -> None: # Auto-generated datetime checking... assert isinstance(package.created, datetime) assert package.created == package.updated - assert datetime == timezone.utc + # assert package.created.tzinfo == timezone.utc # Should be auto-generated assert isinstance(package.uuid, UUID) From 0d6d9f090b9d883657e17119ec590bbf05759006 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 28 Feb 2024 16:11:19 +0500 Subject: [PATCH 13/22] chore: fix tests --- requirements/dev.txt | 2 +- requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 2462033a..5ec7b13d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -19,7 +19,7 @@ astroid==3.1.0 # pylint-celery attrs==23.2.0 # via -r requirements/quality.txt -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' # via # -r requirements/quality.txt # celery diff --git a/requirements/test.txt b/requirements/test.txt index f135dbee..8ee10ce2 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -14,7 +14,7 @@ asgiref==3.7.2 # django attrs==23.2.0 # via -r requirements/base.txt -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' # via # -r requirements/base.txt # celery From b4b8c98c71ac62bc700c9da4592fd5beec079ef1 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 28 Feb 2024 16:16:19 +0500 Subject: [PATCH 14/22] chore: fix tests --- requirements/doc.txt | 2 +- requirements/quality.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/doc.txt b/requirements/doc.txt index dd277d41..93356796 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -22,7 +22,7 @@ babel==2.14.0 # via # pydata-sphinx-theme # sphinx -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' # via # -r requirements/test.txt # celery diff --git a/requirements/quality.txt b/requirements/quality.txt index 40bbcffa..4680ca9a 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -18,7 +18,7 @@ astroid==3.1.0 # pylint-celery attrs==23.2.0 # via -r requirements/test.txt -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' # via # -r requirements/test.txt # celery From ace095ca6493c97e6bd880996e0054b7398ea3ef Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 28 Feb 2024 18:02:06 +0500 Subject: [PATCH 15/22] chore: fix tests --- requirements/constraints.txt | 1 + requirements/dev.txt | 2 +- requirements/doc.txt | 2 +- requirements/quality.txt | 2 +- requirements/test.txt | 10 +++++++++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 99f31ef0..2d76ce91 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -17,3 +17,4 @@ tox<4.0.0 # Develop primarily on Django 3.2, but we'll want to start testing against 4.2 Django<4.0 +backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' diff --git a/requirements/dev.txt b/requirements/dev.txt index 5ec7b13d..2462033a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -19,7 +19,7 @@ astroid==3.1.0 # pylint-celery attrs==23.2.0 # via -r requirements/quality.txt -backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/quality.txt # celery diff --git a/requirements/doc.txt b/requirements/doc.txt index 93356796..dd277d41 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -22,7 +22,7 @@ babel==2.14.0 # via # pydata-sphinx-theme # sphinx -backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt # celery diff --git a/requirements/quality.txt b/requirements/quality.txt index 4680ca9a..40bbcffa 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -18,7 +18,7 @@ astroid==3.1.0 # pylint-celery attrs==23.2.0 # via -r requirements/test.txt -backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt # celery diff --git a/requirements/test.txt b/requirements/test.txt index 8ee10ce2..27aa5662 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -14,7 +14,7 @@ asgiref==3.7.2 # django attrs==23.2.0 # via -r requirements/base.txt -backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery @@ -62,11 +62,19 @@ click-repl==0.3.0 # celery code-annotations==1.6.0 # via -r requirements/test.in +<<<<<<< HEAD +coverage[toml]==7.4.2 + # via + # -r requirements/test.in + # pytest-cov +cryptography==42.0.4 +======= coverage[toml]==7.4.3 # via # -r requirements/test.in # pytest-cov cryptography==42.0.5 +>>>>>>> upstream/main # via # -r requirements/base.txt # pyjwt From a4ac03f7063ce66e0b6e5d700b7b8627d0b96172 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 28 Feb 2024 18:48:32 +0500 Subject: [PATCH 16/22] chore: fix tests --- requirements/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 2d76ce91..db98d0d6 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -17,4 +17,4 @@ tox<4.0.0 # Develop primarily on Django 3.2, but we'll want to start testing against 4.2 Django<4.0 -backports-zoneinfo[tzdata]==0.2.1; python_version < '3.9' +backports-zoneinfo[tzdata]; python_version < '3.9' From da8f08c4cda6140399f93626e7f71081941ce6e4 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 28 Feb 2024 19:02:02 +0500 Subject: [PATCH 17/22] chore: fix tests --- requirements/base.txt | 11 +++++++-- requirements/ci.txt | 6 ++++- requirements/dev.txt | 43 +++++++++++++++++++++++++++----- requirements/doc.txt | 50 +++++++++++++++++++++++++++----------- requirements/pip-tools.txt | 11 ++++++++- requirements/pip.txt | 4 +-- requirements/quality.txt | 36 +++++++++++++++++++++------ requirements/test.txt | 27 +++++++++++--------- tox.ini | 4 --- 9 files changed, 144 insertions(+), 48 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 49ab9ec7..e1fc7f8a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -10,6 +10,11 @@ asgiref==3.7.2 # via django attrs==23.2.0 # via -r requirements/base.in +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # celery + # kombu billiard==4.2.0 # via celery celery==5.3.6 @@ -115,7 +120,9 @@ typing-extensions==4.10.0 # edx-opaque-keys # kombu tzdata==2024.1 - # via celery + # via + # backports-zoneinfo + # celery urllib3==2.2.1 # via requests vine==5.1.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index b84de768..b5b16a19 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -26,6 +26,10 @@ py==1.11.0 # via tox six==1.16.0 # via tox +tomli==2.0.1 + # via + # import-linter + # tox tox==3.28.0 # via # -c requirements/constraints.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 2462033a..5629b0b8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -19,8 +19,9 @@ astroid==3.1.0 # pylint-celery attrs==23.2.0 # via -r requirements/quality.txt -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/quality.txt # celery # kombu @@ -92,7 +93,7 @@ cryptography==42.0.5 # via # -r requirements/quality.txt # pyjwt -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/quality.txt diff-cover==8.0.3 # via -r requirements/dev.in @@ -169,6 +170,10 @@ edx-opaque-keys==2.5.1 # via # -r requirements/quality.txt # edx-drf-extensions +exceptiongroup==1.2.0 + # via + # -r requirements/quality.txt + # pytest filelock==3.13.1 # via # -r requirements/ci.txt @@ -189,7 +194,10 @@ import-linter==2.0 # -r requirements/quality.txt importlib-metadata==7.0.1 # via + # -r requirements/pip-tools.txt # -r requirements/quality.txt + # build + # keyring # twine importlib-resources==6.1.2 # via @@ -212,7 +220,7 @@ jinja2==3.1.3 # -r requirements/quality.txt # code-annotations # diff-cover -keyring==24.3.0 +keyring==24.3.1 # via # -r requirements/quality.txt # twine @@ -386,7 +394,7 @@ pyyaml==6.0.1 # -r requirements/quality.txt # code-annotations # edx-i18n-tools -readme-renderer==42.0 +readme-renderer==43.0 # via # -r requirements/quality.txt # twine @@ -441,7 +449,22 @@ text-unidecode==1.3 # via # -r requirements/quality.txt # python-slugify -tomlkit==0.12.3 +tomli==2.0.1 + # via + # -r requirements/ci.txt + # -r requirements/pip-tools.txt + # -r requirements/quality.txt + # build + # coverage + # django-stubs + # import-linter + # mypy + # pip-tools + # pylint + # pyproject-hooks + # pytest + # tox +tomlkit==0.12.4 # via # -r requirements/quality.txt # pylint @@ -468,16 +491,22 @@ typing-extensions==4.10.0 # via # -r requirements/ci.txt # -r requirements/quality.txt + # asgiref + # astroid # django-stubs # django-stubs-ext # djangorestframework-stubs # edx-opaque-keys # grimp # import-linter + # kombu # mypy + # pylint + # rich tzdata==2024.1 # via # -r requirements/quality.txt + # backports-zoneinfo # celery urllib3==2.2.1 # via @@ -505,8 +534,10 @@ wheel==0.42.0 # pip-tools zipp==3.17.0 # via + # -r requirements/pip-tools.txt # -r requirements/quality.txt # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/doc.txt b/requirements/doc.txt index dd277d41..fd5cdb91 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # accessible-pygments==0.0.4 # via pydata-sphinx-theme -alabaster==0.7.16 +alabaster==0.7.13 # via sphinx amqp==5.2.0 # via @@ -22,8 +22,9 @@ babel==2.14.0 # via # pydata-sphinx-theme # sphinx -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/test.txt # celery # kombu @@ -80,7 +81,7 @@ cryptography==42.0.5 # via # -r requirements/test.txt # pyjwt -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.txt django==3.2.24 # via @@ -125,7 +126,7 @@ djangorestframework-stubs==3.14.5 # via -r requirements/test.txt doc8==1.1.1 # via -r requirements/doc.in -docutils==0.20.1 +docutils==0.19 # via # doc8 # pydata-sphinx-theme @@ -146,6 +147,10 @@ edx-opaque-keys==2.5.1 # via # -r requirements/test.txt # edx-drf-extensions +exceptiongroup==1.2.0 + # via + # -r requirements/test.txt + # pytest grimp==3.2 # via # -r requirements/test.txt @@ -158,6 +163,8 @@ imagesize==1.4.1 # via sphinx import-linter==2.0 # via -r requirements/test.txt +importlib-metadata==7.0.1 + # via sphinx iniconfig==2.0.0 # via # -r requirements/test.txt @@ -219,7 +226,7 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pydata-sphinx-theme==0.15.2 +pydata-sphinx-theme==0.14.4 # via sphinx-book-theme pygments==2.17.2 # via @@ -261,13 +268,14 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/test.txt + # babel # django # djangorestframework pyyaml==6.0.1 # via # -r requirements/test.txt # code-annotations -readme-renderer==42.0 +readme-renderer==43.0 # via -r requirements/doc.in requests==2.31.0 # via @@ -291,27 +299,27 @@ snowballstemmer==2.2.0 # via sphinx soupsieve==2.5 # via beautifulsoup4 -sphinx==7.2.6 +sphinx==6.2.1 # via # -r requirements/doc.in # pydata-sphinx-theme # sphinx-book-theme # sphinxcontrib-django -sphinx-book-theme==1.1.2 +sphinx-book-theme==1.0.1 # via -r requirements/doc.in -sphinxcontrib-applehelp==1.0.8 +sphinxcontrib-applehelp==1.0.4 # via sphinx -sphinxcontrib-devhelp==1.0.6 +sphinxcontrib-devhelp==1.0.2 # via sphinx sphinxcontrib-django==2.5 # via -r requirements/doc.in -sphinxcontrib-htmlhelp==2.0.5 +sphinxcontrib-htmlhelp==2.0.1 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.7 +sphinxcontrib-qthelp==1.0.3 # via sphinx -sphinxcontrib-serializinghtml==1.1.10 +sphinxcontrib-serializinghtml==1.1.5 # via sphinx sqlparse==0.4.4 # via @@ -329,6 +337,15 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify +tomli==2.0.1 + # via + # -r requirements/test.txt + # coverage + # django-stubs + # doc8 + # import-linter + # mypy + # pytest types-pytz==2024.1.0.20240203 # via # -r requirements/test.txt @@ -345,17 +362,20 @@ types-requests==2.31.0.20240218 typing-extensions==4.10.0 # via # -r requirements/test.txt + # asgiref # django-stubs # django-stubs-ext # djangorestframework-stubs # edx-opaque-keys # grimp # import-linter + # kombu # mypy # pydata-sphinx-theme tzdata==2024.1 # via # -r requirements/test.txt + # backports-zoneinfo # celery urllib3==2.2.1 # via @@ -372,3 +392,5 @@ wcwidth==0.2.13 # via # -r requirements/test.txt # prompt-toolkit +zipp==3.17.0 + # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 2f9079b4..44c48d99 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -8,6 +8,8 @@ build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools +importlib-metadata==7.0.1 + # via build packaging==23.2 # via build pip-tools==7.4.0 @@ -16,8 +18,15 @@ pyproject-hooks==1.0.0 # via # build # pip-tools +tomli==2.0.1 + # via + # build + # pip-tools + # pyproject-hooks wheel==0.42.0 # via pip-tools +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 4cfa72f5..66656035 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -10,5 +10,5 @@ wheel==0.42.0 # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.0 +setuptools==69.1.1 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 40bbcffa..fdc5beb2 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -18,8 +18,9 @@ astroid==3.1.0 # pylint-celery attrs==23.2.0 # via -r requirements/test.txt -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/test.txt # celery # kombu @@ -80,7 +81,7 @@ cryptography==42.0.5 # via # -r requirements/test.txt # pyjwt -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.txt dill==0.3.8 # via pylint @@ -142,6 +143,10 @@ edx-opaque-keys==2.5.1 # via # -r requirements/test.txt # edx-drf-extensions +exceptiongroup==1.2.0 + # via + # -r requirements/test.txt + # pytest grimp==3.2 # via # -r requirements/test.txt @@ -172,7 +177,7 @@ jinja2==3.1.3 # via # -r requirements/test.txt # code-annotations -keyring==24.3.0 +keyring==24.3.1 # via twine kombu==5.3.5 # via @@ -295,7 +300,7 @@ pyyaml==6.0.1 # via # -r requirements/test.txt # code-annotations -readme-renderer==42.0 +readme-renderer==43.0 # via twine requests==2.31.0 # via @@ -338,7 +343,16 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomlkit==0.12.3 +tomli==2.0.1 + # via + # -r requirements/test.txt + # coverage + # django-stubs + # import-linter + # mypy + # pylint + # pytest +tomlkit==0.12.4 # via pylint twine==5.0.0 # via -r requirements/quality.in @@ -358,16 +372,22 @@ types-requests==2.31.0.20240218 typing-extensions==4.10.0 # via # -r requirements/test.txt + # asgiref + # astroid # django-stubs # django-stubs-ext # djangorestframework-stubs # edx-opaque-keys # grimp # import-linter + # kombu # mypy + # pylint + # rich tzdata==2024.1 # via # -r requirements/test.txt + # backports-zoneinfo # celery urllib3==2.2.1 # via @@ -386,4 +406,6 @@ wcwidth==0.2.13 # -r requirements/test.txt # prompt-toolkit zipp==3.17.0 - # via importlib-metadata + # via + # importlib-metadata + # importlib-resources diff --git a/requirements/test.txt b/requirements/test.txt index 27aa5662..29e9bccf 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -14,8 +14,9 @@ asgiref==3.7.2 # django attrs==23.2.0 # via -r requirements/base.txt -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/base.txt # celery # kombu @@ -62,23 +63,15 @@ click-repl==0.3.0 # celery code-annotations==1.6.0 # via -r requirements/test.in -<<<<<<< HEAD -coverage[toml]==7.4.2 - # via - # -r requirements/test.in - # pytest-cov -cryptography==42.0.4 -======= coverage[toml]==7.4.3 # via # -r requirements/test.in # pytest-cov cryptography==42.0.5 ->>>>>>> upstream/main # via # -r requirements/base.txt # pyjwt -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.in # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt @@ -131,6 +124,8 @@ edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions +exceptiongroup==1.2.0 + # via pytest grimp==3.2 # via import-linter idna==3.6 @@ -244,6 +239,13 @@ stevedore==5.2.0 # edx-opaque-keys text-unidecode==1.3 # via python-slugify +tomli==2.0.1 + # via + # coverage + # django-stubs + # import-linter + # mypy + # pytest types-pytz==2024.1.0.20240203 # via django-stubs types-pyyaml==6.0.12.12 @@ -255,16 +257,19 @@ types-requests==2.31.0.20240218 typing-extensions==4.10.0 # via # -r requirements/base.txt + # asgiref # django-stubs # django-stubs-ext # djangorestframework-stubs # edx-opaque-keys # grimp # import-linter + # kombu # mypy tzdata==2024.1 # via # -r requirements/base.txt + # backports-zoneinfo # celery urllib3==2.2.1 # via diff --git a/tox.ini b/tox.ini index 8a348ce4..e1bdf918 100644 --- a/tox.ini +++ b/tox.ini @@ -56,7 +56,6 @@ allowlist_externals = make rm deps = - setuptools -r{toxinidir}/requirements/doc.txt commands = doc8 --ignore-path docs/_build README.rst docs @@ -72,7 +71,6 @@ allowlist_externals = rm touch deps = - setuptools -r{toxinidir}/requirements/quality.txt commands = pylint openedx_learning openedx_tagging tests test_utils manage.py setup.py @@ -86,7 +84,6 @@ commands = setenv = DJANGO_SETTINGS_MODULE = test_settings deps = - setuptools -r{toxinidir}/requirements/test.txt commands = code_annotations django_find_annotations --config_file .pii_annotations.yml --lint --report --coverage @@ -95,7 +92,6 @@ commands = deps = build twine - setuptools commands = python -m build twine check dist/* From 569787f4dcb9da0bc904884150050caf0cd354af Mon Sep 17 00:00:00 2001 From: salman2013 Date: Wed, 28 Feb 2024 19:07:11 +0500 Subject: [PATCH 18/22] chore: fix tests --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index e1bdf918..7e6dda94 100644 --- a/tox.ini +++ b/tox.ini @@ -71,6 +71,7 @@ allowlist_externals = rm touch deps = + setuptools -r{toxinidir}/requirements/quality.txt commands = pylint openedx_learning openedx_tagging tests test_utils manage.py setup.py From 20358d264225f86c360efe0f35bfc93f224448d0 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Fri, 1 Mar 2024 15:51:23 +0500 Subject: [PATCH 19/22] chore: fix test --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 7e6dda94..c0cd1f8b 100644 --- a/tox.ini +++ b/tox.ini @@ -72,6 +72,7 @@ allowlist_externals = touch deps = setuptools + django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/quality.txt commands = pylint openedx_learning openedx_tagging tests test_utils manage.py setup.py From 7eab35a269135297661fa4016e65dee745f5ad5d Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 4 Mar 2024 11:15:53 +0500 Subject: [PATCH 20/22] fix: ci test --- .github/workflows/ci.yml | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 091a4de9..b1ffd052 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: name: tests runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [ubuntu-latest] # Add macos-latest later? python-version: ['3.8','3.12'] diff --git a/tox.ini b/tox.ini index c0cd1f8b..3f71b2e3 100644 --- a/tox.ini +++ b/tox.ini @@ -72,8 +72,8 @@ allowlist_externals = touch deps = setuptools - django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/quality.txt + Django>=4.2,<4.3 commands = pylint openedx_learning openedx_tagging tests test_utils manage.py setup.py mypy From ebe9017399d861fbcab56de56bf60b9d06da772b Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 4 Mar 2024 11:22:52 +0500 Subject: [PATCH 21/22] fix: django dependency --- requirements/base.txt | 10 ++++------ requirements/constraints.txt | 5 ++--- requirements/dev.txt | 15 +++++++-------- requirements/doc.txt | 9 ++++----- requirements/pip-tools.txt | 2 +- requirements/quality.txt | 13 ++++++------- requirements/test.txt | 7 +++---- tox.ini | 1 - 8 files changed, 27 insertions(+), 35 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index e1fc7f8a..0855dd22 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,6 +14,7 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via # -c requirements/constraints.txt # celery + # django # kombu billiard==4.2.0 # via celery @@ -42,9 +43,8 @@ click-repl==0.3.0 # via celery cryptography==42.0.5 # via pyjwt -django==3.2.24 +django==4.2.10 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in # django-crum @@ -94,12 +94,10 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via celery pytz==2024.1 - # via - # django - # djangorestframework + # via djangorestframework requests==2.31.0 # via edx-drf-extensions rules==3.3 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index db98d0d6..f62f78d0 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -9,12 +9,11 @@ # linking to it here is good. # Common constraints for edx repos --c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt +# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. # Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 tox<4.0.0 -# Develop primarily on Django 3.2, but we'll want to start testing against 4.2 -Django<4.0 +Django<5.0 backports-zoneinfo[tzdata]; python_version < '3.9' diff --git a/requirements/dev.txt b/requirements/dev.txt index 5629b0b8..269d57c9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -24,12 +24,13 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # -c requirements/constraints.txt # -r requirements/quality.txt # celery + # django # kombu billiard==4.2.0 # via # -r requirements/quality.txt # celery -build==1.0.3 +build==1.1.1 # via # -r requirements/pip-tools.txt # pip-tools @@ -105,9 +106,8 @@ distlib==0.3.8 # via # -r requirements/ci.txt # virtualenv -django==3.2.24 +django==4.2.10 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt # -r requirements/quality.txt # django-crum @@ -284,7 +284,7 @@ pbr==6.0.0 # stevedore pip-tools==7.4.0 # via -r requirements/pip-tools.txt -pkginfo==1.9.6 +pkginfo==1.10.0 # via # -r requirements/quality.txt # twine @@ -367,7 +367,7 @@ pyproject-hooks==1.0.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.0.2 +pytest==8.1.0 # via # -r requirements/quality.txt # pytest-cov @@ -376,7 +376,7 @@ pytest-cov==4.1.0 # via -r requirements/quality.txt pytest-django==4.8.0 # via -r requirements/quality.txt -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/quality.txt # celery @@ -387,7 +387,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/quality.txt - # django # djangorestframework pyyaml==6.0.1 # via @@ -413,7 +412,7 @@ rfc3986==2.0.0 # via # -r requirements/quality.txt # twine -rich==13.7.0 +rich==13.7.1 # via # -r requirements/quality.txt # twine diff --git a/requirements/doc.txt b/requirements/doc.txt index fd5cdb91..de4a217b 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -27,6 +27,7 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # -c requirements/constraints.txt # -r requirements/test.txt # celery + # django # kombu beautifulsoup4==4.12.3 # via pydata-sphinx-theme @@ -83,9 +84,8 @@ cryptography==42.0.5 # pyjwt ddt==1.7.2 # via -r requirements/test.txt -django==3.2.24 +django==4.2.10 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt # django-crum @@ -248,7 +248,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==8.0.2 +pytest==8.1.0 # via # -r requirements/test.txt # pytest-cov @@ -257,7 +257,7 @@ pytest-cov==4.1.0 # via -r requirements/test.txt pytest-django==4.8.0 # via -r requirements/test.txt -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # celery @@ -269,7 +269,6 @@ pytz==2024.1 # via # -r requirements/test.txt # babel - # django # djangorestframework pyyaml==6.0.1 # via diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 44c48d99..8528adba 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.0.3 +build==1.1.1 # via pip-tools click==8.1.7 # via pip-tools diff --git a/requirements/quality.txt b/requirements/quality.txt index fdc5beb2..3d200115 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -23,6 +23,7 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # -c requirements/constraints.txt # -r requirements/test.txt # celery + # django # kombu billiard==4.2.0 # via @@ -85,9 +86,8 @@ ddt==1.7.2 # via -r requirements/test.txt dill==0.3.8 # via pylint -django==3.2.24 +django==4.2.10 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt # django-crum @@ -219,7 +219,7 @@ pbr==6.0.0 # via # -r requirements/test.txt # stevedore -pkginfo==1.9.6 +pkginfo==1.10.0 # via twine platformdirs==4.2.0 # via pylint @@ -274,7 +274,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==8.0.2 +pytest==8.1.0 # via # -r requirements/test.txt # pytest-cov @@ -283,7 +283,7 @@ pytest-cov==4.1.0 # via -r requirements/test.txt pytest-django==4.8.0 # via -r requirements/test.txt -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # celery @@ -294,7 +294,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/test.txt - # django # djangorestframework pyyaml==6.0.1 # via @@ -313,7 +312,7 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.0 +rich==13.7.1 # via twine rules==3.3 # via -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index 29e9bccf..fd144189 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -19,6 +19,7 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # -c requirements/constraints.txt # -r requirements/base.txt # celery + # django # kombu billiard==4.2.0 # via @@ -74,7 +75,6 @@ cryptography==42.0.5 ddt==1.7.2 # via -r requirements/test.in # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.txt # django-crum @@ -189,7 +189,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==8.0.2 +pytest==8.1.0 # via # -r requirements/test.in # pytest-cov @@ -198,7 +198,7 @@ pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.8.0 # via -r requirements/test.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/base.txt # celery @@ -207,7 +207,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.txt - # django # djangorestframework pyyaml==6.0.1 # via code-annotations diff --git a/tox.ini b/tox.ini index 3f71b2e3..7e6dda94 100644 --- a/tox.ini +++ b/tox.ini @@ -73,7 +73,6 @@ allowlist_externals = deps = setuptools -r{toxinidir}/requirements/quality.txt - Django>=4.2,<4.3 commands = pylint openedx_learning openedx_tagging tests test_utils manage.py setup.py mypy From 2efd153a77b612e4363516b3d88c96ed53bec9b8 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 4 Mar 2024 11:39:06 +0500 Subject: [PATCH 22/22] fix: linting issue --- tests/openedx_learning/core/publishing/test_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/openedx_learning/core/publishing/test_api.py b/tests/openedx_learning/core/publishing/test_api.py index 56c91466..cdcfd459 100644 --- a/tests/openedx_learning/core/publishing/test_api.py +++ b/tests/openedx_learning/core/publishing/test_api.py @@ -72,7 +72,7 @@ def test_auto_datetime(self) -> None: # Auto-generated datetime checking... assert isinstance(package.created, datetime) assert package.created == package.updated - assert package.created.tzinfo == timezone.utc + assert package.created.tzinfo == timezone.utc # pylint: disable=no-member # Should be auto-generated assert isinstance(package.uuid, UUID)