Merge ~paelzer/ubuntu/+source/postgresql-pgmp:fix-tests-python3-transition into ~paelzer/ubuntu/+source/postgresql-pgmp:importer/ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3904/+packages
Bileto: https://bileto.ubuntu.com/#/ticket/3904
Bug: https://bugs.launchpad.net/ubuntu/+source/postgresql-pgmp/+bug/1861273
Upstream: https://github.com/dvarrazzo/pgmp/issues/16

I'll update once I have test results.

[Christian Ehrhardt  (paelzer)]

review: Abstain

[Christian Ehrhardt  (paelzer)]

With the fix all tests are good again:
https://bileto.ubuntu.com/excuses/3904/focal.html

[Andreas Hasenack (ahasenack)]

+1, minor issues inline which you can choose to change or not.

review: Approve

[Christian Ehrhardt  (paelzer)]

Done - thanks

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading postgresql-pgmp_1.0.2-8ubuntu1.dsc: done.
  Uploading postgresql-pgmp_1.0.2-8ubuntu1.debian.tar.xz: done.
  Uploading postgresql-pgmp_1.0.2-8ubuntu1_source.buildinfo: done.
  Uploading postgresql-pgmp_1.0.2-8ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated into focal.

diff --git a/debian/changelog b/debian/changelog
index 7dd9591..95cf5d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+postgresql-pgmp (1.0.2-8ubuntu1) focal; urgency=medium
+
+  * explicitly use python2 until python3 is supported (LP: #1861273)
+    - d/control[.in]: bump build dependencies to explcit 2
+    - d/p/use-python2.patch: update script headers to call python2
+    - d/t/control: bump test dependencies to explcit 2
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 29 Jan 2020 12:27:31 +0100
+
 postgresql-pgmp (1.0.2-8) unstable; urgency=medium
 
   * Upload for PostgreSQL 12.
diff --git a/debian/control b/debian/control
index edeaabf..86551aa 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 Source: postgresql-pgmp
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
 Uploaders: Christoph Berg <[e-mail]>
-Build-Depends: debhelper (>= 9), libgmp-dev, postgresql-server-dev-all (>= 158~), python-minimal
+Build-Depends: debhelper (>= 9), libgmp-dev, postgresql-server-dev-all (>= 158~), python2-minimal
 Standards-Version: 4.1.1
 Homepage: https://github.com/dvarrazzo/pgmp
 Vcs-Git: https://salsa.debian.org/postgresql/postgresql-pgmp.git
diff --git a/debian/control.in b/debian/control.in
index 70e992f..b0b6ccf 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,9 +1,10 @@
 Source: postgresql-pgmp
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
 Uploaders: Christoph Berg <[e-mail]>
-Build-Depends: debhelper (>= 9), libgmp-dev, postgresql-server-dev-all (>= 158~), python-minimal
+Build-Depends: debhelper (>= 9), libgmp-dev, postgresql-server-dev-all (>= 158~), python2-minimal
 Standards-Version: 4.1.1
 Homepage: https://github.com/dvarrazzo/pgmp
 Vcs-Git: https://salsa.debian.org/postgresql/postgresql-pgmp.git
diff --git a/debian/patches/series b/debian/patches/series
index 9df8b37..7f9c027 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ makefile-reproducible
 9.5
 10
 12
+use-python2.patch
diff --git a/debian/patches/use-python2.patch b/debian/patches/use-python2.patch
new file mode 100644
index 0000000..9aa4d1e
--- /dev/null
+++ b/debian/patches/use-python2.patch
@@ -0,0 +1,47 @@
+Description: Use python2 explicitly until python3 support is ready
+ Upstream needs to implement python3, until then lets make the python usage
+ explicitly based on python2 to avoid failures and resolve dependency
+ issues as just "python" no more exists (as package) and is pytohn3 (as binary).
+Forwarded: https://github.com/dvarrazzo/pgmp/issues/16
+Author: Christian Ehrhardt <[e-mail]>
+Last-Update: 2019-01-29
+--- a/sandbox/bench/benchmark.py
++++ b/sandbox/bench/benchmark.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ """Script to perform comparisons between pmpz and other data types.
+ 
+ Copyright (C) 2011 - Daniele Varrazzo
+--- a/sandbox/bench/plot_result.py
++++ b/sandbox/bench/plot_result.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ """Plot a result from benchmark.py
+ 
+ Copyright (C) 2011 - Daniele Varrazzo
+--- a/sandbox/pi/calc_pi.py
++++ b/sandbox/pi/calc_pi.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ """
+ A script to calculate pi using parallel PostgreSQL processes.
+ 
+--- a/tools/sql2extension.py
++++ b/tools/sql2extension.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ """Generate "ALTER EXTENSION" statements to package a list of SQL definitions.
+ 
+ The script doesn't try to be a robust parser: it relies on the input file
+--- a/tools/unmix.py
++++ b/tools/unmix.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ """Convert a file containing a mix of python code and content into content.
+ 
+ Write the input file to stdout. Python code included between blocks
diff --git a/debian/tests/control b/debian/tests/control
index b3a7b37..9d9b525 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: installcheck
-Depends: @, postgresql-server-dev-all, python
+Depends: @, postgresql-server-dev-all, python2
 Restrictions: allow-stderr