Updated test environment to support latest versions.

moccu · Feb 10, 2016 · b26ee77 · b26ee77
1 parent 654220d
commit b26ee77
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/.python-version b/.python-version
@@ -0,0 +1,4 @@
+3.5.0
+3.4.3
+2.7.10
+2.6.9
diff --git a/barbeque/tests/views/test_mixins.py b/barbeque/tests/views/test_mixins.py
@@ -101,7 +101,7 @@ def test_get_never_cache(self, cache_mock, rf):
         cache_mock.return_value.get.return_value = None
         self.view.cache_ensure_never_cache = True
         response = self.view.dispatch(rf.get('/'))
-        assert response['cache-control'] == 'max-age=0'
+        assert 'max-age=0' in response['cache-control']
 
     @mock.patch('barbeque.views.mixins.get_cache')
     def test_dispatch_no_timeout(self, cache_mock, rf):

diff --git a/setup.py b/setup.py
@@ -31,8 +31,9 @@
     'Pillow==2.9.0',
     'django-anylink==0.3.0',
     'django-cms==3.1.3',
-    'django-compressor==1.5',
-    'django-filer==0.9.12',
+    'django-polymorphic==0.8.1',
+    'django-compressor==1.6',
+    'django-filer==1.1.1',
 ]
 
 

diff --git a/tox.ini b/tox.ini
@@ -5,67 +5,73 @@ commands =
 	pip install -e {toxinidir}[tests]
 	py.test -vs --junitxml=junit-{envname}.xml --cache-clear --cov {toxinidir}/barbeque --cov-config {toxinidir}/.coveragerc --cov-report xml
 
-deps16 =
+deps_django16 =
 	https://github.com/django/django/archive/stable/1.6.x.tar.gz#egg=django
-deps17 =
+deps_django17 =
 	https://github.com/django/django/archive/stable/1.7.x.tar.gz#egg=django
-deps18 =
+deps_django18 =
 	https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
+deps_filer09 =
+    https://github.com/divio/django-filer/archive/0.9.9.zip#egg=filer
 
 [testenv:2.6-1.6.x]
 basepython = python2.6
 deps =
-	{[testenv]deps16}
+	{[testenv]deps_django16}
+	{[testenv]deps_filer09}
 
 [testenv:2.7-1.6.x]
 basepython = python2.7
 deps =
-	{[testenv]deps16}
+	{[testenv]deps_django16}
+	{[testenv]deps_filer09}
 
 [testenv:2.7-1.7.x]
 basepython = python2.7
 deps =
-	{[testenv]deps17}
+	{[testenv]deps_django17}
 
 [testenv:2.7-1.8.x]
 basepython = python2.7
 deps =
-	{[testenv]deps18}
+	{[testenv]deps_django18}
 
 [testenv:3.4-1.6.x]
 basepython = python3.4
 deps =
-	{[testenv]deps16}
+	{[testenv]deps_django16}
+	{[testenv]deps_filer09}
 
 [testenv:3.4-1.7.x]
 basepython = python3.4
 deps =
-	{[testenv]deps17}
+	{[testenv]deps_django17}
 
 [testenv:3.4-1.8.x]
 basepython = python3.4
 deps =
-	{[testenv]deps18}
+	{[testenv]deps_django18}
 
 [testenv:3.5-1.8.x]
 basepython = python3.5
 deps =
-	{[testenv]deps18}
+	{[testenv]deps_django18}
 
 [testenv:pypy-1.6.x]
 basepython = pypy
 deps =
-	{[testenv]deps16}
+	{[testenv]deps_django16}
+	{[testenv]deps_filer09}
 
 [testenv:pypy-1.7.x]
 basepython = pypy
 deps =
-	{[testenv]deps17}
+	{[testenv]deps_django17}
 
 [testenv:pypy-1.8.x]
 basepython = pypy
 deps =
-	{[testenv]deps18}
+	{[testenv]deps_django18}
 
 [docs]
 commands =