Skip to content

Commit

Permalink
Merge 38abde3 into f7ba6af
Browse files Browse the repository at this point in the history
  • Loading branch information
edx-requirements-bot committed May 10, 2019
2 parents f7ba6af + 38abde3 commit ad0c971
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ django-waffle==0.16.0 # via edx-django-utils, edx-drf-extensions
django==1.11.20
djangorestframework-jwt==1.11.0 # via edx-drf-extensions
djangorestframework-oauth==1.1.0
djangorestframework==3.9.3
djangorestframework==3.9.4
edx-django-oauth2-provider==1.3.5
edx-django-utils==1.0.3 # via edx-drf-extensions
edx-drf-extensions==2.2.0
edx-drf-extensions==2.2.1
edx-opaque-keys==0.4.4
future==0.17.1 # via pyjwkest
idna==2.8 # via requests
Expand Down
8 changes: 4 additions & 4 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ djangorestframework-jwt==1.11.0
djangorestframework-oauth==1.1.0
edx-django-oauth2-provider==1.3.5
edx-django-utils==1.0.3
edx-drf-extensions==2.2.0
edx-drf-extensions==2.2.1
edx-lint==0.6.0
edx-opaque-keys==0.4.4
enum34==1.1.6 # via astroid
factory-boy==2.11.1
faker==1.0.5 # via factory-boy
faker==1.0.6 # via factory-boy
filelock==3.0.10 # via tox
future==0.17.1
futures==3.2.0 ; python_version == "2.7" # via isort
httpretty==0.9.6
idna==2.8
ipaddress==1.0.22 # via faker
isort==4.3.18 # via pylint
lazy-object-proxy==1.3.1 # via astroid
lazy-object-proxy==1.4.0 # via astroid
mccabe==0.6.1 # via pylint
newrelic==4.18.0.118
nose==1.3.7
pbr==5.2.0
pep8==1.7.1
pillow==6.0.0
pluggy==0.9.0 # via tox
pluggy==0.11.0 # via tox
psutil==1.2.1
py==1.8.0 # via tox
pycryptodomex==3.8.1
Expand Down

0 comments on commit ad0c971

Please sign in to comment.