make upgrade

ucsd-ets · Jun 21, 2019 · e0c4205 · e0c4205
1 parent 2e9cae4
commit e0c4205
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -43,8 +43,8 @@ certifi==2019.6.16
 cffi==1.12.3
 chardet==3.0.4
 click==7.0                # via user-util
-coreapi==2.3.3            # via django-rest-swagger, openapi-codec
-coreschema==0.0.4         # via coreapi
+coreapi==2.3.3            # via drf-yasg
+coreschema==0.0.4         # via coreapi, drf-yasg
 git+https://github.com/edx/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1
 cryptography==2.7
 cssutils==1.0.2           # via pynliner
@@ -77,7 +77,6 @@ django-pyfs==2.0
 django-ratelimit-backend==1.1.1
 django-ratelimit==2.0.0
 django-require==1.0.11
-django-rest-swagger==2.2.0
 django-sekizai==1.0.0
 django-ses==0.8.4
 django-simple-history==2.7.0
@@ -91,9 +90,10 @@ django==1.11.21
 djangorestframework-jwt==1.11.0
 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
 djangorestframework-xml==1.3.0  # via edx-enterprise
-git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc86856441bbf0bd9cb#egg=djangorestframework==3.6.3
+djangorestframework==3.7.7
 docopt==0.6.2
 docutils==0.14            # via botocore
+drf-yasg==1.16.0
 edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
 git+https://github.com/edx/edx-bulk-grades@f58f9fa01d95c01211fc94ebb92f0fb1a04bf32b#egg=edx-bulk-grades==0.1.1
@@ -137,6 +137,7 @@ help-tokens==1.0.4
 html5lib==1.0.1
 httplib2==0.13.0          # via oauth2, zendesk
 idna==2.8
+inflection==0.3.1         # via drf-yasg
 ipaddress==1.0.22
 isodate==0.6.0            # via python3-saml
 itypes==1.1.0             # via coreapi
@@ -169,7 +170,6 @@ nodeenv==1.1.1
 numpy==1.16.4
 oauth2==1.9.0.post1
 oauthlib==2.1.0
-openapi-codec==1.3.2      # via django-rest-swagger
 git+https://github.com/edx/edx-ora2.git@2.2.3#egg=ora2==2.2.3
 path.py==8.2.1
 pathtools==0.1.2
@@ -211,14 +211,16 @@ requests-oauthlib==1.1.0
 requests==2.22.0
 rest-condition==1.0.3
 rfc6266-parser==0.0.5.post2
+ruamel.ordereddict==0.4.13  # via ruamel.yaml
+ruamel.yaml==0.15.97      # via drf-yasg
 rules==2.0.1
 s3transfer==0.1.13        # via boto3
 sailthru-client==2.2.3
 scipy==1.2.1
 semantic-version==2.6.0   # via edx-drf-extensions
 shapely==1.6.4.post2
 shortuuid==0.5.0          # via edx-django-oauth2-provider
-simplejson==3.16.0        # via django-rest-swagger, mailsnake, sailthru-client, zendesk
+simplejson==3.16.0        # via mailsnake, sailthru-client, zendesk
 singledispatch==3.4.0.3
 six==1.11.0
 slumber==0.7.1            # via edx-rest-api-client
@@ -234,7 +236,7 @@ git+https://github.com/edx/super-csv@1a9dcc89eb65c3ed434b509b84062f8fcabd901b#eg
 sympy==1.4
 tincan==0.0.5             # via edx-enterprise
 unicodecsv==0.14.1
-uritemplate==3.0.0        # via coreapi
+uritemplate==3.0.0        # via coreapi, drf-yasg
 urllib3==1.23
 user-util==0.1.5
 voluptuous==0.11.5

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -97,7 +97,6 @@ django-pyfs==2.0
 django-ratelimit-backend==1.1.1
 django-ratelimit==2.0.0
 django-require==1.0.11
-django-rest-swagger==2.2.0
 django-sekizai==1.0.0
 django-ses==0.8.4
 django-simple-history==2.7.0
@@ -111,9 +110,10 @@ django==1.11.21
 djangorestframework-jwt==1.11.0
 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
 djangorestframework-xml==1.3.0
-git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc86856441bbf0bd9cb#egg=djangorestframework==3.6.3
+djangorestframework==3.7.7
 docopt==0.6.2
 docutils==0.14
+drf-yasg==1.16.0
 edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
 git+https://github.com/edx/edx-bulk-grades@f58f9fa01d95c01211fc94ebb92f0fb1a04bf32b#egg=edx-bulk-grades==0.1.1
@@ -174,6 +174,7 @@ idna==2.8
 imagesize==1.1.0          # via sphinx
 importlib-metadata==0.18
 inflect==2.1.0
+inflection==0.3.1
 ipaddress==1.0.22
 isodate==0.6.0
 isort==4.3.20
@@ -215,7 +216,6 @@ nodeenv==1.1.1
 numpy==1.16.4
 oauth2==1.9.0.post1
 oauthlib==2.1.0
-openapi-codec==1.3.2
 git+https://github.com/edx/edx-ora2.git@2.2.3#egg=ora2==2.2.3
 packaging==19.0
 path.py==8.2.1
@@ -280,6 +280,8 @@ requests-oauthlib==1.1.0
 requests==2.22.0
 rest-condition==1.0.3
 rfc6266-parser==0.0.5.post2
+ruamel.ordereddict==0.4.13
+ruamel.yaml==0.15.97
 rules==2.0.1
 s3transfer==0.1.13
 sailthru-client==2.2.3

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -94,7 +94,6 @@ django-pyfs==2.0
 django-ratelimit-backend==1.1.1
 django-ratelimit==2.0.0
 django-require==1.0.11
-django-rest-swagger==2.2.0
 django-sekizai==1.0.0
 django-ses==0.8.4
 django-simple-history==2.7.0
@@ -107,9 +106,10 @@ django-webpack-loader==0.6.0
 djangorestframework-jwt==1.11.0
 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
 djangorestframework-xml==1.3.0
-git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc86856441bbf0bd9cb#egg=djangorestframework==3.6.3
+djangorestframework==3.7.7
 docopt==0.6.2
 docutils==0.14
+drf-yasg==1.16.0
 edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
 git+https://github.com/edx/edx-bulk-grades@f58f9fa01d95c01211fc94ebb92f0fb1a04bf32b#egg=edx-bulk-grades==0.1.1
@@ -168,6 +168,7 @@ httpretty==0.9.6
 idna==2.8
 importlib-metadata==0.18  # via pluggy
 inflect==2.1.0
+inflection==0.3.1
 ipaddress==1.0.22
 isodate==0.6.0
 isort==4.3.20
@@ -208,7 +209,6 @@ nodeenv==1.1.1
 numpy==1.16.4
 oauth2==1.9.0.post1
 oauthlib==2.1.0
-openapi-codec==1.3.2
 git+https://github.com/edx/edx-ora2.git@2.2.3#egg=ora2==2.2.3
 packaging==19.0           # via caniusepython3
 path.py==8.2.1
@@ -271,6 +271,8 @@ requests-oauthlib==1.1.0
 requests==2.22.0
 rest-condition==1.0.3
 rfc6266-parser==0.0.5.post2
+ruamel.ordereddict==0.4.13
+ruamel.yaml==0.15.97
 rules==2.0.1
 s3transfer==0.1.13
 sailthru-client==2.2.3