Merge 38dc438 into bd7d3ad

openedx · Mar 2, 2020 · 296004f · 296004f
2 parents bd7d3ad + 38dc438
commit 296004f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 
 cache: pip
 python:
-  - 2.7
   - 3.6
 env:
 - TOXENV=django111-drf37

diff --git a/requirements/base.in b/requirements/base.in
@@ -4,7 +4,6 @@ django
 django-model-utils
 django-simple-history
 djangorestframework>=3.2.0
-edx-django-oauth2-provider>=1.2.0
 edx-drf-extensions>=2.0.0
 edx-opaque-keys>=0.1.2
 Pillow
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -9,18 +9,17 @@ chardet==3.0.4            # via requests
 django-model-utils==3.2.0  # via -c requirements/constraints.txt, -r requirements/base.in
 django-simple-history==2.8.0  # via -r requirements/base.in
 django-waffle==0.20.0     # via edx-django-utils, edx-drf-extensions
-django==1.11.28           # via -r requirements/base.in, django-model-utils, edx-django-oauth2-provider, edx-django-utils, edx-drf-extensions, rest-condition
+django==1.11.28           # via -r requirements/base.in, django-model-utils, djangorestframework, edx-django-utils, edx-drf-extensions, rest-condition
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
-djangorestframework==3.9.4  # via -r requirements/base.in, edx-drf-extensions, rest-condition
-edx-django-oauth2-provider==1.3.5  # via -r requirements/base.in
+djangorestframework==3.11.0  # via -r requirements/base.in, edx-drf-extensions, rest-condition
 edx-django-utils==3.0     # via edx-drf-extensions
 edx-drf-extensions==3.0.0  # via -r requirements/base.in
 edx-opaque-keys==2.0.1    # via -r requirements/base.in, edx-drf-extensions
 future==0.18.2            # via pyjwkest
 idna==2.9                 # via requests
 newrelic==5.8.0.136       # via edx-django-utils
 pbr==5.4.4                # via stevedore
-pillow==6.2.2             # via -r requirements/base.in
+pillow==7.0.0             # via -r requirements/base.in
 psutil==1.2.1             # via edx-django-utils, edx-drf-extensions
 pycryptodomex==3.9.7      # via pyjwkest
 pyjwkest==1.3.2           # via edx-drf-extensions
@@ -31,7 +30,6 @@ pytz==2019.3              # via django
 requests==2.23.0          # via edx-drf-extensions, pyjwkest
 rest-condition==1.0.3     # via edx-drf-extensions
 semantic-version==2.8.4   # via edx-drf-extensions
-shortuuid==0.5.0          # via edx-django-oauth2-provider
 six==1.14.0               # via django-simple-history, django-waffle, edx-drf-extensions, edx-opaque-keys, pyjwkest, python-dateutil, stevedore
 stevedore==1.32.0         # via edx-opaque-keys
 urllib3==1.25.8           # via requests
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -6,13 +6,10 @@
 #
 appdirs==1.4.3            # via virtualenv
 astroid==1.5.3            # via edx-lint, pylint, pylint-celery
-backports.functools-lru-cache==1.6.1  # via astroid, isort, pylint
 certifi==2019.11.28       # via -r requirements/base.txt, requests
 chardet==3.0.4            # via -r requirements/base.txt, requests
 click-log==0.1.8          # via edx-lint
 click==7.0                # via click-log, edx-lint
-configparser==4.0.2       # via importlib-metadata, pylint
-contextlib2==0.6.0.post1  # via importlib-metadata, virtualenv, zipp
 coverage==4.5.4           # via -r requirements/test.in
 ddt==1.1.0                # via -r requirements/test.in
 distlib==0.3.0            # via virtualenv
@@ -21,32 +18,26 @@ django-nose==1.4.6        # via -r requirements/test.in
 django-simple-history==2.8.0  # via -r requirements/base.txt
 django-waffle==0.20.0     # via -r requirements/base.txt, edx-django-utils, edx-drf-extensions
 djangorestframework-jwt==1.11.0  # via -r requirements/base.txt, edx-drf-extensions
