Merge ~paelzer/ubuntu/+source/ssoclient:drop-py2 into ~paelzer/ubuntu/+source/ssoclient:importer/ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Not in main, therefore a local git repo.

Tests work in VM:
...
autopkgtest [09:53:00]: test command1: python3 -c "import ssoclient; print(ssoclient.__version__)"
autopkgtest [09:53:00]: test command1: [-----------------------
2.1.1
autopkgtest [09:53:02]: test command1: -----------------------]
autopkgtest [09:53:03]: test command1: - - - - - - - - - - results - - - - - - - - - -
command1 PASS
autopkgtest [09:53:03]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
qemu-system-x86_64: terminating on signal 15 from pid 20454 (/usr/bin/python3)

Build in PPA:
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3885/+packages

Bileto run ongoing at ticket: https://bileto.ubuntu.com/#/ticket/3885

[Christian Ehrhardt  (paelzer)]

Test results on infra: https://bileto.ubuntu.com/excuses/3885/focal.html

[Lucas Kanashiro (lucaskanashiro)]

+1, LGTM.

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, uploaded

diff --git a/debian/changelog b/debian/changelog
index fe199d9..6d801db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ssoclient (2.1.2) focal; urgency=medium
+
+  * drop python2 for Ubuntu 20.04
+    - d/control: drop python2 build dependencies
+    - d/control: drop python-ssoclient package
+    - d/t/control: drop testing the python2 binary package
+    - d/rules: drop python2 from dh call
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 09 Jan 2020 08:04:42 +0100
+
 ssoclient (2.1.1build1) focal; urgency=medium
 
   * No-change rebuild to generate dependencies on python2.
diff --git a/debian/control b/debian/control
index 4cf9b60..8e98306 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,6 @@ Priority: extra
 Maintainer: Ricardo Kirkner <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-python,
-               python-all (>= 2.7),
-               python-setuptools,
-               python-requests,
-               python-requests-oauthlib,
-               python-mock,
                python3-all (>= 3.4),
                python3-setuptools,
                python3-requests,
@@ -18,18 +13,6 @@ Homepage: https://launchpad.net/~canonical-isd-hackers/canonical-identity-provid
 Standards-Version: 3.9.6
 X-Python3-Version: >= 3.4
 
-Package: python-ssoclient
-Architecture: all
-Depends: python-requests-oauthlib,
-         python-requests,
-         ${misc:Depends},
-         ${python:Depends}
-Description: Simple client for the Ubuntu One SSO API (Python 2)
- This package provides a client based on a thin wrapper of
- the Ubuntu One SSO API (v2).
- .
- This package installs the client for Python 2.
-
 Package: python3-ssoclient
 Architecture: all
 Depends: python3-requests-oauthlib,
diff --git a/debian/rules b/debian/rules
index 05b6711..eb9c744 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@
 export PYBUILD_NAME = ssoclient
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
diff --git a/debian/tests/control b/debian/tests/control
index 1ddc050..c62d633 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,2 @@
 Test-Command: python3 -c "import ssoclient; print(ssoclient.__version__)"
 Depends: python3-ssoclient
-
-Test-Command: python -c "import ssoclient; print(ssoclient.__version__)"
-Depends: python-ssoclient