diff --git a/edx_proctoring/__init__.py b/edx_proctoring/__init__.py index 4147b5e6516..2cd023286e2 100644 --- a/edx_proctoring/__init__.py +++ b/edx_proctoring/__init__.py @@ -5,6 +5,6 @@ from __future__ import absolute_import # Be sure to update the version number in edx_proctoring/package.json -__version__ = '1.5.9' +__version__ = '1.5.10' default_app_config = 'edx_proctoring.apps.EdxProctoringConfig' # pylint: disable=invalid-name diff --git a/edx_proctoring/tests/__init__.py b/edx_proctoring/tests/__init__.py index 2084a2c6876..0593fde652f 100644 --- a/edx_proctoring/tests/__init__.py +++ b/edx_proctoring/tests/__init__.py @@ -23,9 +23,15 @@ def setup_test_backends(): def setup_test_perms(): """ Create missing permissions that would be defined in edx-platform, - or elsewhere + or elsewhere. + + edx-platform imports tests from edx-proctoring, which causes duplicate + rules, so ignore the KeyError thrown by the rules package. """ - rules.add_perm('accounts.can_retire_user', rules.is_staff) + try: + rules.add_perm('accounts.can_retire_user', rules.is_staff) + except KeyError: + pass setup_test_backends() diff --git a/package.json b/package.json index 05e8572a63c..bf284dc50b9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@edx/edx-proctoring", "//": "Be sure to update the version number in edx_proctoring/__init__.py", "//": "Note that the version format is slightly different than that of the Python version when using prereleases.", - "version": "1.5.9", + "version": "1.5.10", "main": "edx_proctoring/static/index.js", "repository": { "type": "git",