From 85db6c9d79f63238a9dce3adf8de9b9654da771c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristi=20V=C3=AEjdea?= <cristi@cvjd.me>
Date: Fri, 21 Dec 2018 01:31:05 +0200
Subject: [PATCH] Fix django-oauth-toolkit python version dependency

django-oauth-toolkit 1.1 is the last version to support Python 2.7/Django 1.11

Source: https://github.com/jazzband/django-oauth-toolkit/issues/579
---
 .idea/codeStyles/Project.xml         | 7 +++++++
 .idea/codeStyles/codeStyleConfig.xml | 5 +++++
 requirements/testproj.txt            | 3 ++-
 testproj/testproj/settings/base.py   | 3 ++-
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..739c7fa
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="Python">
+      <option name="SOFT_MARGINS" value="120" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/requirements/testproj.txt b/requirements/testproj.txt
index 1c259c3..b8548f5 100644
--- a/requirements/testproj.txt
+++ b/requirements/testproj.txt
@@ -8,4 +8,5 @@ djangorestframework-camel-case>=0.2.0
 djangorestframework-recursive>=0.1.2
 dj-database-url>=0.4.2
 user_agents>=1.1.0
-django-oauth-toolkit>=1.2.0
+django-oauth-toolkit>=1.1.0,<1.2.0; python_version == "2.7"
+django-oauth-toolkit>=1.2.0; python_version >= "3.4"
diff --git a/testproj/testproj/settings/base.py b/testproj/testproj/settings/base.py
index b430b19..ad08c1a 100644
--- a/testproj/testproj/settings/base.py
+++ b/testproj/testproj/settings/base.py
@@ -96,7 +96,8 @@ REST_FRAMEWORK = {
 }
 
 OAUTH2_CLIENT_ID = '12ee6bgxtpSEgP8TioWcHSXOiDBOUrVav4mRbVEs'
-OAUTH2_CLIENT_SECRET = '5FvYALo7W4uNnWE2ySw7Yzpkxh9PSf5GuY37RvOys00ydEyph64dbl1ECOKI9ceQAKoz0JpiVQtq0DUnsxNhU3ubrJgZ9YbtiXymbLGJq8L7n4fiER7gXbXaNSbze3BN'
+OAUTH2_CLIENT_SECRET = '5FvYALo7W4uNnWE2ySw7Yzpkxh9PSf5GuY37RvOys00ydEyph64dbl1ECOKI9ceQ' \
+                       'AKoz0JpiVQtq0DUnsxNhU3ubrJgZ9YbtiXymbLGJq8L7n4fiER7gXbXaNSbze3BN'
 OAUTH2_APP_NAME = 'drf-yasg OAuth2 provider'
 
 OAUTH2_REDIRECT_URL = full_url_lazy(static_lazy('drf-yasg/swagger-ui-dist/oauth2-redirect.html'))