-edx-django-oauth2-provider==1.3.5  # via -r requirements/base.txt
 edx-django-utils==3.0     # via -r requirements/base.txt, edx-drf-extensions
 edx-drf-extensions==3.0.0  # via -r requirements/base.txt
 edx-lint==0.6.0           # via -r requirements/test.in
 edx-opaque-keys==2.0.1    # via -r requirements/base.txt, edx-drf-extensions
-enum34==1.1.9             # via astroid
 factory-boy==2.12.0       # via -r requirements/test.in
 faker==3.0.1              # via -c requirements/constraints.txt, factory-boy
 filelock==3.0.12          # via tox, virtualenv
 future==0.18.2            # via -r requirements/base.txt, pyjwkest
-futures==3.3.0 ; python_version == "2.7"  # via -c requirements/constraints.txt, isort
 httpretty==0.9.7          # via -r requirements/test.in
 idna==2.9                 # via -r requirements/base.txt, requests
 importlib-metadata==1.5.0  # via pluggy, tox, virtualenv
-importlib-resources==1.0.2  # via virtualenv
-ipaddress==1.0.23         # via faker
 isort==4.3.21             # via pylint
 lazy-object-proxy==1.4.3  # via astroid
 mccabe==0.6.1             # via pylint
 newrelic==5.8.0.136       # via -r requirements/base.txt, edx-django-utils
 nose==1.3.7               # via -r requirements/test.in, django-nose
 packaging==20.1           # via tox
-pathlib2==2.3.5           # via importlib-metadata, importlib-resources, virtualenv
 pbr==5.4.4                # via -r requirements/base.txt, stevedore
 pep8==1.7.1               # via -r requirements/test.in
-pillow==6.2.2             # via -r requirements/base.txt
+pillow==7.0.0             # via -r requirements/base.txt
 pluggy==0.13.1            # via tox
 psutil==1.2.1             # via -r requirements/base.txt, edx-django-utils, edx-drf-extensions
 py==1.8.1                 # via tox
@@ -63,17 +54,13 @@ python-dateutil==2.8.1    # via -r requirements/base.txt, edx-drf-extensions, fa
 pytz==2019.3              # via -r requirements/base.txt, django
 requests==2.23.0          # via -r requirements/base.txt, edx-drf-extensions, pyjwkest
 rest-condition==1.0.3     # via -r requirements/base.txt, edx-drf-extensions
-scandir==1.10.0           # via pathlib2
 semantic-version==2.8.4   # via -r requirements/base.txt, edx-drf-extensions
-shortuuid==0.5.0          # via -r requirements/base.txt, edx-django-oauth2-provider
-singledispatch==3.4.0.3   # via astroid, pylint
-six==1.14.0               # via -r requirements/base.txt, astroid, django-simple-history, django-waffle, edx-drf-extensions, edx-lint, edx-opaque-keys, faker, httpretty, packaging, pathlib2, pyjwkest, pylint, python-dateutil, singledispatch, stevedore, tox, virtualenv
+six==1.14.0               # via -r requirements/base.txt, astroid, django-simple-history, django-waffle, edx-drf-extensions, edx-lint, edx-opaque-keys, faker, httpretty, packaging, pyjwkest, pylint, python-dateutil, stevedore, tox, virtualenv
 stevedore==1.32.0         # via -r requirements/base.txt, edx-opaque-keys
 text-unidecode==1.3       # via faker
 toml==0.10.0              # via tox
 tox==3.14.5               # via -r requirements/test.in
-typing==3.7.4.1           # via importlib-resources
 urllib3==1.25.8           # via -r requirements/base.txt, requests
 virtualenv==20.0.7        # via tox
 wrapt==1.12.0             # via astroid
-zipp==1.2.0               # via importlib-metadata
+zipp==3.0.0               # via importlib-metadata
diff --git a/test_settings.py b/test_settings.py
@@ -21,7 +21,6 @@
     'django.contrib.messages',
     'organizations',
     'django_nose',
-    'provider.oauth2',
 )
 
 MIDDLEWARE_CLASSES = (

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,36}-django111-drf{37,38,39,latest}, py36-django{20,21}-drf{latest}, quality
+envlist = py36-django111-drf{37,38,39,latest}, py36-django{20,21}-drf{latest}, quality
 
 [testenv]
 setenv =