diff --git a/requirements/base.txt b/requirements/base.txt index 0f113f8..93bd4f5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,9 +10,9 @@ asgiref==3.8.1 # via django attrs==24.2.0 # via openedx-events -boto3==1.35.41 +boto3==1.35.58 # via fs-s3fs -botocore==1.35.41 +botocore==1.35.58 # via # boto3 # s3transfer @@ -41,7 +41,7 @@ dnspython==2.7.0 # via pymongo edx-ccx-keys==1.3.0 # via openedx-events -edx-django-utils==6.1.0 +edx-django-utils==7.0.0 # via openedx-events edx-opaque-keys[django]==2.11.0 # via @@ -71,7 +71,7 @@ openedx-filters==1.11.0 # via -r requirements/base.in pbr==6.1.0 # via stevedore -psutil==6.0.0 +psutil==6.1.0 # via edx-django-utils pycparser==2.22 # via cffi diff --git a/requirements/ci.txt b/requirements/ci.txt index cd948f5..dfbb2bf 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,7 +10,7 @@ filelock==3.16.1 # via # tox # virtualenv -packaging==24.1 +packaging==24.2 # via # pyproject-api # tox @@ -30,5 +30,5 @@ tox==3.28.0 # tox-battery tox-battery==0.6.2 # via -r requirements/ci.in -virtualenv==20.26.6 +virtualenv==20.27.1 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 3ac82b2..d4f62be 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -29,11 +29,11 @@ binaryornot==0.4.4 # via # -r requirements/quality.txt # cookiecutter -boto3==1.35.41 +boto3==1.35.58 # via # -r requirements/quality.txt # fs-s3fs -botocore==1.35.41 +botocore==1.35.58 # via # -r requirements/quality.txt # boto3 @@ -81,7 +81,7 @@ cookiecutter==2.6.0 # via # -r requirements/quality.txt # xblock-sdk -coverage[toml]==7.6.3 +coverage[toml]==7.6.4 # via # -r requirements/quality.txt # pytest-cov @@ -129,13 +129,13 @@ edx-ccx-keys==1.3.0 # via # -r requirements/quality.txt # openedx-events -edx-django-utils==6.1.0 +edx-django-utils==7.0.0 # via # -r requirements/quality.txt # openedx-events edx-i18n-tools==1.6.3 # via -r requirements/dev.in -edx-lint==5.4.0 +edx-lint==5.4.1 # via -r requirements/quality.txt edx-opaque-keys[django]==2.11.0 # via @@ -196,7 +196,7 @@ lxml[html-clean]==5.3.0 # xblock-sdk lxml-html-clean==0.3.1 # via lxml -mako==1.3.5 +mako==1.3.6 # via # -r requirements/quality.txt # xblock @@ -204,7 +204,7 @@ markdown-it-py==3.0.0 # via # -r requirements/quality.txt # rich -markupsafe==3.0.1 +markupsafe==3.0.2 # via # -r requirements/quality.txt # jinja2 @@ -230,7 +230,7 @@ openedx-events==9.15.0 # via -r requirements/quality.txt openedx-filters==1.11.0 # via -r requirements/quality.txt -packaging==24.1 +packaging==24.2 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -261,7 +261,7 @@ pluggy==1.5.0 # tox polib==1.2.0 # via edx-i18n-tools -psutil==6.0.0 +psutil==6.1.0 # via # -r requirements/quality.txt # edx-django-utils @@ -324,7 +324,7 @@ pytest==8.3.3 # -r requirements/quality.txt # pytest-cov # pytest-django -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/quality.txt pytest-django==4.9.0 # via -r requirements/quality.txt @@ -355,7 +355,7 @@ requests==2.32.3 # -r requirements/quality.txt # cookiecutter # xblock-sdk -rich==13.9.2 +rich==13.9.4 # via # -r requirements/quality.txt # cookiecutter @@ -419,7 +419,7 @@ urllib3==2.2.3 # -r requirements/quality.txt # botocore # requests -virtualenv==20.26.6 +virtualenv==20.27.1 # via # -r requirements/ci.txt # tox @@ -428,12 +428,12 @@ web-fragments==2.2.0 # -r requirements/quality.txt # xblock # xblock-sdk -webob==1.8.8 +webob==1.8.9 # via # -r requirements/quality.txt # xblock # xblock-sdk -wheel==0.44.0 +wheel==0.45.0 # via # -r requirements/pip-tools.txt # pip-tools diff --git a/requirements/doc.txt b/requirements/doc.txt index 597ccb2..6e5e9fd 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -30,11 +30,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.35.41 +boto3==1.35.58 # via # -r requirements/test.txt # fs-s3fs -botocore==1.35.41 +botocore==1.35.58 # via # -r requirements/test.txt # boto3 @@ -69,7 +69,7 @@ cookiecutter==2.6.0 # via # -r requirements/test.txt # xblock-sdk -coverage[toml]==7.6.3 +coverage[toml]==7.6.4 # via # -r requirements/test.txt # pytest-cov @@ -114,7 +114,7 @@ edx-ccx-keys==1.3.0 # via # -r requirements/test.txt # openedx-events -edx-django-utils==6.1.0 +edx-django-utils==7.0.0 # via # -r requirements/test.txt # openedx-events @@ -169,7 +169,7 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -keyring==25.4.1 +keyring==25.5.0 # via twine lazy==1.6 # via -r requirements/test.txt @@ -178,7 +178,7 @@ lxml==5.3.0 # -r requirements/test.txt # xblock # xblock-sdk -mako==1.3.5 +mako==1.3.6 # via # -r requirements/test.txt # xblock @@ -186,7 +186,7 @@ markdown-it-py==3.0.0 # via # -r requirements/test.txt # rich -markupsafe==3.0.1 +markupsafe==3.0.2 # via # -r requirements/test.txt # jinja2 @@ -214,7 +214,7 @@ openedx-events==9.15.0 # via -r requirements/test.txt openedx-filters==1.11.0 # via -r requirements/test.txt -packaging==24.1 +packaging==24.2 # via # -r requirements/test.txt # build @@ -230,7 +230,7 @@ pluggy==1.5.0 # via # -r requirements/test.txt # pytest -psutil==6.0.0 +psutil==6.1.0 # via # -r requirements/test.txt # edx-django-utils @@ -264,7 +264,7 @@ pytest==8.3.3 # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/test.txt pytest-django==4.9.0 # via -r requirements/test.txt @@ -305,7 +305,7 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.9.2 +rich==13.9.4 # via # -r requirements/test.txt # cookiecutter @@ -378,7 +378,7 @@ web-fragments==2.2.0 # -r requirements/test.txt # xblock # xblock-sdk -webob==1.8.8 +webob==1.8.9 # via # -r requirements/test.txt # xblock @@ -389,7 +389,7 @@ xblock==5.1.0 # xblock-sdk xblock-sdk==0.12.0 # via -r requirements/test.txt -zipp==3.20.2 +zipp==3.21.0 # via importlib-metadata # 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 db6c463..dc539c5 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,7 +8,7 @@ build==1.2.2.post1 # via pip-tools click==8.1.7 # via pip-tools -packaging==24.1 +packaging==24.2 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in @@ -16,7 +16,7 @@ pyproject-hooks==1.2.0 # via # build # pip-tools -wheel==0.44.0 +wheel==0.45.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 36c777e..edbda4b 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,13 @@ # # make upgrade # -wheel==0.44.0 +wheel==0.45.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.2 - # via -r requirements/pip.in -setuptools==75.1.0 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/pip.in +setuptools==75.4.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 2076f54..e427577 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -28,11 +28,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.35.41 +boto3==1.35.58 # via # -r requirements/test.txt # fs-s3fs -botocore==1.35.41 +botocore==1.35.58 # via # -r requirements/test.txt # boto3 @@ -71,7 +71,7 @@ cookiecutter==2.6.0 # via # -r requirements/test.txt # xblock-sdk -coverage[toml]==7.6.3 +coverage[toml]==7.6.4 # via # -r requirements/test.txt # pytest-cov @@ -110,11 +110,11 @@ edx-ccx-keys==1.3.0 # via # -r requirements/test.txt # openedx-events -edx-django-utils==6.1.0 +edx-django-utils==7.0.0 # via # -r requirements/test.txt # openedx-events -edx-lint==5.4.0 +edx-lint==5.4.1 # via -r requirements/quality.in edx-opaque-keys[django]==2.11.0 # via @@ -165,7 +165,7 @@ lxml==5.3.0 # -r requirements/test.txt # xblock # xblock-sdk -mako==1.3.5 +mako==1.3.6 # via # -r requirements/test.txt # xblock @@ -173,7 +173,7 @@ markdown-it-py==3.0.0 # via # -r requirements/test.txt # rich -markupsafe==3.0.1 +markupsafe==3.0.2 # via # -r requirements/test.txt # jinja2 @@ -197,7 +197,7 @@ openedx-events==9.15.0 # via -r requirements/test.txt openedx-filters==1.11.0 # via -r requirements/test.txt -packaging==24.1 +packaging==24.2 # via # -r requirements/test.txt # pytest @@ -211,7 +211,7 @@ pluggy==1.5.0 # via # -r requirements/test.txt # pytest -psutil==6.0.0 +psutil==6.1.0 # via # -r requirements/test.txt # edx-django-utils @@ -258,7 +258,7 @@ pytest==8.3.3 # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/test.txt pytest-django==4.9.0 # via -r requirements/test.txt @@ -288,7 +288,7 @@ requests==2.32.3 # -r requirements/test.txt # cookiecutter # xblock-sdk -rich==13.9.2 +rich==13.9.4 # via # -r requirements/test.txt # cookiecutter @@ -345,7 +345,7 @@ web-fragments==2.2.0 # -r requirements/test.txt # xblock # xblock-sdk -webob==1.8.8 +webob==1.8.9 # via # -r requirements/test.txt # xblock diff --git a/requirements/test.txt b/requirements/test.txt index f2b3a5f..7447fa0 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -20,11 +20,11 @@ attrs==24.2.0 # openedx-events binaryornot==0.4.4 # via cookiecutter -boto3==1.35.41 +boto3==1.35.58 # via # -r requirements/base.txt # fs-s3fs -botocore==1.35.41 +botocore==1.35.58 # via # -r requirements/base.txt # boto3 @@ -49,7 +49,7 @@ code-annotations==1.8.0 # via -r requirements/test.in cookiecutter==2.6.0 # via xblock-sdk -coverage[toml]==7.6.3 +coverage[toml]==7.6.4 # via pytest-cov # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt @@ -83,7 +83,7 @@ edx-ccx-keys==1.3.0 # via # -r requirements/base.txt # openedx-events -edx-django-utils==6.1.0 +edx-django-utils==7.0.0 # via # -r requirements/base.txt # openedx-events @@ -126,11 +126,11 @@ lxml==5.3.0 # via # xblock # xblock-sdk -mako==1.3.5 +mako==1.3.6 # via xblock markdown-it-py==3.0.0 # via rich -markupsafe==3.0.1 +markupsafe==3.0.2 # via # jinja2 # mako @@ -149,7 +149,7 @@ openedx-events==9.15.0 # via -r requirements/base.txt openedx-filters==1.11.0 # via -r requirements/base.txt -packaging==24.1 +packaging==24.2 # via pytest pbr==6.1.0 # via @@ -157,7 +157,7 @@ pbr==6.1.0 # stevedore pluggy==1.5.0 # via pytest -psutil==6.0.0 +psutil==6.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -181,7 +181,7 @@ pytest==8.3.3 # via # pytest-cov # pytest-django -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/test.in pytest-django==4.9.0 # via -r requirements/test.in @@ -206,7 +206,7 @@ requests==2.32.3 # via # cookiecutter # xblock-sdk -rich==13.9.2 +rich==13.9.4 # via cookiecutter s3transfer==0.10.3 # via @@ -250,7 +250,7 @@ web-fragments==2.2.0 # via # xblock # xblock-sdk -webob==1.8.8 +webob==1.8.9 # via # xblock # xblock-sdk diff --git a/skill_tagging/pipeline.py b/skill_tagging/pipeline.py index 6f4f756..b505eb4 100644 --- a/skill_tagging/pipeline.py +++ b/skill_tagging/pipeline.py @@ -3,8 +3,8 @@ """ import logging import random +from importlib.resources import files -import pkg_resources from django.conf import settings from django.template import Context, Template from openedx_filters import PipelineStep @@ -20,8 +20,7 @@ def resource_string(path): """Handy helper for getting resources from our kit.""" - data = pkg_resources.resource_string(__name__, path) - return data.decode("utf8") + return files(__package__).joinpath(path).read_text(encoding="utf-8") class VerificationPipelineBase: