Merge lp:~maxiberta/django-openid-auth/pip-upgrade-in-tests into lp:django-openid-auth

[Maximiliano Bertacchini]

Upgrade pip before running tests to prevent issues with proxy (tox only).

Old versions of pip (such as the one in Trusty) are unable to download more than 12 dependencies via proxy due to a bug in requests/urllib3.

This fix only affects the pip version used by tox.

Technical details: https://github.com/pypa/pip/issues/1805#issuecomment-70536334
Identical issue in SSO charm: https://code.launchpad.net/~roadmr/canonical-is-charms/canonical-identity-provider-flake8whyyy/+merge/346776

[Daniel Manrique (roadmr)]

LGTM

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/24/

[lp:~maxiberta/django-openid-auth/pip-upgrade-in-tests]

131. By Maximiliano Bertacchini on 2018-08-27

Explicit tox config to upgrade pip before running tests.

[Maximiliano Bertacchini (maxiberta)]

Updated tox config to make it more explicit.

Pip needs to be updated *before* installing any deps, thus tox's `deps` cannot be used.
Pip cannot be upgraded with a custom `install_command`, as tox 1.6.0 in Trusty supports very limited customization (improved in tox 1.7.0 - issue #128).
OTOH, multidimensional configuration could help with `command` deduplication, but it was introduced in tox 1.8.0.

[Daniel Manrique (roadmr)]

Looks OK

review: Approve

=== modified file 'tox.ini'
--- tox.ini	2018-03-15 17:54:12 +0000
+++ tox.ini	2018-08-27 14:32:35 +0000
@@ -1,61 +1,73 @@
+# Pip upgrade in the tox venv is needed due to
+# https://github.com/pypa/pip/issues/1805 which started happening
+# consistently after April 2018 due to
+# https://packaging.python.org/guides/migrating-to-pypi-org/.
+#
+# Pip needs to be updated before installing any deps, thus tox's `deps`
+# cannot be used.
+# Pip cannot be upgraded with a custom `install_command`, as tox 1.6.0 in Trusty
+# supports very limited customization (improved in tox 1.7.0 - issue #128).
+# OTOH, multidimensional configuration could help with `command` deduplication,
+# but it was introduced in tox 1.8.0.
+
 [tox]
 envlist =
     py27-django1.6,py27-django1.7,py27-django1.8,py27-django1.9,py27-django1.10,py27-django1.11,py3-django1.10,py3-django1.11
-
-[testenv]
-commands = python manage.py test django_openid_auth
-deps =
-    mock
-
-[testenv:py27]
-basepython = python2.7
-deps =
-    python-openid
-    {[testenv]deps}
-
-[testenv:py3]
-basepython = python3
-deps =
-    python3-openid
-    {[testenv]deps}
+# sdist crashes without `deps`.
+skipsdist = true
 
 [testenv:py27-django1.6]
-deps =
-    django == 1.6.11
-    south
-    {[testenv:py27]deps}
+basepython = python2.7
+commands =
+    pip install --upgrade pip
+    pip install south mock python-openid django==1.6.11
+    python manage.py test django_openid_auth
 
 [testenv:py27-django1.7]
-deps =
-    django == 1.7.11
-    {[testenv:py27]deps}
+basepython = python2.7
+commands =
+    pip install --upgrade pip
+    pip install south mock python-openid django==1.7.11
+    python manage.py test django_openid_auth
 
 [testenv:py27-django1.8]
-deps =
-    django == 1.8.17
-    {[testenv:py27]deps}
+basepython = python2.7
+commands =
+    pip install --upgrade pip
+    pip install south mock python-openid django==1.8.17
+    python manage.py test django_openid_auth
 
 [testenv:py27-django1.9]
-deps =
-    django == 1.9.12
-    {[testenv:py27]deps}
+basepython = python2.7
+commands =
+    pip install --upgrade pip
+    pip install south mock python-openid django==1.9.12
+    python manage.py test django_openid_auth
 
 [testenv:py27-django1.10]
-deps =
-    django == 1.10.6
-    {[testenv:py27]deps}
+basepython = python2.7
+commands =
+    pip install --upgrade pip
+    pip install south mock python-openid django==1.10.6
+    python manage.py test django_openid_auth
 
 [testenv:py27-django1.11]
-deps =
-    django == 1.11.11
-    {[testenv:py27]deps}
+basepython = python2.7
+commands =
+    pip install --upgrade pip
+    pip install south mock python-openid django==1.11.11
+    python manage.py test django_openid_auth
 
 [testenv:py3-django1.10]
-deps =
-    django == 1.10.6
-    {[testenv:py3]deps}
+basepython = python3
+commands =
+    pip install --upgrade pip
+    pip install south mock python3-openid django==1.10.6
+    python manage.py test django_openid_auth
 
 [testenv:py3-django1.11]
-deps =
-    django == 1.11.11
-    {[testenv:py3]deps}
+basepython = python3
+commands =
+    pip install --upgrade pip
+    pip install south mock python3-openid django==1.11.11
+    python manage.py test django_openid_auth