Merge pull request #100 from stphivos/ish-vasa-feature/fix-reqs

Use compatible release clause in tox deps versions

examples/users/users/settings.py

@@ -12,6 +12,7 @@
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+import django
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -40,16 +41,27 @@
     'analytics',
 )
 
-MIDDLEWARE_CLASSES = (
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.security.SecurityMiddleware',
-)
+if django.VERSION[0] == 1:
+    MIDDLEWARE_CLASSES = (
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+        'django.middleware.security.SecurityMiddleware',
+    )
+else:
+    MIDDLEWARE = [
+        'django.middleware.security.SecurityMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    ]
 
 ROOT_URLCONF = 'users.urls'
 

requirements/core.txt

@@ -1,3 +1,3 @@
 mock
 model_mommy>=1.5.1
-Django>=1.8.17,<2.2
+Django>=1.8.17,<2.2.99

tox.ini

@@ -20,16 +20,16 @@ flake8-max-line-length = 120
 [testenv]
 deps =
     -rrequirements/dev.txt
-    dj18: Django==1.8.17
-    dj19: Django==1.9.12
-    dj110: Django==1.10.5
-    dj111: Django==1.11.6
-    dj20: Django==2.0.2
-    dj21: Django==2.1
-    dj22: Django==2.2
-    drf33: djangorestframework==3.3.2
-    drf37: djangorestframework==3.7.7
-    drf39: djangorestframework==3.9.2
+    dj18: Django~=1.8.17
+    dj19: Django~=1.9.12
+    dj110: Django~=1.10.5
+    dj111: Django~=1.11.17
+    dj20: Django~=2.0.2
+    dj21: Django~=2.1.0
+    dj22: Django~=2.2.1
+    drf33: djangorestframework~=3.3.2
+    drf37: djangorestframework~=3.7.7
+    drf39: djangorestframework~=3.9.2
 
 commands =
     py.test django_mock_queries/ tests/ --cov-report term-missing --cov=django_mock_queries --flake8