Skip to content

Commit

Permalink
unpin DRF
Browse files Browse the repository at this point in the history
  • Loading branch information
Zulqarnain committed Mar 10, 2020
1 parent 55ff432 commit 29a8840
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 28 deletions.
2 changes: 1 addition & 1 deletion requirements/base.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-c constraints.txt

Django>=1.11
djangorestframework>=3.2.0,<3.10
djangorestframework>=3.2.0
drf-jwt
django-waffle
edx-django-utils
Expand Down
8 changes: 4 additions & 4 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
certifi==2019.11.28 # via requests
chardet==3.0.4 # via requests
django-waffle==0.18.0 # via -c requirements/constraints.txt, -r requirements/base.in, edx-django-utils
django==1.11.29 # via -c requirements/constraints.txt, -r requirements/base.in, drf-jwt, edx-django-utils, rest-condition
djangorestframework==3.9.4 # via -r requirements/base.in, drf-jwt, rest-condition
drf-jwt==1.14.0 # via -r requirements/base.in
django==1.11.29 # via -c requirements/constraints.txt, -r requirements/base.in, djangorestframework, drf-jwt, edx-django-utils, rest-condition
djangorestframework==3.11.0 # via -r requirements/base.in, drf-jwt, rest-condition
drf-jwt==1.14.0 # via -c requirements/constraints.txt, -r requirements/base.in
edx-django-utils==3.0 # via -r requirements/base.in
edx-opaque-keys==2.0.1 # via -r requirements/base.in
future==0.18.2 # via pyjwkest
idna==2.9 # via requests
newrelic==5.8.0.136 # via edx-django-utils
newrelic==5.10.0.138 # via edx-django-utils
pbr==5.4.4 # via stevedore
psutil==1.2.1 # via edx-django-utils
pycryptodomex==3.9.7 # via pyjwkest
Expand Down
21 changes: 10 additions & 11 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ babel==2.8.0 # via -r requirements/docs.txt, sphinx
certifi==2019.11.28 # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, requests
chardet==3.0.4 # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, requests
click-log==0.3.2 # via -r requirements/test.txt, edx-lint
click==7.0 # via -r requirements/test.txt, click-log, edx-lint
click==7.1.1 # via -r requirements/test.txt, click-log, edx-lint
coverage==4.5.4 # via -r requirements/test.txt, pytest-cov
ddt==1.2.2 # via -r requirements/test.txt
ddt==1.3.0 # via -r requirements/test.txt
distlib==0.3.0 # via -r requirements/test.txt, virtualenv
django-waffle==0.18.0 # via -c requirements/constraints.txt, -r requirements/base.txt, -r requirements/test.txt, edx-django-utils
django==1.11.29 # via -c requirements/constraints.txt, -r requirements/base.txt, -r requirements/test.txt, drf-jwt, edx-django-utils, rest-condition
djangorestframework==3.9.4 # via -r requirements/base.txt, -r requirements/test.txt, drf-jwt, rest-condition
django==1.11.29 # via -c requirements/constraints.txt, -r requirements/base.txt, -r requirements/test.txt, djangorestframework, drf-jwt, edx-django-utils, rest-condition
djangorestframework==3.11.0 # via -r requirements/base.txt, -r requirements/test.txt, drf-jwt, rest-condition
docutils==0.16 # via -r requirements/docs.txt, sphinx
drf-jwt==1.14.0 # via -r requirements/base.txt, -r requirements/test.txt
drf-jwt==1.14.0 # via -c requirements/constraints.txt, -r requirements/base.txt, -r requirements/test.txt
edx-django-utils==3.0 # via -r requirements/base.txt, -r requirements/test.txt
edx-lint==1.4.1 # via -r requirements/test.txt
edx-opaque-keys==2.0.1 # via -r requirements/base.txt, -r requirements/test.txt
Expand All @@ -32,24 +32,23 @@ httpretty==0.9.7 # via -r requirements/test.txt
idna==2.9 # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, requests
imagesize==1.2.0 # via -r requirements/docs.txt, sphinx
importlib-metadata==1.5.0 # via -r requirements/test.txt, importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.2.0 # via -r requirements/test.txt, virtualenv
importlib-resources==1.3.1 # via -r requirements/test.txt, virtualenv
isort==4.3.21 # via -r requirements/test.txt, pylint
jinja2==2.11.1 # via -r requirements/docs.txt, sphinx
lazy-object-proxy==1.4.3 # via -r requirements/test.txt, astroid
markupsafe==1.1.1 # via -r requirements/docs.txt, jinja2
mccabe==0.6.1 # via -r requirements/test.txt, pylint
mock==1.3.0 # via -r requirements/test.txt
more-itertools==8.2.0 # via -r requirements/test.txt, pytest
newrelic==5.8.0.136 # via -r requirements/base.txt, -r requirements/test.txt, edx-django-utils
newrelic==5.10.0.138 # via -r requirements/base.txt, -r requirements/test.txt, edx-django-utils
packaging==20.3 # via -r requirements/docs.txt, -r requirements/test.txt, pytest, sphinx
pathlib2==2.3.5 # via -r requirements/test.txt, pytest
pbr==5.4.4 # via -r requirements/base.txt, -r requirements/test.txt, mock, stevedore
pluggy==0.13.1 # via -r requirements/test.txt, pytest, tox
psutil==1.2.1 # via -r requirements/base.txt, -r requirements/test.txt, edx-django-utils
py==1.8.1 # via -r requirements/test.txt, pytest, tox
pycodestyle==2.5.0 # via -r requirements/test.txt
pycryptodomex==3.9.7 # via -r requirements/base.txt, -r requirements/test.txt, pyjwkest
pygments==2.5.2 # via -r requirements/docs.txt, sphinx
pygments==2.6.1 # via -r requirements/docs.txt, sphinx
pyjwkest==1.4.2 # via -r requirements/base.txt, -r requirements/test.txt
pyjwt==1.7.1 # via -r requirements/base.txt, -r requirements/test.txt, drf-jwt
pylint-celery==0.3 # via -r requirements/test.txt, edx-lint
Expand All @@ -66,7 +65,7 @@ pytz==2019.3 # via -r requirements/base.txt, -r requirements/docs.t
requests==2.23.0 # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, pyjwkest, sphinx
rest-condition==1.0.3 # via -r requirements/base.txt, -r requirements/test.txt
semantic-version==2.8.4 # via -r requirements/base.txt, -r requirements/test.txt
six==1.14.0 # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, astroid, edx-lint, edx-opaque-keys, httpretty, mock, packaging, pathlib2, pyjwkest, python-dateutil, stevedore, tox, virtualenv
six==1.14.0 # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, astroid, edx-lint, edx-opaque-keys, httpretty, mock, packaging, pyjwkest, python-dateutil, stevedore, tox, virtualenv
snowballstemmer==2.0.0 # via -r requirements/docs.txt, sphinx
sphinx-rtd-theme==0.4.3 # via -r requirements/docs.txt
sphinx==2.4.4 # via -r requirements/docs.txt, sphinx-rtd-theme
Expand All @@ -81,7 +80,7 @@ text-unidecode==1.3 # via -r requirements/test.txt, faker
tox==2.9.1 # via -r requirements/test.txt
typed-ast==1.4.1 # via -r requirements/test.txt, astroid
urllib3==1.25.8 # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, requests
virtualenv==20.0.8 # via -r requirements/test.txt, tox
virtualenv==20.0.9 # via -r requirements/test.txt, tox
wcwidth==0.1.8 # via -r requirements/test.txt, pytest
wrapt==1.11.2 # via -r requirements/test.txt, astroid
zipp==1.2.0 # via -r requirements/test.txt, importlib-metadata, importlib-resources
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ imagesize==1.2.0 # via sphinx
jinja2==2.11.1 # via sphinx
markupsafe==1.1.1 # via jinja2
packaging==20.3 # via -c requirements/test.txt, sphinx
pygments==2.5.2 # via sphinx
pygments==2.6.1 # via sphinx
pyparsing==2.4.6 # via -c requirements/test.txt, packaging
pytz==2019.3 # via -c requirements/test.txt, babel
requests==2.23.0 # via -c requirements/test.txt, sphinx
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
#
# make upgrade
#
click==7.0 # via pip-tools
click==7.1.1 # via pip-tools
pip-tools==4.5.1 # via -r requirements/pip-tools.in
six==1.14.0 # via pip-tools
15 changes: 7 additions & 8 deletions requirements/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ attrs==19.3.0 # via pytest
certifi==2019.11.28 # via -r requirements/base.txt, requests
chardet==3.0.4 # via -r requirements/base.txt, requests
click-log==0.3.2 # via edx-lint
click==7.0 # via click-log, edx-lint
click==7.1.1 # via click-log, edx-lint
coverage==4.5.4 # via -r requirements/test.in, pytest-cov
ddt==1.2.2 # via -r requirements/test.in
ddt==1.3.0 # via -r requirements/test.in
distlib==0.3.0 # via virtualenv
django-waffle==0.18.0 # via -c requirements/constraints.txt, -r requirements/base.txt, edx-django-utils
drf-jwt==1.14.0 # via -r requirements/base.txt
drf-jwt==1.14.0 # via -c requirements/constraints.txt, -r requirements/base.txt
edx-django-utils==3.0 # via -r requirements/base.txt
edx-lint==1.4.1 # via -r requirements/test.in
edx-opaque-keys==2.0.1 # via -r requirements/base.txt
Expand All @@ -26,15 +26,14 @@ future==0.18.2 # via -r requirements/base.txt, pyjwkest
httpretty==0.9.7 # via -r requirements/test.in
idna==2.9 # via -r requirements/base.txt, requests
importlib-metadata==1.5.0 # via importlib-resources, pluggy, pytest, virtualenv
importlib-resources==1.2.0 # via virtualenv
importlib-resources==1.3.1 # via virtualenv
isort==4.3.21 # via -r requirements/test.in, pylint
lazy-object-proxy==1.4.3 # via astroid
mccabe==0.6.1 # via pylint
mock==1.3.0 # via -r requirements/test.in
more-itertools==8.2.0 # via pytest
newrelic==5.8.0.136 # via -r requirements/base.txt, edx-django-utils
newrelic==5.10.0.138 # via -r requirements/base.txt, edx-django-utils
packaging==20.3 # via pytest
pathlib2==2.3.5 # via pytest
pbr==5.4.4 # via -r requirements/base.txt, mock, stevedore
pluggy==0.13.1 # via pytest, tox
psutil==1.2.1 # via -r requirements/base.txt, edx-django-utils
Expand All @@ -57,13 +56,13 @@ pytz==2019.3 # via -r requirements/base.txt, django
requests==2.23.0 # via -r requirements/base.txt, pyjwkest
rest-condition==1.0.3 # via -r requirements/base.txt
semantic-version==2.8.4 # via -r requirements/base.txt
six==1.14.0 # via -r requirements/base.txt, astroid, edx-lint, edx-opaque-keys, httpretty, mock, packaging, pathlib2, pyjwkest, python-dateutil, stevedore, tox, virtualenv
six==1.14.0 # via -r requirements/base.txt, astroid, edx-lint, edx-opaque-keys, httpretty, mock, packaging, pyjwkest, python-dateutil, stevedore, tox, virtualenv
stevedore==1.32.0 # via -r requirements/base.txt, edx-opaque-keys
text-unidecode==1.3 # via faker
tox==2.9.1 # via -r requirements/test.in
typed-ast==1.4.1 # via astroid
urllib3==1.25.8 # via -r requirements/base.txt, requests
virtualenv==20.0.8 # via tox
virtualenv==20.0.9 # via tox
wcwidth==0.1.8 # via pytest
wrapt==1.11.2 # via astroid
zipp==1.2.0 # via importlib-metadata, importlib-resources
2 changes: 0 additions & 2 deletions tox.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ deps =
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
drf37: djangorestframework<3.8
drf38: djangorestframework<3.9
drf39: djangorestframework<3.10
drflatest: djangorestframework

Expand Down

0 comments on commit 29a8840

Please sign in to comment.