Merge ~pappacena/turnip:upgrade-python-openid2 into turnip:master

[Thiago F. Pappacena]

Upgrading python-openid to python-openid2

[Thiago F. Pappacena (pappacena)]

Depends on https://code.launchpad.net/~pappacena/turnip/+git/turnip-dependencies/+merge/384937 .

[Colin Watson (cjwatson)]

Your changes themselves look OK, and python-openid2 is probably the best choice of Python-3-compatible replacements for python-openid. However, when I tried to convert Launchpad itself to it, I found that it has normalisation problems that specifically affect the OpenID identity URLs used by SSO. turnip's test suite doesn't currently exercise its OpenID handling very much (if at all?), but Launchpad's test suite picks this up, and I *think* it will affect attempting to log into turnip using SSO. I'd advise holding off on this until python-openid2 is fixed, and then upgrading to a fixed version before landing this.

See my upstream PR for more details:

  https://github.com/ziima/python-openid/pull/41

review: Needs Fixing

[Colin Watson (cjwatson)]

I believe you should be able to bump this to python-openid2 3.2 now, and then it should be fine.

[Thiago F. Pappacena (pappacena)]

Added the corresponding packages dependencies in a new MP: https://code.launchpad.net/~pappacena/turnip/+git/turnip-dependencies/+merge/389135.

[Colin Watson (cjwatson)]

review: Approve

[Otto Co-Pilot (otto-copilot)]

Merging failed
https://jenkins.ols.canonical.com/online-services/job/turnip/163/

diff --git a/requirements.txt b/requirements.txt
index 4c5f050..6761175 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,14 +7,14 @@ bcrypt==3.1.7
 beautifulsoup4==4.6.3
 billiard==3.6.3.0
 celery==4.4.6
-cffi==1.14.0
+cffi==1.14.1
 configparser==4.0.2
 constantly==15.1.0
 contextlib2==0.6.0.post1
 cornice==3.6.1
-cryptography==2.8
+cryptography==3.0
 docutils==0.14
-enum34==1.1.9
+enum34==1.1.10
 envdir==0.7
 extras==1.0.0
 fixtures==3.0.0
@@ -32,6 +32,7 @@ ipaddress==1.0.23
 kombu==4.6.11
 lazr.sshserver==0.1.8
 linecache2==1.0.0
+lxml==4.5.2
 m2r==0.1.14
 mccabe==0.3
 mistune==0.8.3
@@ -49,17 +50,14 @@ pyflakes==0.8.1
 pygit2==0.27.4
 pyramid==1.10.4
 python-mimeparse==1.6.0
-# XXX: deryck 2012-08-10
-# See lp:~deryck/python-openid/python-openid-fix1034376 which
-# reapplied a patch from wgrant to get codehosting going again.
-python-openid==2.2.5-fix1034376
+python-openid2==3.2
 pytz==2020.1
 PyYAML==5.3
 repoze.lru==0.6
 scandir==1.10.0
 setuptools-scm==1.17.0
 simplejson==3.6.5
-six==1.14.0
+six==1.15.0
 testscenarios-0.5.0
 testtools==2.4.0
 traceback2==1.4.0
diff --git a/setup.py b/setup.py
index 44507da..5cfae76 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ requires = [
     'lazr.sshserver>=0.1.7',
     'Paste',
     'pygit2>=0.27.4,<0.28.0',
-    'python-openid',
+    'python-openid2',
     'PyYAML',
     'Twisted[conch]',
     'waitress',
diff --git a/system-dependencies.txt b/system-dependencies.txt
index 8c668f0..6cee8e7 100644
--- a/system-dependencies.txt
+++ b/system-dependencies.txt
@@ -4,6 +4,8 @@ git
 libffi-dev
 libgit2-27
 libssl-dev
+libxml2-dev
+libxslt1-dev
 python-dev
 rabbitmq-server
 virtualenv