Merge pull request #1555 from whyscream/django-pinning

acdha · web-flow · commit 55f5cdbfde94 · 2017-09-22T07:45:26.000-04:00
Fix django version pinning in setup.py
diff --git a/setup.py b/setup.py
@@ -12,8 +12,7 @@
     from setuptools import setup
 
 install_requires = [
-    'Django>=1.8',
-    'Django<1.12',
+    'Django>=1.8,<1.12',
 ]
 
 tests_require = [

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@`
`12`	`12`	`from setuptools import setup`
`13`	`13`
`14`	`14`	`install_requires = [`
`15`		`- 'Django>=1.8',`
`16`		`- 'Django<1.12',`
	`15`	`+ 'Django>=1.8,<1.12',`
`17`	`16`	`]`
`18`	`17`
`19`	`18`	`tests_require = [`