Merge pull request #58 from open-craft/cliff/bb-1060-use-latest-compl…

…etion

BB-1060 use latest completion

completion_aggregator/__init__.py

@@ -4,6 +4,6 @@
 
 from __future__ import absolute_import, unicode_literals
 
-__version__ = '1.5.22'
+__version__ = '1.5.23'
 
 default_app_config = 'completion_aggregator.apps.CompletionAggregatorAppConfig'  # pylint: disable=invalid-name

completion_aggregator/api/common.py

@@ -92,7 +92,11 @@ def authentication_classes(self):  # pragma: no cover
         Allow users authenticated via OAuth2 or normal session authentication.
         """
         from openedx.core.lib.api import authentication  # pylint: disable=import-error
-        from edx_rest_framework_extensions.authentication import JwtAuthentication  # pylint: disable=import-error
+        try:
+            from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication  # pylint: disable=import-error
+        except ImportError:
+            from edx_rest_framework_extensions.authentication import JwtAuthentication  # pylint: disable=import-error
+
         return [
             JwtAuthentication,
             authentication.OAuth2AuthenticationAllowInactiveUser,

requirements/base.in

@@ -7,7 +7,7 @@ django-oauth-toolkit<1.0
 djangorestframework>=3.0,<3.7     # API tools
 django-model-utils        # Provides TimeStampedModel abstract base class
 edx-opaque-keys>=0.4.2    # Provides CourseKey and UsageKey
-edx-completion<1.0
+edx-completion>=1.0.3,<2
 mysqlclient               # For connecting to MySQL
 six
 XBlock

requirements/dev.txt

@@ -11,90 +11,91 @@ argparse==1.4.0           # via caniusepython3
 astroid==1.5.3            # via edx-lint, pylint, pylint-celery
 backports.functools-lru-cache==1.5  # via caniusepython3
 billiard==3.3.0.23        # via celery
-bleach==3.0.2             # via readme-renderer
+bleach==3.1.0             # via readme-renderer
 caniusepython3==7.0.0
 celery==3.1.18
-certifi==2018.10.15       # via requests
+certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
 click-log==0.1.8          # via edx-lint
 click==7.0                # via click-log, edx-lint, pip-tools
-diff-cover==1.0.5
+diff-cover==1.0.6
 distlib==0.2.8            # via caniusepython3
 django-braces==1.13.0     # via django-oauth-toolkit
 django-model-utils==3.1.2
 django-oauth-toolkit==0.12.0
-django-waffle==0.15.0     # via edx-django-utils, edx-drf-extensions
+django-waffle==0.15.1     # via edx-django-utils, edx-drf-extensions
 django==1.10.8
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
 djangorestframework==3.6.4
 docutils==0.14            # via readme-renderer
 edx-celeryutils==0.1.5
-edx-completion==0.1.14
-edx-django-utils==1.0.1   # via edx-drf-extensions
-edx-drf-extensions==1.11.0  # via edx-completion
+edx-completion==1.0.3
+edx-django-utils==1.0.3   # via edx-drf-extensions
+edx-drf-extensions==2.0.1  # via edx-completion
 edx-i18n-tools==0.4.8
-edx-lint==0.6.0
+edx-lint==1.1.1
 edx-opaque-keys[django]==0.4.4
 filelock==3.0.10          # via tox
-fs==2.1.2                 # via xblock
+fs==2.4.4                 # via xblock
 future==0.17.1            # via pyjwkest
-idna==2.7                 # via requests
-importlib-metadata==0.6   # via path.py
+idna==2.8                 # via requests
+importlib-metadata==0.8   # via path.py
 inflect==2.1.0            # via jinja2-pluralize
-isort==4.3.4
+isort==4.3.15
 jinja2-pluralize==0.3.0   # via diff-cover
 jinja2==2.10              # via diff-cover, jinja2-pluralize
 jsonfield==2.0.2          # via edx-celeryutils
 kombu==3.0.37             # via celery
 lazy-object-proxy==1.3.1  # via astroid
-lxml==4.2.5               # via xblock
-markupsafe==1.1.0         # via jinja2, xblock
+lxml==4.3.2               # via xblock
+markupsafe==1.1.1         # via jinja2, xblock
 mccabe==0.6.1             # via pylint
-mysqlclient==1.3.13
-newrelic==4.6.0.106       # via edx-django-utils
+mysqlclient==1.4.2.post1
+newrelic==4.14.0.115      # via edx-django-utils
 oauthlib==2.0.1           # via django-oauth-toolkit
-packaging==18.0           # via caniusepython3
+packaging==19.0           # via caniusepython3
 path.py==11.5.0           # via edx-i18n-tools
-pbr==5.1.1                # via stevedore
-pip-tools==3.1.0
-pkginfo==1.4.2            # via twine
-pluggy==0.8.0             # via tox
+pbr==5.1.3                # via stevedore
+pip-tools==3.5.0
+pkginfo==1.5.0.1          # via twine
+pluggy==0.9.0             # via tox
 polib==1.1.0              # via edx-i18n-tools
 psutil==1.2.1             # via edx-django-utils, edx-drf-extensions
-py==1.7.0                 # via tox
-pycodestyle==2.4.0
-pycryptodomex==3.7.0      # via pyjwkest
+py==1.8.0                 # via tox
+pycodestyle==2.5.0
+pycryptodomex==3.7.3      # via pyjwkest
 pydocstyle==3.0.0
-pygments==2.2.0           # via diff-cover, readme-renderer
+pygments==2.3.1           # via diff-cover, readme-renderer
 pyjwkest==1.3.2           # via edx-drf-extensions
-pyjwt==1.6.4              # via djangorestframework-jwt
+pyjwt==1.7.1              # via djangorestframework-jwt
 pylint-celery==0.3        # via edx-lint
 pylint-django==0.7.2      # via edx-lint
-pylint-plugin-utils==0.4  # via pylint-celery, pylint-django
+pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
 pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
 pymongo==3.7.2            # via edx-opaque-keys
-pyparsing==2.3.0          # via packaging
-python-dateutil==2.7.5    # via edx-drf-extensions, xblock
-pytz==2018.7              # via celery, edx-completion, fs, xblock
-pyyaml==3.13              # via edx-i18n-tools, xblock
+pyparsing==2.3.1          # via packaging
+python-dateutil==2.8.0    # via edx-drf-extensions, xblock
+pytz==2018.9              # via celery, edx-completion, fs, xblock
+pyyaml==5.1               # via edx-i18n-tools, xblock
 readme-renderer==24.0     # via twine
-requests-toolbelt==0.8.0  # via twine
-requests==2.20.1          # via caniusepython3, edx-drf-extensions, pyjwkest, requests-toolbelt, twine
+requests-toolbelt==0.9.1  # via twine
+requests==2.21.0          # via caniusepython3, edx-drf-extensions, pyjwkest, requests-toolbelt, twine
 rest-condition==1.0.3     # via edx-drf-extensions
 semantic-version==2.6.0   # via edx-drf-extensions
-six==1.11.0
+six==1.12.0
 snowballstemmer==1.2.1    # via pydocstyle
-stevedore==1.30.0         # via edx-opaque-keys
+stevedore==1.30.1         # via edx-opaque-keys
 toml==0.10.0              # via tox
 tox-battery==0.2
-tox==3.5.3
-tqdm==4.28.1              # via twine
-twine==1.12.1
+tox==3.7.0
+tqdm==4.31.1              # via twine
+twine==1.13.0
 urllib3==1.24.1           # via requests
-virtualenv==16.1.0        # via tox
-web-fragments==0.2.2      # via xblock
+virtualenv==16.4.3        # via tox
+web-fragments==0.3.0      # via xblock
 webencodings==0.5.1       # via bleach
-webob==1.8.4              # via xblock
-wheel==0.32.3
-wrapt==1.10.11            # via astroid
+webob==1.8.5              # via xblock
+wheel==0.33.1
+wrapt==1.11.1             # via astroid
 xblock==1.2.2
+zipp==0.3.3               # via importlib-metadata

requirements/doc.txt

@@ -10,61 +10,61 @@ anyjson==0.3.3            # via kombu
 appdirs==1.4.3            # via fs
 babel==2.6.0              # via sphinx
 billiard==3.3.0.23        # via celery
-bleach==3.0.2             # via readme-renderer
+bleach==3.1.0             # via readme-renderer
 celery==3.1.18
-certifi==2018.10.15       # via requests
+certifi==2019.3.9         # via requests
 chardet==3.0.4            # via doc8, requests
 django-braces==1.13.0     # via django-oauth-toolkit
 django-model-utils==3.1.2
 django-oauth-toolkit==0.12.0
-django-waffle==0.15.0     # via edx-django-utils, edx-drf-extensions
+django-waffle==0.15.1     # via edx-django-utils, edx-drf-extensions
 django==1.10.8
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
 djangorestframework==3.6.4
 doc8==0.8.0
 docutils==0.14            # via doc8, readme-renderer, restructuredtext-lint, sphinx
 edx-celeryutils==0.1.5
-edx-completion==0.1.14
-edx-django-utils==1.0.1   # via edx-drf-extensions
-edx-drf-extensions==1.11.0  # via edx-completion
+edx-completion==1.0.3
+edx-django-utils==1.0.3   # via edx-drf-extensions
+edx-drf-extensions==2.0.1  # via edx-completion
 edx-opaque-keys[django]==0.4.4
-edx-sphinx-theme==1.3.0
-fs==2.1.2                 # via xblock
+edx-sphinx-theme==1.4.0
+fs==2.4.4                 # via xblock
 future==0.17.1            # via pyjwkest
-idna==2.7                 # via requests
+idna==2.8                 # via requests
 imagesize==1.1.0          # via sphinx
 jinja2==2.10              # via sphinx
 jsonfield==2.0.2          # via edx-celeryutils
 kombu==3.0.37             # via celery
-lxml==4.2.5               # via xblock
-markupsafe==1.1.0         # via jinja2, xblock
-mysqlclient==1.3.13
-newrelic==4.6.0.106       # via edx-django-utils
+lxml==4.3.2               # via xblock
+markupsafe==1.1.1         # via jinja2, xblock
+mysqlclient==1.4.2.post1
+newrelic==4.14.0.115      # via edx-django-utils
 oauthlib==2.0.1           # via django-oauth-toolkit
-packaging==18.0           # via sphinx
-pbr==5.1.1                # via stevedore
+packaging==19.0           # via sphinx
+pbr==5.1.3                # via stevedore
 psutil==1.2.1             # via edx-django-utils, edx-drf-extensions
-pycryptodomex==3.7.0      # via pyjwkest
-pygments==2.2.0           # via readme-renderer, sphinx
+pycryptodomex==3.7.3      # via pyjwkest
+pygments==2.3.1           # via readme-renderer, sphinx
 pyjwkest==1.3.2           # via edx-drf-extensions
-pyjwt==1.6.4              # via djangorestframework-jwt
+pyjwt==1.7.1              # via djangorestframework-jwt
 pymongo==3.7.2            # via edx-opaque-keys
-pyparsing==2.3.0          # via packaging
-python-dateutil==2.7.5    # via edx-drf-extensions, xblock
-pytz==2018.7              # via babel, celery, edx-completion, fs, xblock
-pyyaml==3.13              # via xblock
+pyparsing==2.3.1          # via packaging
+python-dateutil==2.8.0    # via edx-drf-extensions, xblock
+pytz==2018.9              # via babel, celery, edx-completion, fs, xblock
+pyyaml==5.1               # via xblock
 readme-renderer==24.0
-requests==2.20.1          # via edx-drf-extensions, pyjwkest, sphinx
+requests==2.21.0          # via edx-drf-extensions, pyjwkest, sphinx
 rest-condition==1.0.3     # via edx-drf-extensions
-restructuredtext-lint==1.2.1  # via doc8
+restructuredtext-lint==1.2.2  # via doc8
 semantic-version==2.6.0   # via edx-drf-extensions
-six==1.11.0
+six==1.12.0
 snowballstemmer==1.2.1    # via sphinx
-sphinx==1.8.2
+sphinx==1.8.5
 sphinxcontrib-websupport==1.1.0  # via sphinx
-stevedore==1.30.0         # via doc8, edx-opaque-keys
+stevedore==1.30.1         # via doc8, edx-opaque-keys
 urllib3==1.24.1           # via requests
-web-fragments==0.2.2      # via xblock
+web-fragments==0.3.0      # via xblock
 webencodings==0.5.1       # via bleach
-webob==1.8.4              # via xblock
+webob==1.8.5              # via xblock
 xblock==1.2.2

requirements/quality.txt

@@ -8,26 +8,26 @@ argparse==1.4.0           # via caniusepython3
 astroid==1.5.3            # via edx-lint, pylint, pylint-celery
 backports.functools-lru-cache==1.5  # via caniusepython3
 caniusepython3==7.0.0
-certifi==2018.10.15       # via requests
+certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
 click-log==0.1.8          # via edx-lint
 click==7.0                # via click-log, edx-lint
 distlib==0.2.8            # via caniusepython3
-edx-lint==0.6.0
-idna==2.7                 # via requests
-isort==4.3.4
+edx-lint==1.1.1
+idna==2.8                 # via requests
+isort==4.3.15
 lazy-object-proxy==1.3.1  # via astroid
 mccabe==0.6.1             # via pylint
-packaging==18.0           # via caniusepython3
-pycodestyle==2.4.0
+packaging==19.0           # via caniusepython3
+pycodestyle==2.5.0
 pydocstyle==3.0.0
 pylint-celery==0.3        # via edx-lint
 pylint-django==0.7.2      # via edx-lint
-pylint-plugin-utils==0.4  # via pylint-celery, pylint-django
+pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
 pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pyparsing==2.3.0          # via packaging
-requests==2.20.1          # via caniusepython3
-six==1.11.0               # via astroid, edx-lint, packaging, pydocstyle, pylint
+pyparsing==2.3.1          # via packaging
+requests==2.21.0          # via caniusepython3
+six==1.12.0               # via astroid, edx-lint, packaging, pydocstyle, pylint
 snowballstemmer==1.2.1    # via pydocstyle
 urllib3==1.24.1           # via requests
-wrapt==1.10.11            # via astroid
+wrapt==1.11.1             # via astroid

requirements/test.in

@@ -7,3 +7,4 @@ pytest
 pytest-cov                # pytest extension for code coverage statistics
 pytest-django             # pytest extension for better Django support
 redis
+more-itertools < 6.0.0

requirements/test.txt

@@ -7,58 +7,58 @@
 amqp==1.4.9               # via kombu
 anyjson==0.3.3            # via kombu
 appdirs==1.4.3            # via fs
-atomicwrites==1.2.1       # via pytest
-attrs==18.2.0             # via pytest
+atomicwrites==1.3.0       # via pytest
+attrs==19.1.0             # via pytest
 billiard==3.3.0.23        # via celery
 celery==3.1.18
-certifi==2018.10.15       # via requests
+certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
-coverage==4.5.2           # via pytest-cov
-ddt==1.2.0
+coverage==4.5.3           # via pytest-cov
+ddt==1.2.1
 django-braces==1.13.0     # via django-oauth-toolkit
 django-model-utils==3.1.2
 django-oauth-toolkit==0.12.0
-django-waffle==0.15.0     # via edx-django-utils, edx-drf-extensions
+django-waffle==0.15.1     # via edx-django-utils, edx-drf-extensions
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
 djangorestframework==3.6.4
 edx-celeryutils==0.1.5
-edx-completion==0.1.14
-edx-django-utils==1.0.1   # via edx-drf-extensions
-edx-drf-extensions==1.11.0  # via edx-completion
+edx-completion==1.0.3
+edx-django-utils==1.0.3   # via edx-drf-extensions
+edx-drf-extensions==2.0.1  # via edx-completion
 edx-opaque-keys[django]==0.4.4
-fs==2.1.2                 # via xblock
+fs==2.4.4                 # via xblock
 future==0.17.1            # via pyjwkest
-idna==2.7                 # via requests
+idna==2.8                 # via requests
 jsonfield==2.0.2          # via edx-celeryutils
 kombu==3.0.37             # via celery
-lxml==4.2.5               # via xblock
-markupsafe==1.1.0         # via xblock
+lxml==4.3.2               # via xblock
+markupsafe==1.1.1         # via xblock
 mock==2.0.0
-more-itertools==4.3.0     # via pytest
-mysqlclient==1.3.13
-newrelic==4.6.0.106       # via edx-django-utils
+more-itertools==5.0.0
+mysqlclient==1.4.2.post1
+newrelic==4.14.0.115      # via edx-django-utils
 oauthlib==2.0.1           # via django-oauth-toolkit
-pbr==5.1.1                # via mock, stevedore
-pluggy==0.8.0             # via pytest
+pbr==5.1.3                # via mock, stevedore
+pluggy==0.9.0             # via pytest
 psutil==1.2.1             # via edx-django-utils, edx-drf-extensions
-py==1.7.0                 # via pytest
-pycryptodomex==3.7.0      # via pyjwkest
+py==1.8.0                 # via pytest
+pycryptodomex==3.7.3      # via pyjwkest
 pyjwkest==1.3.2           # via edx-drf-extensions
-pyjwt==1.6.4              # via djangorestframework-jwt
+pyjwt==1.7.1              # via djangorestframework-jwt
 pymongo==3.7.2            # via edx-opaque-keys
-pytest-cov==2.6.0
-pytest-django==3.4.4
-pytest==4.0.0
-python-dateutil==2.7.5    # via edx-drf-extensions, xblock
-pytz==2018.7              # via celery, edx-completion, fs, xblock
-pyyaml==3.13              # via xblock
-redis==3.0.1
-requests==2.20.1          # via edx-drf-extensions, pyjwkest
+pytest-cov==2.6.1
+pytest-django==3.4.8
+pytest==4.3.1
+python-dateutil==2.8.0    # via edx-drf-extensions, xblock
+pytz==2018.9              # via celery, edx-completion, fs, xblock
+pyyaml==5.1               # via xblock
+redis==3.2.0
+requests==2.21.0          # via edx-drf-extensions, pyjwkest
 rest-condition==1.0.3     # via edx-drf-extensions
 semantic-version==2.6.0   # via edx-drf-extensions
-six==1.11.0
-stevedore==1.30.0         # via edx-opaque-keys
+six==1.12.0
+stevedore==1.30.1         # via edx-opaque-keys
 urllib3==1.24.1           # via requests
-web-fragments==0.2.2      # via xblock
-webob==1.8.4              # via xblock
+web-fragments==0.3.0      # via xblock
+webob==1.8.5              # via xblock
 xblock==1.2.2