Merge pull request #26 from aweber/papi-175

amberheilman · amberheilman · commit db0a0e95e3f0 · 2014-11-20T16:32:44.000-05:00
Remove embedded CA certificate, upgrade httplib2
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,5 +1,9 @@
 Changelog
 ---------
+2014-11-20 v1.2.1
+  * Removed SSL Certificate workaround
+  * Upgraded httplib2 >= 0.9.0
+
 2014-11-13: v1.2.0
    * Add a new endpoint to schedule broadcast
 
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,3 @@
 include *.py
 include *.rst
-include aweber_api/cacert.crt
 include LICENSE
diff --git a/aweber_api/cacert.crt b/aweber_api/cacert.crt
diff --git a/aweber_api/oauth.py b/aweber_api/oauth.py
@@ -82,7 +82,6 @@ def _get_client(self):
         else:
             client = oauth.Client(self.consumer)
 
-        client.ca_certs = os.path.join(os.path.dirname(__file__), 'cacert.crt')
         return client
 
     def _prepare_request_body(self, method, url, data):
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name='aweber_api',
-    version='1.2.0',
+    version='1.2.1',
     author='AWeber Dev Team',
     author_email='api@aweber.com',
     maintainer='AWeber API Team',
@@ -28,7 +28,7 @@
     ],
     packages=find_packages(exclude=['tests']),
     install_requires=[
-        'httplib2>=0.7.0,<=0.8.0',
+        'httplib2>=0.9.0,<=0.10.0',
         'oauth2>=1.2',
     ],
     tests_require=[
