Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #22904 from edx/usama/bom-1143

Browse Source 
BOM-1143 Django-auth-toolkit update
This commit is contained in:
Usama Sadiq
2020-01-24 12:21:37 +05:00
committed by GitHub
parent cdb0619846 1e33a4f3ba
commit 52f6418430
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -90,7 +90,7 @@ upgrade: ## update the pip requirements files to use the latest releases satisfy
done
# Post process all of the files generated above to work around open pip-tools issues
scripts/post-pip-compile.sh $(REQ_FILES:=.txt)
# Let tox control the Django version for tests
grep "^django==" requirements/edx/base.txt > requirements/edx/django.txt
sed '/^[dD]jango==/d' requirements/edx/testing.txt > requirements/edx/testing.tmp
# Let tox control the Django version & django-oauth-toolkit version for tests
grep -e "^django==" -e "^django-oauth-toolkit==" requirements/edx/base.txt > requirements/edx/django.txt
sed '/^[dD]jango==/d;/^django-oauth-toolkit==/d' requirements/edx/testing.txt > requirements/edx/testing.tmp
mv requirements/edx/testing.tmp requirements/edx/testing.txt

1
requirements/edx/django.txt
View File

@@ -1 +1,2 @@
django-oauth-toolkit==1.1.3
django==1.11.27

1
tox.ini
View File

@@ -71,6 +71,7 @@ deps =
django111: -r requirements/edx/django.txt
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django20,django21: git+https://github.com/jazzband/django-oauth-toolkit.git@bf1525e85a06929016b1fe35d863e62e58124a2f#egg=oauth2_provider
-r requirements/edx/testing.txt
whitelist_externals =
/bin/bash