jenkins-bot has submitted this change and it was merged.
Change subject: Add soft dependency on httplib2 0.9.0 for cacerts
......................................................................
Add soft dependency on httplib2 0.9.0 for cacerts
Added the new version dependency only to setup.py
which ensures anyone packaging pywikibot provides
a version of httplib2 that has no known problems
with pywikibot.
Updated README for conversion:
- Remove mention of simplejson, as it is included
in all supported versions of python.
- Remove note about unsupported httplib2 0.4.0.
Bug: 65189
Change-Id: I1917c463256443262b723ca1dead50308c5b585e
---
M README-conversion.txt
M setup.py
2 files changed, 21 insertions(+), 11 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README-conversion.txt b/README-conversion.txt
index b137a28..dd6c1c7 100644
--- a/README-conversion.txt
+++ b/README-conversion.txt
@@ -48,18 +48,28 @@
so that these dependencies will be loaded automatically when the package is
installed, and users won't need to worry about this...]
-To run pywikibot, you will need the httplib2 and simplejson:
-packages--
-* httplib2 :
https://github.com/jcgregorio/httplib2
-* simplejson :
http://svn.red-bean.com/bob/simplejson/tags/simplejson-1.7.1/docs/index.html
+To run pywikibot, you will need the httplib2 package:
+*
https://github.com/jcgregorio/httplib2
-or, if you already have setuptools installed, just execute
-'easy_install httplib2' and 'easy_install simplejson'
+It may be installed using pip or easy_install.
-If you run into errors involving httplib2.urlnorm, update httplib2 to 0.4.0
-(Ubuntu package python-httlib2, for example, is outdated). Note that
-httplib2 will run under Python 2.6, but will emit DeprecationWarnings (which
-are annoying but don't affect the ability to use the package).
+The minimum requirement is httplib2 0.6.0.
+However setup.py requires httplib2 0.9.0, as that version includes current
+root certificates needed to access Wikimedia servers using HTTPS.
+
+If your operating systems provides a packaged httplib2, it may be
+altered to load the root certificates from the host operating system.
+To check, execute:
+$ python -c 'import httplib2; print httplib2.CA_CERTS'
+
+httplib2 0.8.0 added the ability to define CA_CERTS with a plugin module.
+If you need to use 0.8.0, install module httplib2.ca_certs_locater with pip,
+and contribute fixes as necessary.
+https://pypi.python.org/pypi/httplib2.ca_certs_locater
+https://github.com/dreamhost/httplib2-ca_certs_locater
+
+If you use the pwb.py script, it will attempt to load httplib2 from the
+externals directory, which is a git submodule containing httplib2 0.9.0.
== Page objects ==
diff --git a/setup.py b/setup.py
index 86102fb..0947d97 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
test_deps = []
-dependencies = ['httplib2>=0.6.0']
+dependencies = ['httplib2>=0.9.0']
extra_deps = {}
--
To view, visit
https://gerrit.wikimedia.org/r/138774
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1917c463256443262b723ca1dead50308c5b585e
Gerrit-PatchSet: 8
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>