From 1e33a4f3baa5566b6a00b9cf67c130292c656234 Mon Sep 17 00:00:00 2001 From: usamasadiq Date: Mon, 13 Jan 2020 18:59:36 +0500 Subject: [PATCH] BOM-1143 Django-auth-toolkit update Pinned the latest commit from github to get Django2.2 support in testing. Pinned the zipp<2.0.0 to get Python<3.5 support too. --- Makefile | 6 +++--- requirements/edx/django.txt | 1 + tox.ini | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9f16d0018b..2f08475fd1 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt index 1d616a4fb5..a574d8c092 100644 --- a/requirements/edx/django.txt +++ b/requirements/edx/django.txt @@ -1 +1,2 @@ +django-oauth-toolkit==1.1.3 django==1.11.27 diff --git a/tox.ini b/tox.ini index 4360f57f32..104f228ed8 100644 --- a/tox.ini +++ b/tox.ini @@ -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