Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Change Log

Unreleased

[1.32.0] - 2022-12-20
---------------------
* Added refresh_xblock_skills command to update skills for xblocks.

[1.31.2] - 2022-12-23
---------------------
* Added ACCESS_TOKEN_EXPIRY_THRESHOLD_IN_SECONDS in EMSI client.
Expand Down
4 changes: 3 additions & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ django-solo
pytz
edx-rest-api-client
edx-django-utils
edx-opaque-keys
celery
algoliasearch
django-ses
beautifulsoup4
django-choices
django-filter
openedx-events
# FIXME: remove pin once https://github.com/openedx/openedx-events/pull/143 is merged.
openedx-events @ git+https://github.com/open-craft/openedx-events.git@1934a839b6b04db1b02634cd74320045f2e6ed17
13 changes: 6 additions & 7 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# make upgrade
#
certifi==2022.9.24
certifi==2022.12.7
# via requests
charset-normalizer==2.1.1
# via requests
codecov==2.1.12
# via -r requirements/ci.in
coverage==6.5.0
coverage==7.0.1
# via codecov
distlib==0.3.6
# via virtualenv
Expand All @@ -20,24 +20,23 @@ filelock==3.8.2
# virtualenv
idna==3.4
# via requests
packaging==21.3
packaging==22.0
# via tox
platformdirs==2.5.4
platformdirs==2.6.0
# via virtualenv
pluggy==1.0.0
# via tox
py==1.11.0
# via tox
pyparsing==3.0.9
# via packaging
requests==2.28.1
# via codecov
six==1.16.0
# via tox
tomli==2.0.1
# via tox
tox==3.27.1
tox==3.28.0
# via
# -c requirements/constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
Expand Down
4 changes: 4 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ edx-lint<=1.5.2
# latest version causing issues in discovery.
algoliasearch-django<4.0.0
algoliasearch<2.0.0

