Merge branch 'prep-release-1-2'

vkurup · vkurup · commit ddcabd4f9aff · 2016-11-28T13:16:28.000-05:00
diff --git a/bandit/__init__.py b/bandit/__init__.py
@@ -6,7 +6,7 @@
     'major': 1,
     'minor': 2,
     'micro': 0,
-    'releaselevel': 'dev',
+    'releaselevel': 'final',
 }
 
 
diff --git a/tox.ini b/tox.ini
@@ -22,7 +22,7 @@ deps =
     1.8: Django>=1.8,<1.9
     1.9: Django>=1.9,<1.10
     1.10: Django>=1.10,<1.11
-    trunk: https://github.com/django/django/archive/master.zip
+    trunk: https://github.com/django/django/archive/master.tar.gz
 
 [testenv:docs]
 basepython = python3.4
