diff --git a/ccx_keys/tests/test_ccx_keys.py b/ccx_keys/tests/test_ccx_keys.py index 231e670..2219708 100644 --- a/ccx_keys/tests/test_ccx_keys.py +++ b/ccx_keys/tests/test_ccx_keys.py @@ -305,11 +305,13 @@ def test_missing_block_id(self, url): UsageKey.from_string(url) @ddt.data( - ('org', 'course', 'run', '1', 'category', 'name', None), - ('org', 'course', 'run', '1', 'category', 'name:more_name', None), + {'org': 'org', 'course': 'course', 'run': 'run', 'ccx': '1', + 'category': 'category', 'name': 'name', 'revision': None}, + {'org': 'org', 'course': 'course', 'run': 'run', 'ccx': '1', + 'category': 'category', 'name': 'name:more_name', 'revision': None}, ) @ddt.unpack - def test_valid_locations(self, org, course, run, ccx, category, name, revision): + def test_valid_locations(self, *, org, course, run, ccx, category, name, revision): course_key = CCXLocator(org=org, course=course, run=run, branch=revision, ccx=ccx) locator = CCXBlockUsageLocator(course_key, block_type=category, block_id=name, ) self.assertEqual(org, locator.org) diff --git a/requirements/base.txt b/requirements/base.txt index 69af665..1f3115b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,13 +4,13 @@ # # make upgrade # -dnspython==2.6.1 +dnspython==2.7.0 # via pymongo -edx-opaque-keys==2.10.0 +edx-opaque-keys==2.11.0 # via -r requirements/base.in -pbr==6.0.0 +pbr==6.1.0 # via stevedore -pymongo==4.8.0 +pymongo==4.10.1 # via edx-opaque-keys six==1.16.0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index e39ed77..deec652 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,9 +10,9 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox -distlib==0.3.8 +distlib==0.3.9 # via virtualenv -filelock==3.15.4 +filelock==3.16.1 # via # tox # virtualenv @@ -20,15 +20,15 @@ packaging==24.1 # via # pyproject-api # tox -platformdirs==4.2.2 +platformdirs==4.3.6 # via # tox # virtualenv pluggy==1.5.0 # via tox -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via tox -tox==4.18.0 +tox==4.23.2 # via -r requirements/ci.in -virtualenv==20.26.3 +virtualenv==20.27.0 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index c18367d..1f09038 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,204 +4,204 @@ # # make upgrade # -astroid==3.2.4 +astroid==3.3.5 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pylint # pylint-celery -build==1.2.1 +build==1.2.2.post1 # via - # -r requirements/pip-tools.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/pip-tools.txt # pip-tools cachetools==5.5.0 # via - # -r requirements/ci.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # tox chardet==5.2.0 # via - # -r requirements/ci.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # tox click==8.1.7 # via - # -r requirements/pip-tools.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/pip-tools.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # click-log # code-annotations # edx-lint # pip-tools click-log==0.4.0 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # edx-lint code-annotations==1.8.0 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # edx-lint colorama==0.4.6 # via - # -r requirements/ci.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # tox -coverage==7.6.1 - # via -r requirements/test.txt +coverage==7.6.4 + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt ddt==1.7.2 - # via -r requirements/test.txt -dill==0.3.8 + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt +dill==0.3.9 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pylint -distlib==0.3.8 +distlib==0.3.9 # via - # -r requirements/ci.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # virtualenv -dnspython==2.6.1 +dnspython==2.7.0 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pymongo -edx-lint==5.3.7 - # via -r requirements/test.txt -edx-opaque-keys==2.10.0 - # via -r requirements/test.txt -filelock==3.15.4 - # via - # -r requirements/ci.txt - # -r requirements/test.txt +edx-lint==5.4.0 + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt +edx-opaque-keys==2.11.0 + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt +filelock==3.16.1 + # via + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # tox # virtualenv iniconfig==2.0.0 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pytest isort==5.13.2 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pylint jinja2==3.1.4 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # code-annotations lazy-object-proxy==1.10.0 - # via -r requirements/test.txt -markupsafe==2.1.5 + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt +markupsafe==3.0.2 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # jinja2 mccabe==0.7.0 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pylint mock==5.1.0 - # via -r requirements/test.txt + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt packaging==24.1 # via - # -r requirements/ci.txt - # -r requirements/pip-tools.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/pip-tools.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # build # pyproject-api # pytest # tox -pbr==6.0.0 +pbr==6.1.0 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # stevedore pip-tools==7.4.1 - # via -r requirements/pip-tools.txt -platformdirs==4.2.2 + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/pip-tools.txt +platformdirs==4.3.6 # via - # -r requirements/ci.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pylint # tox # virtualenv pluggy==1.5.0 # via - # -r requirements/ci.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pytest # tox pycodestyle==2.12.1 - # via -r requirements/test.txt -pylint==3.2.6 + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt +pylint==3.3.1 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # edx-lint # pylint-celery # pylint-django # pylint-plugin-utils pylint-celery==0.3 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # edx-lint -pylint-django==2.5.5 +pylint-django==2.6.1 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # edx-lint pylint-plugin-utils==0.8.2 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pylint-celery # pylint-django -pymongo==4.8.0 +pymongo==4.10.1 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # edx-opaque-keys -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via - # -r requirements/ci.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # tox -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via - # -r requirements/pip-tools.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/pip-tools.txt # build # pip-tools -pytest==8.3.2 - # via -r requirements/test.txt +pytest==8.3.3 + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt python-slugify==8.0.4 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # code-annotations pyyaml==6.0.2 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # code-annotations six==1.16.0 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # edx-lint stevedore==5.3.0 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # code-annotations # edx-opaque-keys text-unidecode==1.3 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # python-slugify tomlkit==0.13.2 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # pylint -tox==4.18.0 +tox==4.23.2 # via - # -r requirements/ci.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt typing-extensions==4.12.2 # via - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # edx-opaque-keys -virtualenv==20.26.3 +virtualenv==20.27.0 # via - # -r requirements/ci.txt - # -r requirements/test.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/ci.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/test.txt # tox wheel==0.44.0 # via - # -r requirements/pip-tools.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/pip-tools.txt # pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index fedf88d..db6c463 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.2.1 +build==1.2.2.post1 # via pip-tools click==8.1.7 # via pip-tools @@ -12,7 +12,7 @@ packaging==24.1 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # build # pip-tools diff --git a/requirements/pip.txt b/requirements/pip.txt index f0fca18..c8b5665 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.44.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.2 +pip==24.3.1 # via -r requirements/pip.in -setuptools==73.0.1 +setuptools==75.2.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index e28eff9..e2f518b 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,7 +4,7 @@ # # make upgrade # -astroid==3.2.4 +astroid==3.3.5 # via # pylint # pylint-celery @@ -17,25 +17,25 @@ click-log==0.4.0 # via edx-lint code-annotations==1.8.0 # via edx-lint -dill==0.3.8 +dill==0.3.9 # via pylint -edx-lint==5.3.7 +edx-lint==5.4.0 # via -r requirements/quality.in isort==5.13.2 # via pylint jinja2==3.1.4 # via code-annotations -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 mccabe==0.7.0 # via pylint -pbr==6.0.0 +pbr==6.1.0 # via stevedore -platformdirs==4.2.2 +platformdirs==4.3.6 # via pylint pycodestyle==2.12.1 # via -r requirements/quality.in -pylint==3.2.6 +pylint==3.3.1 # via # -r requirements/quality.in # edx-lint @@ -44,7 +44,7 @@ pylint==3.2.6 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.5 +pylint-django==2.6.1 # via edx-lint pylint-plugin-utils==0.8.2 # via diff --git a/requirements/test.txt b/requirements/test.txt index bdf7fbf..15dd8b9 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # make upgrade # -astroid==3.2.4 +astroid==3.3.5 # via # pylint # pylint-celery @@ -23,23 +23,23 @@ code-annotations==1.8.0 # via edx-lint colorama==0.4.6 # via tox -coverage==7.6.1 +coverage==7.6.4 # via -r requirements/test.in ddt==1.7.2 # via -r requirements/test.in -dill==0.3.8 +dill==0.3.9 # via pylint -distlib==0.3.8 +distlib==0.3.9 # via virtualenv -dnspython==2.6.1 +dnspython==2.7.0 # via - # -r requirements/base.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/base.txt # pymongo -edx-lint==5.3.7 +edx-lint==5.4.0 # via -r requirements/test.in -edx-opaque-keys==2.10.0 - # via -r requirements/base.txt -filelock==3.15.4 +edx-opaque-keys==2.11.0 + # via -r /home/runner/work/ccx-keys/ccx-keys/requirements/base.txt +filelock==3.16.1 # via # tox # virtualenv @@ -51,7 +51,7 @@ jinja2==3.1.4 # via code-annotations lazy-object-proxy==1.10.0 # via -r requirements/test.in -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 mccabe==0.7.0 # via pylint @@ -62,11 +62,11 @@ packaging==24.1 # pyproject-api # pytest # tox -pbr==6.0.0 +pbr==6.1.0 # via - # -r requirements/base.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/base.txt # stevedore -platformdirs==4.2.2 +platformdirs==4.3.6 # via # pylint # tox @@ -77,7 +77,7 @@ pluggy==1.5.0 # tox pycodestyle==2.12.1 # via -r requirements/test.in -pylint==3.2.6 +pylint==3.3.1 # via # edx-lint # pylint-celery @@ -85,19 +85,19 @@ pylint==3.2.6 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.5 +pylint-django==2.6.1 # via edx-lint pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pymongo==4.8.0 +pymongo==4.10.1 # via - # -r requirements/base.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/base.txt # edx-opaque-keys -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via tox -pytest==8.3.2 +pytest==8.3.3 # via -r requirements/test.in python-slugify==8.0.4 # via code-annotations @@ -105,22 +105,22 @@ pyyaml==6.0.2 # via code-annotations six==1.16.0 # via - # -r requirements/base.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/base.txt # edx-lint stevedore==5.3.0 # via - # -r requirements/base.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/base.txt # code-annotations # edx-opaque-keys text-unidecode==1.3 # via python-slugify tomlkit==0.13.2 # via pylint -tox==4.18.0 +tox==4.23.2 # via -r requirements/test.in typing-extensions==4.12.2 # via - # -r requirements/base.txt + # -r /home/runner/work/ccx-keys/ccx-keys/requirements/base.txt # edx-opaque-keys -virtualenv==20.26.3 +virtualenv==20.27.0 # via tox