# latest version i.e. 4.0.9 fails with dependency "hookimpl"
# https://github.com/tox-dev/tox/issues/2637
tox<4.0.0
40 changes: 17 additions & 23 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ amqp==2.6.1
# via
# -r requirements/test.txt
# kombu
asgiref==3.5.2
asgiref==3.6.0
# via
# -r requirements/test.txt
# django
astroid==2.3.3
# via
# pylint
# pylint-celery
attrs==22.1.0
attrs==22.2.0
# via
# -r requirements/test.txt
# openedx-events
Expand All @@ -31,11 +31,11 @@ billiard==3.6.4.0
# via
# -r requirements/test.txt
# celery
boto3==1.26.23
boto3==1.26.37
# via
# -r requirements/test.txt
# django-ses
botocore==1.29.23
botocore==1.29.37
# via
# -r requirements/test.txt
# boto3
Expand All @@ -48,7 +48,7 @@ celery==4.4.7
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
certifi==2022.9.24
certifi==2022.12.7
# via
# -r requirements/ci.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -79,15 +79,15 @@ code-annotations==1.3.0
# via -r requirements/test.txt
codecov==2.1.12
# via -r requirements/ci.txt
coverage[toml]==6.5.0
coverage[toml]==7.0.1
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# codecov
# pytest-cov
ddt==1.6.0
# via -r requirements/test.txt
diff-cover==7.2.0
diff-cover==7.3.0
# via -r requirements/dev.in
distlib==0.3.6
# via
Expand Down Expand Up @@ -117,7 +117,7 @@ django-filter==22.1
# via -r requirements/test.txt
django-model-utils==4.3.1
# via -r requirements/test.txt
django-ses==3.2.2
django-ses==3.3.0
# via -r requirements/test.txt
django-solo==2.0.0
# via -r requirements/test.txt
Expand All @@ -143,7 +143,7 @@ edx-opaque-keys[django]==2.3.0
# openedx-events
edx-rest-api-client==5.5.0
# via -r requirements/test.txt
exceptiongroup==1.0.4
exceptiongroup==1.1.0
# via
# -r requirements/test.txt
# pytest
Expand Down Expand Up @@ -199,14 +199,13 @@ mccabe==0.6.1
# via pylint
mock==4.0.3
# via -r requirements/test.txt
newrelic==8.4.0
newrelic==8.5.0
# via
# -r requirements/test.txt
# edx-django-utils
openedx-events @ git+https://github.com/open-craft/openedx-events.git@04b5014a6a97242cc20ac03b20a73470f56e253d
openedx-events @ git+https://github.com/open-craft/openedx-events.git@1934a839b6b04db1b02634cd74320045f2e6ed17
# via -r requirements/test.txt
# FIXME: replace with latest tag before merge.
packaging==21.3
packaging==22.0
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand All @@ -226,9 +225,9 @@ pep517==0.13.0
# via
# -r requirements/pip-tools.txt
# build
pip-tools==6.11.0
pip-tools==6.12.1
# via -r requirements/pip-tools.txt
platformdirs==2.5.4
platformdirs==2.6.0
# via
# -r requirements/ci.txt
# virtualenv
Expand Down Expand Up @@ -285,12 +284,6 @@ pynacl==1.5.0
# via
# -r requirements/test.txt
# edx-django-utils
pyparsing==3.0.9
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/test.txt
# packaging
pytest==7.2.0
# via
# -r requirements/test.txt
Expand All @@ -309,7 +302,7 @@ python-slugify==7.0.0
# via
# -r requirements/test.txt
# code-annotations
pytz==2022.6
pytz==2022.7
# via
# -r requirements/test.txt
# celery
Expand Down Expand Up @@ -385,8 +378,9 @@ tomli==2.0.1
# pep517
# pytest
# tox
tox==3.27.1
tox==3.28.0
# via
# -c requirements/constraints.txt
# -r requirements/ci.txt
# tox-battery
tox-battery==0.6.1
Expand Down
10 changes: 4 additions & 6 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
build==0.9.0
# via pip-tools
click==8.1.3
# via pip-tools
packaging==21.3
packaging==22.0
# via build
pep517==0.13.0
# via build
pip-tools==6.11.0
pip-tools==6.12.1
# via -r requirements/pip-tools.in
pyparsing==3.0.9
# via packaging
tomli==2.0.1
# via
# build
Expand Down
10 changes: 4 additions & 6 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
wheel==0.38.4
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==22.3.1
# via -r requirements/pip.in
setuptools==65.6.3
# via -r requirements/pip.in
wheel==0.38.4
# via -r requirements/pip.in
31 changes: 15 additions & 16 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ algoliasearch==1.20.0
# -r requirements/base.in
amqp==2.6.1
# via kombu
asgiref==3.5.2
asgiref==3.6.0
# via django
attrs==22.1.0
attrs==22.2.0
# via
# openedx-events
# pytest
beautifulsoup4==4.11.1
# via -r requirements/base.in
billiard==3.6.4.0
# via celery
boto3==1.26.23
boto3==1.26.37
# via django-ses
botocore==1.29.23
botocore==1.29.37
# via
# boto3
# s3transfer
celery==4.4.7
# via
# -c requirements/constraints.txt
# -r requirements/base.in
certifi==2022.9.24
certifi==2022.12.7
# via requests
cffi==1.15.1
# via pynacl
Expand All @@ -42,7 +42,7 @@ click==8.1.3
# edx-django-utils
code-annotations==1.3.0
# via -r requirements/test.in
coverage[toml]==6.5.0
coverage[toml]==7.0.1
# via pytest-cov
ddt==1.6.0
# via -r requirements/test.in
Expand All @@ -66,7 +66,7 @@ django-filter==22.1
# via -r requirements/base.in
django-model-utils==4.3.1
# via -r requirements/base.in
django-ses==3.2.2
django-ses==3.3.0
# via -r requirements/base.in
django-solo==2.0.0
# via -r requirements/base.in
Expand All @@ -79,10 +79,12 @@ edx-django-utils==5.2.0
# -r requirements/base.in
# edx-rest-api-client
edx-opaque-keys[django]==2.3.0
# via openedx-events
# via
# -r requirements/base.in
# openedx-events
edx-rest-api-client==5.5.0
# via -r requirements/base.in
exceptiongroup==1.0.4
exceptiongroup==1.1.0
# via pytest
factory-boy==3.2.1
# via -r requirements/test.in
Expand All @@ -108,12 +110,11 @@ markupsafe==2.1.1
# via jinja2
mock==4.0.3
# via -r requirements/test.in
newrelic==8.4.0
newrelic==8.5.0
# via edx-django-utils
openedx-events @ git+https://github.com/open-craft/openedx-events.git@04b5014a6a97242cc20ac03b20a73470f56e253d
openedx-events @ git+https://github.com/open-craft/openedx-events.git@1934a839b6b04db1b02634cd74320045f2e6ed17
# via -r requirements/base.in
# FIXME: replace with latest tag before merge.
packaging==21.3
packaging==22.0
# via pytest
pbr==5.11.0
# via stevedore
Expand All @@ -129,8 +130,6 @@ pymongo==3.13.0
# via edx-opaque-keys
pynacl==1.5.0
# via edx-django-utils
pyparsing==3.0.9
# via packaging
pytest==7.2.0
# via
# pytest-cov
Expand All @@ -145,7 +144,7 @@ python-dateutil==2.8.2
# faker
python-slugify==7.0.0
# via code-annotations
pytz==2022.6
pytz==2022.7
# via
# -r requirements/base.in
# celery
Expand Down
2 changes: 1 addition & 1 deletion taxonomy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
# 2. MINOR version when you add functionality in a backwards compatible manner, and
# 3. PATCH version when you make backwards compatible bug fixes.
# More details can be found at https://semver.org/
__version__ = '1.31.2'
__version__ = '1.32.0'

default_app_config = 'taxonomy.apps.TaxonomyConfig' # pylint: disable=invalid-name
6 changes: 6 additions & 0 deletions taxonomy/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ class ProgramMetadataNotFoundError(Exception):
"""


class XBlockMetadataNotFoundError(Exception):
"""
Exception to raise when metadata was not found for an XBlock.
"""


class InvalidCommandOptionsError(Exception):
"""
Exception to raise when incorrect command options are provided.
Expand Down
Loading