Merge pull request #64 from TracyWebTech/update-urllib

Update urllib
jazzband · Mar 29, 2016 · 26ed651 · 26ed651
2 parents bbce321 + 5d8daa7
commit 26ed651
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 
+0.9.11 (2016-03-29)
+===================
+
+* Updated urllib3 to 1.12 (at least)
+
+
 0.9.10 (2016-02-03)
-==================
+===================
 
 * Fixed Python 3 compatibility issue (see #59 and #61). Thanks @stefanklug and @macro1!
 

diff --git a/README.rst b/README.rst
@@ -36,9 +36,9 @@ Dependencies
 ------------
 
 * django >= 1.7
-* urllib3 == 1.10.1
-* diazo >= 1.0.1 (optional)
-* lxml >= 3.4, < 3.5 (optional, diazo dependency)
+* urllib3 >= 1.12
+* diazo >= 1.0.5 (optional)
+* lxml >= 3.4, < 3.5 (optional, but diazo dependency)
 
 
 Install

diff --git a/revproxy/__init__.py b/revproxy/__init__.py
@@ -1 +1 @@
-__version__ = '0.9.10'
+__version__ = '0.9.11'
diff --git a/setup.py b/setup.py
@@ -27,8 +27,8 @@ def find_version(*file_paths):
     long_description=read('README.rst'),
     packages=['revproxy'],
     install_requires=[
-        'django>=1.6',
-        'urllib3==1.10.1',
+        'django>=1.7',
+        'urllib3>=1.12',
     ],
     # lxml 3.5 doesn't work with pypy
     extras_require={