jenkins-bot has submitted this change and it was merged.

Change subject: Add builds using packaged httplib2 ......................................................................

Add builds using packaged httplib2

Add a build matrix flag to enable using the httplib2 under externals, and enable it for the English Wikipedia and French Wiktionary builds.

The httplib2 under externals/httplib2 is effectively equivalent to the packaged httplib2. It should work, and it should be tested.

Change-Id: Idfa88862c10c66167dd13d122b1396a89f609b8a --- M .travis.yml 1 file changed, 7 insertions(+), 5 deletions(-)

Approvals: XZise: Looks good to me, approved jenkins-bot: Verified

diff --git a/.travis.yml b/.travis.yml index 1233f57..cea9360 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,9 +47,11 @@ echo "('$PYWIKIBOT2_USERNAME', '$USER_PASSWORD')" > ~/.pywikibot/passwordfile ; fi

- - cd externals/httplib2 - - python setup.py install - - cd ../.. + - if [[ "$EXTERNALS_HTTPLIB2" == "1" ]]; then + (cd externals/httplib2 && python setup.py install) ; + else + rm -rf externals/httplib2 ; + fi

- python -c "import setuptools; print(setuptools.__version__)"

@@ -73,10 +75,10 @@ # See http://docs.travis-ci.com/user/encryption-keys/ for more information. - secure: kofInMlisiTBt9o/Ustc/vySlkKfxGzGCX2LwA1D2waym8sDTS0o5gMJ5LsrT/BUKwZbe1vLozPHqZrrkQvsdTml+DpZuotzdILs0m0f3BUoexEC6OON5IDljuxFyETrD1Ug44ih5Mc4lVFOdTcBzg501ZmswGwQrBvg/OyEFfE= matrix: - - LANGUAGE=en FAMILY=wikipedia + - LANGUAGE=en FAMILY=wikipedia EXTERNALS_HTTPLIB2=1 - LANGUAGE=ar FAMILY=wikipedia PYSETUP_TEST_EXTRAS=1 - LANGUAGE=test FAMILY=wikidata SITE_ONLY=1 - - LANGUAGE=fr FAMILY=wiktionary SITE_ONLY=1 + - LANGUAGE=fr FAMILY=wiktionary SITE_ONLY=1 EXTERNALS_HTTPLIB2=1

notifications: email: