Merge pull request #820 from dhermes/remove-httplib2-hack-release-0.9.1

Using httplib2 from PyPI in regression3.
googleapis · Apr 13, 2015 · 6283ab9 · 6283ab9
2 parents 4d2c187 + 218f686
commit 6283ab9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 REQUIREMENTS = [
     'google-apitools',
-    'httplib2',
+    'httplib2 >= 0.9.1',
     'oauth2client >= 1.4.6',
     'protobuf >= 2.5.0',
     'pycrypto',

diff --git a/tox.ini b/tox.ini
@@ -67,9 +67,3 @@ basepython =
     python3.4
 commands =
     {toxinidir}/scripts/run_regression.sh
-deps =
-    {[testenv]deps}
-    # Use a development checkout of httplib2 until a release is made
-    # incorporating https://github.com/jcgregorio/httplib2/pull/291
-    # and https://github.com/jcgregorio/httplib2/pull/296
-    -egit+https://github.com/jcgregorio/httplib2.git#egg=httplib2