John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/290146
Change subject: Travis workaround for TLSv1.2 on precise container
......................................................................
Travis workaround for TLSv1.2 on precise container
Use debian-sid libssl1.0.0 on Precise containers.
This debian sid package conflicts with Ubuntu packages
graphviz and python-ipaddr, so they are only added on
Trusty and Precise sudo builds.
requests[security] was added in requests 2.4.1 and
requests[security] added a pyOpenSSL>=0.13 dependency
in requests 2.9.0.
As precise-sudo has pyOpenSSL 0.12, and trusty has
requests 2.2.1, these both need to be upgraded by pip
otherwise they fail in setup.py which will not overwrite
distribution packaged libraries with newer versions.
Bug: T134647
Change-Id: Iabf344a417299214cdb92c5776cbe580cb6989e5
---
M .travis.yml
M requests-requirements.txt
M requirements.txt
3 files changed, 27 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/46/290146/1
diff --git a/.travis.yml b/.travis.yml
index fa8fef8..e089d78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,12 @@
addons:
apt:
+ sources:
+ - debian-sid
packages:
+ - libssl1.0.0
- djvulibre-bin
- - graphviz
- liblua5.1-0-dev
- - python-ipaddr
before_install:
# When PYSETUP_TEST_EXTRAS is not enabled, do not allow the
@@ -131,11 +132,27 @@
matrix:
include:
- python: '2.7_with_system_site_packages' # equivalent to virtualenv:
system_site_packages: true
- env: LANGUAGE=he FAMILY=wikivoyage SITE_ONLY=1
- - python: '2.7'
+ env: LANGUAGE=he FAMILY=wikivoyage DIST=precise-sudo
PYWIKIBOT2_TEST_NO_RC=1
+ dist: precise
+ sudo: required
+ addons:
+ apt:
+ packages:
+ - djvulibre-bin
+ - graphviz
+ - liblua5.1-0-dev
+ - python-ipaddr
+ - python: '2.7_with_system_site_packages'
env: LANGUAGE=nb FAMILY=wikipedia DIST=trusty
dist: trusty
sudo: required
+ addons:
+ apt:
+ packages:
+ - djvulibre-bin
+ - graphviz
+ - liblua5.1-0-dev
+ - python-ipaddr
- python: '2.7'
env: LANGUAGE=en FAMILY=wpbeta SITE_ONLY=1
OAUTH_DOMAIN="en.wikipedia.beta.wmflabs.org"
- python: '3.3'
diff --git a/requests-requirements.txt b/requests-requirements.txt
index 778c9f6..4ad0a88 100644
--- a/requests-requirements.txt
+++ b/requests-requirements.txt
@@ -1,7 +1,7 @@
-requests
+requests>=2.4.1
# requests security extra
# Bug T105767 on Python 2.7 release 9+
-pyOpenSSL ; python_full_version < '2.7.9' or python_version >= '3'
+pyOpenSSL>=0.13 ; python_full_version < '2.7.9' or python_version >= '3'
ndg-httpsclient ; python_full_version < '2.7.9' or python_version >= '3'
pyasn1 ; python_full_version < '2.7.9' or python_version >= '3'
diff --git a/requirements.txt b/requirements.txt
index 3658030..9b4400a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,10 +19,10 @@
# $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search
# mandatory; see README.conversion.txt
-requests
+requests>=2.4.1
# requests security extra
-pyOpenSSL ; python_full_version < '2.7.9'
+pyOpenSSL>=0.13 ; python_full_version < '2.7.9'
ndg-httpsclient ; python_full_version < '2.7.9'
pyasn1 ; python_full_version < '2.7.9'
@@ -82,6 +82,8 @@
# scripts/script_wui.py depends on Lua, which is not available using pip
# but can be obtained from: https://github.com/bastibe/lunatic-python
+# However, a better fork is: https://github.com/AlereDevices/lunatic-python
+# Also script_wui.py is not currently functional, so it isnt installed here.
# core HTML comparison parser in diff module
beautifulsoup4
--
To view, visit https://gerrit.wikimedia.org/r/290146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabf344a417299214cdb92c5776cbe580cb6989e5
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jay...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
