Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
Unpin drf-jwt (#1032)
Browse files Browse the repository at this point in the history 
BOM-1857 : Unpin drf-jwt
  • Loading branch information
M. Zulqarnain authored Jul 20, 2020
2 parents 622f13c + 8eed218 commit 4ddd714
Show file tree
Hide file tree
Showing 16 changed files with 229 additions and 210 deletions.
14 changes: 5 additions & 9 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,22 @@ DJANGO_SETTINGS_MODULE ?= "analytics_dashboard.settings.local"

.PHONY: requirements clean

# pin to 9.0.3 until tox-battery upgrades
pin_pip:
pip install --upgrade pip==9.0.3

requirements: requirements.py requirements.js

requirements.tox:
pip install -q -r requirements/tox.txt
pip3 install -q -r requirements/tox.txt

requirements.py:
pip install -q -r requirements/base.txt --exists-action w
pip3 install -q -r requirements/base.txt --exists-action w

requirements.js:
npm install --unsafe-perm

test.requirements:
pip install -q -r requirements/test.txt --exists-action w
pip3 install -q -r requirements/test.txt --exists-action w

develop: requirements.js
pip install -q -r requirements/local.txt --exists-action w
pip3 install -q -r requirements/local.txt --exists-action w

migrate: requirements.tox
tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-migrate
Expand Down Expand Up @@ -147,7 +143,7 @@ static: requirements.tox

export CUSTOM_COMPILE_COMMAND = make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -q -r requirements/pip_tools.txt
pip3 install -q -r requirements/pip_tools.txt
pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
Expand Down
4 changes: 2 additions & 2 deletions analytics_dashboard/courses/tests/test_presenters/test_presenters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -803,8 +803,8 @@ class ListWithName(list):
pass


def annotated(l, name):
alist = ListWithName(l)
def annotated(list_, name):
alist = ListWithName(list_)
setattr(alist, '__name__', name)
return alist

Expand Down
6 changes: 3 additions & 3 deletions analytics_dashboard/courses/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ def _alphanum_key(s):
return [sorting._tryint(c) for c in re.split('([0-9]+)', s)]

@staticmethod
def natural_sort(l, field=None):
def natural_sort(list_, field=None):
""" Natural sort from Ned Batchelder - http://nedbatchelder.com/blog/200712.html#e20071211T054956 """
if field:
l.sort(key=lambda x: sorting._alphanum_key(x[field]))
list_.sort(key=lambda x: sorting._alphanum_key(x[field]))
else:
l.sort(key=sorting._alphanum_key)
list_.sort(key=sorting._alphanum_key)
4 changes: 2 additions & 2 deletions requirements/base.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ edx-rest-api-client # Apache
libsass==0.11.1 # MIT
logutils # BSD
requests # Apache 2.0
stevedore>=0.14.1,<2.0.0
path.py<12.0 # >=12.0 is python3 only
stevedore
path.py

# This can be removed once an official social-auth-app-django Pypi release with Django 2.2 support is available in the future.
-e git+https://github.com/python-social-auth/social-app-django.git@ffa0fb99a80d11479bea2c4eae9a01ee835d52b9#egg=social-auth-app-django
60 changes: 32 additions & 28 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,66 +8,70 @@
awesome-slugify==1.6.5 # via -r requirements/base.in
blessings==1.7 # via curtsies
bpython==0.19 # via -r requirements/base.in
certifi==2020.4.5.1 # via requests
certifi==2020.6.20 # via requests
cffi==1.14.0 # via cryptography
chardet==3.0.4 # via requests
curtsies==0.3.1 # via bpython
cryptography==2.9.2 # via pyjwt
curtsies==0.3.4 # via bpython
defusedxml==0.6.0 # via python3-openid, social-auth-core
django-appconf==1.0.4 # via -r requirements/base.in
django-braces==1.14.0 # via -r requirements/base.in
django-countries==6.1.2 # via -r requirements/base.in
django-crispy-forms==1.9.0 # via -r requirements/base.in
django-lang-pref-middleware==0.2.0 # via -r requirements/base.in
django-crispy-forms==1.9.2 # via -r requirements/base.in
django-lang-pref-middleware==0.3.0 # via -r requirements/base.in
django-model-utils==4.0.0 # via -r requirements/base.in
django-soapbox==1.6 # via -r requirements/base.in
django-waffle==0.20.0 # via -r requirements/base.in, edx-django-utils, edx-drf-extensions
django-waffle==1.0.0 # via -r requirements/base.in, edx-django-utils, edx-drf-extensions
django-webpack-loader==0.7.0 # via -r requirements/base.in
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/base.in, django-appconf, django-braces, django-lang-pref-middleware, django-model-utils, django-soapbox, djangorestframework, drf-jwt, edx-auth-backends, edx-django-release-util, edx-django-utils, edx-drf-extensions, edx-i18n-tools, pinax-announcements, rest-condition
django==2.2.14 # via -c requirements/constraints.txt, -r requirements/base.in, django-appconf, django-braces, django-lang-pref-middleware, django-model-utils, django-soapbox, djangorestframework, drf-jwt, edx-auth-backends, edx-django-release-util, edx-django-utils, edx-drf-extensions, edx-i18n-tools, pinax-announcements, rest-condition
djangorestframework-csv==2.1.0 # via -r requirements/base.in
djangorestframework==3.11.0 # via -r requirements/base.in, djangorestframework-csv, drf-jwt, edx-drf-extensions, rest-condition
drf-jwt==1.14.0 # via -c requirements/constraints.txt, edx-drf-extensions
edx-analytics-data-api-client==0.15.5 # via -r requirements/base.in
edx-auth-backends==3.0.2 # via -r requirements/base.in
edx-ccx-keys==1.0.1 # via -r requirements/base.in
drf-jwt==1.16.2 # via edx-drf-extensions
edx-analytics-data-api-client==0.16.1 # via -r requirements/base.in
edx-auth-backends==3.1.0 # via -r requirements/base.in
edx-ccx-keys==1.1.0 # via -r requirements/base.in
edx-django-release-util==0.4.4 # via -r requirements/base.in
edx-django-utils==3.2.1 # via -r requirements/base.in, edx-drf-extensions, edx-rest-api-client
edx-drf-extensions==5.0.2 # via -r requirements/base.in
edx-i18n-tools==0.5.0 # via -r requirements/base.in
edx-opaque-keys==2.1.0 # via -r requirements/base.in, edx-ccx-keys, edx-drf-extensions
edx-rest-api-client==5.1.0 # via -r requirements/base.in
edx-django-utils==3.3.0 # via -r requirements/base.in, edx-drf-extensions, edx-rest-api-client
edx-drf-extensions==6.1.1 # via -r requirements/base.in
edx-i18n-tools==0.5.3 # via -r requirements/base.in
edx-opaque-keys==2.1.1 # via -r requirements/base.in, edx-ccx-keys, edx-drf-extensions
edx-rest-api-client==5.2.1 # via -r requirements/base.in
future==0.18.2 # via pyjwkest
greenlet==0.4.15 # via bpython
idna==2.9 # via requests
importlib-metadata==1.6.0 # via path.py
greenlet==0.4.16 # via bpython
idna==2.10 # via requests
importlib-metadata==1.7.0 # via path
libsass==0.11.1 # via -r requirements/base.in
logutils==0.3.5 # via -r requirements/base.in
newrelic==5.12.0.140 # via edx-django-utils
newrelic==5.14.1.144 # via edx-django-utils
oauthlib==3.1.0 # via requests-oauthlib, social-auth-core
path.py==11.5.2 # via -r requirements/base.in, edx-i18n-tools
path.py==12.4.0 # via -r requirements/base.in, edx-i18n-tools
path==13.1.0 # via path.py
pbr==5.4.5 # via stevedore
pinax-announcements==3.0.2 # via -r requirements/base.in
pinax-announcements==3.0.2 # via -c requirements/constraints.txt, -r requirements/base.in
polib==1.1.0 # via edx-i18n-tools
psutil==1.2.1 # via edx-django-utils
pycryptodomex==3.9.7 # via pyjwkest
pycparser==2.20 # via cffi
pycryptodomex==3.9.8 # via pyjwkest
pygments==2.6.1 # via bpython
pyjwkest==1.4.2 # via edx-drf-extensions
pyjwt==1.7.1 # via drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
pyjwt[crypto]==1.7.1 # via drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
pymongo==3.10.1 # via edx-opaque-keys
python-dateutil==2.8.1 # via edx-drf-extensions
python3-openid==3.1.0 # via social-auth-core
python3-openid==3.2.0 # via social-auth-core
pytz==2020.1 # via django
pyyaml==5.3.1 # via edx-django-release-util, edx-i18n-tools
regex==2020.4.4 # via awesome-slugify
regex==2020.7.14 # via awesome-slugify
requests-oauthlib==1.3.0 # via social-auth-core
requests==2.23.0 # via -r requirements/base.in, bpython, edx-analytics-data-api-client, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core
requests==2.24.0 # via -r requirements/base.in, bpython, edx-analytics-data-api-client, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core
rest-condition==1.0.3 # via edx-drf-extensions
semantic-version==2.8.5 # via edx-drf-extensions
six==1.14.0 # via blessings, bpython, django-braces, django-waffle, djangorestframework-csv, edx-auth-backends, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-i18n-tools, edx-opaque-keys, libsass, pyjwkest, python-dateutil, social-auth-app-django, social-auth-core, stevedore
six==1.15.0 # via blessings, bpython, cryptography, django-braces, djangorestframework-csv, edx-auth-backends, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-i18n-tools, edx-opaque-keys, libsass, pyjwkest, python-dateutil, social-auth-app-django, social-auth-core, stevedore
slumber==0.7.1 # via edx-rest-api-client
social-auth-core==3.2.0 # via -c requirements/constraints.txt, edx-auth-backends, social-auth-app-django
sqlparse==0.3.1 # via django
stevedore==1.32.0 # via -r requirements/base.in, edx-opaque-keys
unicodecsv==0.14.1 # via djangorestframework-csv
unidecode==0.4.21 # via awesome-slugify
urllib3==1.25.9 # via requests
wcwidth==0.1.9 # via curtsies
wcwidth==0.2.5 # via curtsies
zipp==1.2.0 # via importlib-metadata
7 changes: 5 additions & 2 deletions requirements/constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# Code support django 2.2
Django<3.0.0

# django22 tests are failing. Constraint taken from https://github.com/edx/edx-drf-extensions version 5.0.2
drf-jwt<1.15.0
# Latest version has dropped support for Python 3.5
pinax-announcements<4.0.0

# pip20+ requires for greater version of pip-tools. But installing 19.3.1 in all our containers and VMs.
pip-tools<5.0.0
Expand All @@ -24,3 +24,6 @@ pylint==2.4.4

# 3.3.0 Generate incompatibilities with awesome-slugify.
social-auth-core==3.2.0

# Newer versions cause build failure on Travis with `ERROR: Cannot find command 'git' - do you have 'git' installed and in your PATH?`
tox==3.14.6
2 changes: 1 addition & 1 deletion requirements/django.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/base.in, django-appconf, django-braces, django-lang-pref-middleware, django-model-utils, django-soapbox, djangorestframework, drf-jwt, edx-auth-backends, edx-django-release-util, edx-django-utils, edx-drf-extensions, edx-i18n-tools, pinax-announcements, rest-condition
django==2.2.14 # via -c requirements/constraints.txt, -r requirements/base.in, django-appconf, django-braces, django-lang-pref-middleware, django-model-utils, django-soapbox, djangorestframework, drf-jwt, edx-auth-backends, edx-django-release-util, edx-django-utils, edx-drf-extensions, edx-i18n-tools, pinax-announcements, rest-condition
60 changes: 32 additions & 28 deletions requirements/doc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,64 +10,68 @@ awesome-slugify==1.6.5 # via -r requirements/base.txt
babel==2.8.0 # via sphinx
blessings==1.7 # via -r requirements/base.txt, curtsies
bpython==0.19 # via -r requirements/base.txt
certifi==2020.4.5.1 # via -r requirements/base.txt, requests
certifi==2020.6.20 # via -r requirements/base.txt, requests
cffi==1.14.0 # via -r requirements/base.txt, cryptography
chardet==3.0.4 # via -r requirements/base.txt, requests
curtsies==0.3.1 # via -r requirements/base.txt, bpython
cryptography==2.9.2 # via -r requirements/base.txt, pyjwt
curtsies==0.3.4 # via -r requirements/base.txt, bpython
defusedxml==0.6.0 # via -r requirements/base.txt, python3-openid, social-auth-core
django-appconf==1.0.4 # via -r requirements/base.txt
django-braces==1.14.0 # via -r requirements/base.txt
django-countries==6.1.2 # via -r requirements/base.txt
django-crispy-forms==1.9.0 # via -r requirements/base.txt
django-lang-pref-middleware==0.2.0 # via -r requirements/base.txt
django-crispy-forms==1.9.2 # via -r requirements/base.txt
django-lang-pref-middleware==0.3.0 # via -r requirements/base.txt
django-model-utils==4.0.0 # via -r requirements/base.txt
django-soapbox==1.6 # via -r requirements/base.txt
django-waffle==0.20.0 # via -r requirements/base.txt, edx-django-utils, edx-drf-extensions
django-waffle==1.0.0 # via -r requirements/base.txt, edx-django-utils, edx-drf-extensions
django-webpack-loader==0.7.0 # via -r requirements/base.txt
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/base.txt, django-appconf, django-braces, django-lang-pref-middleware, django-model-utils, django-soapbox, djangorestframework, drf-jwt, edx-auth-backends, edx-django-release-util, edx-django-utils, edx-drf-extensions, edx-i18n-tools, pinax-announcements, rest-condition
django==2.2.14 # via -c requirements/constraints.txt, -r requirements/base.txt, django-appconf, django-braces, django-lang-pref-middleware, django-model-utils, django-soapbox, djangorestframework, drf-jwt, edx-auth-backends, edx-django-release-util, edx-django-utils, edx-drf-extensions, edx-i18n-tools, pinax-announcements, rest-condition
djangorestframework-csv==2.1.0 # via -r requirements/base.txt
djangorestframework==3.11.0 # via -r requirements/base.txt, djangorestframework-csv, drf-jwt, edx-drf-extensions, rest-condition
docutils==0.16 # via sphinx
drf-jwt==1.14.0 # via -c requirements/constraints.txt, -r requirements/base.txt, edx-drf-extensions
edx-analytics-data-api-client==0.15.5 # via -r requirements/base.txt
edx-auth-backends==3.0.2 # via -r requirements/base.txt
edx-ccx-keys==1.0.1 # via -r requirements/base.txt
drf-jwt==1.16.2 # via -r requirements/base.txt, edx-drf-extensions
edx-analytics-data-api-client==0.16.1 # via -r requirements/base.txt
edx-auth-backends==3.1.0 # via -r requirements/base.txt
edx-ccx-keys==1.1.0 # via -r requirements/base.txt
edx-django-release-util==0.4.4 # via -r requirements/base.txt
edx-django-utils==3.2.1 # via -r requirements/base.txt, edx-drf-extensions, edx-rest-api-client
edx-drf-extensions==5.0.2 # via -r requirements/base.txt
edx-i18n-tools==0.5.0 # via -r requirements/base.txt
edx-opaque-keys==2.1.0 # via -r requirements/base.txt, edx-ccx-keys, edx-drf-extensions
edx-rest-api-client==5.1.0 # via -r requirements/base.txt
edx-django-utils==3.3.0 # via -r requirements/base.txt, edx-drf-extensions, edx-rest-api-client
edx-drf-extensions==6.1.1 # via -r requirements/base.txt
edx-i18n-tools==0.5.3 # via -r requirements/base.txt
edx-opaque-keys==2.1.1 # via -r requirements/base.txt, edx-ccx-keys, edx-drf-extensions
edx-rest-api-client==5.2.1 # via -r requirements/base.txt
future==0.18.2 # via -r requirements/base.txt, pyjwkest
greenlet==0.4.15 # via -r requirements/base.txt, bpython
idna==2.9 # via -r requirements/base.txt, requests
greenlet==0.4.16 # via -r requirements/base.txt, bpython
idna==2.10 # via -r requirements/base.txt, requests
imagesize==1.2.0 # via sphinx
importlib-metadata==1.6.0 # via -r requirements/base.txt, path.py
importlib-metadata==1.7.0 # via -r requirements/base.txt, path
jinja2==2.11.2 # via sphinx
libsass==0.11.1 # via -r requirements/base.txt
logutils==0.3.5 # via -r requirements/base.txt
markupsafe==1.1.1 # via jinja2
newrelic==5.12.0.140 # via -r requirements/base.txt, edx-django-utils
newrelic==5.14.1.144 # via -r requirements/base.txt, edx-django-utils
oauthlib==3.1.0 # via -r requirements/base.txt, requests-oauthlib, social-auth-core
path.py==11.5.2 # via -r requirements/base.txt, edx-i18n-tools
path.py==12.4.0 # via -r requirements/base.txt, edx-i18n-tools
path==13.1.0 # via -r requirements/base.txt, path.py
pbr==5.4.5 # via -r requirements/base.txt, stevedore
pinax-announcements==3.0.2 # via -r requirements/base.txt
pinax-announcements==3.0.2 # via -c requirements/constraints.txt, -r requirements/base.txt
polib==1.1.0 # via -r requirements/base.txt, edx-i18n-tools
psutil==1.2.1 # via -r requirements/base.txt, edx-django-utils
pycryptodomex==3.9.7 # via -r requirements/base.txt, pyjwkest
pycparser==2.20 # via -r requirements/base.txt, cffi
pycryptodomex==3.9.8 # via -r requirements/base.txt, pyjwkest
pygments==2.6.1 # via -r requirements/base.txt, bpython, sphinx
pyjwkest==1.4.2 # via -r requirements/base.txt, edx-drf-extensions
pyjwt==1.7.1 # via -r requirements/base.txt, drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
pyjwt[crypto]==1.7.1 # via -r requirements/base.txt, drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
pymongo==3.10.1 # via -r requirements/base.txt, edx-opaque-keys
python-dateutil==2.8.1 # via -r requirements/base.txt, edx-drf-extensions
python3-openid==3.1.0 # via -r requirements/base.txt, social-auth-core
python3-openid==3.2.0 # via -r requirements/base.txt, social-auth-core
pytz==2020.1 # via -r requirements/base.txt, babel, django
pyyaml==5.3.1 # via -r requirements/base.txt, edx-django-release-util, edx-i18n-tools
regex==2020.4.4 # via -r requirements/base.txt, awesome-slugify
regex==2020.7.14 # via -r requirements/base.txt, awesome-slugify
requests-oauthlib==1.3.0 # via -r requirements/base.txt, social-auth-core
requests==2.23.0 # via -r requirements/base.txt, bpython, edx-analytics-data-api-client, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core
requests==2.24.0 # via -r requirements/base.txt, bpython, edx-analytics-data-api-client, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core
rest-condition==1.0.3 # via -r requirements/base.txt, edx-drf-extensions
semantic-version==2.8.5 # via -r requirements/base.txt, edx-drf-extensions
six==1.14.0 # via -r requirements/base.txt, blessings, bpython, django-braces, django-waffle, djangorestframework-csv, edx-auth-backends, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-i18n-tools, edx-opaque-keys, libsass, pyjwkest, python-dateutil, social-auth-app-django, social-auth-core, sphinx, stevedore
six==1.15.0 # via -r requirements/base.txt, blessings, bpython, cryptography, django-braces, djangorestframework-csv, edx-auth-backends, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-i18n-tools, edx-opaque-keys, libsass, pyjwkest, python-dateutil, social-auth-app-django, social-auth-core, sphinx, stevedore
slumber==0.7.1 # via -r requirements/base.txt, edx-rest-api-client
snowballstemmer==2.0.0 # via sphinx
social-auth-core==3.2.0 # via -c requirements/constraints.txt, -r requirements/base.txt, edx-auth-backends, social-auth-app-django
Expand All @@ -78,5 +82,5 @@ stevedore==1.32.0 # via -r requirements/base.txt, edx-opaque-keys
unicodecsv==0.14.1 # via -r requirements/base.txt, djangorestframework-csv
unidecode==0.4.21 # via -r requirements/base.txt, awesome-slugify
urllib3==1.25.9 # via -r requirements/base.txt, requests
wcwidth==0.1.9 # via -r requirements/base.txt, curtsies
wcwidth==0.2.5 # via -r requirements/base.txt, curtsies
zipp==1.2.0 # via -r requirements/base.txt, importlib-metadata
Loading

0 comments on commit 4ddd714

Please sign in to comment.