Merge ~enr0n/ubuntu/+source/rdflib-sqlalchemy:fix-lp2025166 into ubuntu/+source/rdflib-sqlalchemy:ubuntu/devel

[Nick Rosbrook]

PPA: https://launchpad.net/~enr0n/+archive/ubuntu/proposed-migration/+packages?field.name_filter=rdflib-sqlalchemy&field.status_filter=published&field.series_filter=

[Julian Andres Klode (juliank)]

I mean this looks good to me, but I'd prefer someone not in foundations to sponsor this so we get more sponsor coverage for Nick's coredev application.

[Athos Ribeiro (athos-ribeiro)]

Hi Nick,

This LGTM in the sense that the proposed change set does fix the FTBFS issues.

Still, there is no context explaining why these changes are necessary, neither in the changelog, nor in this MP or the related bug.

Would you mind providing such context as well? This would ease the review process for a potential sponsor.

In special, it would be nice to understand why the package FTBFS when building on mantic-proposed, but not on mantic or debian unstable, i.e., what delta is being introduced in mantic-proposed which is leading to this failure? This would help us understand if other python packages will also break for this change.

review: Needs Information

[Athos Ribeiro (athos-ribeiro)]

At a first glance, I suspect this is due to the fact that we pulled in dh-python from debian experimental. Here are the relevant dh-python changelog bits:

dh-python (6.20230603) experimental; urgency=medium

  * Bump major version, post-bookworm.

 -- Stefano Rivera <email address hidden> Sat, 03 Jun 2023 10:50:19 -0400

dh-python (5.20230510) experimental; urgency=medium

  * Add support for PEP440 standards-markers in PyDist files (which superseded
    PEP386 almost a decade ago).
  * Add support for tox 4. Avoid needing to do an isolated build of the
    package by using the wheel we built, ourselves. (Closes: #1035675)
    - Packages using the distutils plugin now need python3-wheel installed.
      Raise an error explaining that wheel is needed, if it's missing.
    - Support all 3 potential tox configuration files. (Closes: #1033486)
  * dh_python3: Write a "debian" INSTALLER file into dist-info directories.
    (Closes: #1032133)
  * Use tomllib (available since Python 3.11) instead of tomli.
    (Closes: #1032866)
  * Use cachy as an example dependency instead of tomli, in tests.
  * Add pyproject.toml and pytest.ini to the default testfiles.
    (Closes: #1031609)

I wonder how this affects other python package builds with tox setups in them.

[Athos Ribeiro (athos-ribeiro)]

Once we have more context here (we could confirm if it is really FTBFS due to the dh-python changes), we can either add more context to the bug or to the delta (changelog or patch file).

Once this is done, please add ubuntu-sponsors back to the reviewers list.

[Utkarsh Gupta (utkarsh)]

review: Approve

[Nick Rosbrook (enr0n)]

Thanks for the review, Athos. I will circle back to this next week after vacation and do the upload myself.

diff --git a/debian/changelog b/debian/changelog
index a249a75..66272f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rdflib-sqlalchemy (0.5.4-1ubuntu1) mantic; urgency=medium
+
+  * Fix FTBFS (LP: #2025166):
+    - debian/control: Build-Depends: python3-wheel
+    - d/p/tox-ini-add-pytest-to-allowlist_externals.patch: fix dh_auto_test
+
+ -- Nick Rosbrook <[e-mail]>  Thu, 10 Aug 2023 17:06:21 -0400
+
 rdflib-sqlalchemy (0.5.4-1) unstable; urgency=low
 
   * Initial release. (Closes: #1035108)
diff --git a/debian/control b/debian/control
index a964ac9..8a18c06 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: rdflib-sqlalchemy
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Dominik George <[e-mail]>
 Build-Depends:
     debhelper-compat (= 13),
@@ -16,6 +17,7 @@ Build-Depends:
     python3-pytest-cov,
     python3-psycopg2,
     python3-mysqldb,
+    python3-wheel,
     tox,
 Standards-Version: 4.6.2
 Homepage: https://github.com/RDFLib/rdflib-sqlalchemy
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e091edf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+tox-ini-add-pytest-to-allowlist_externals.patch
diff --git a/debian/patches/tox-ini-add-pytest-to-allowlist_externals.patch b/debian/patches/tox-ini-add-pytest-to-allowlist_externals.patch
new file mode 100644
index 0000000..10260c5
--- /dev/null
+++ b/debian/patches/tox-ini-add-pytest-to-allowlist_externals.patch
@@ -0,0 +1,16 @@
+Description: Add pytest to allowlist_externals
+Author: Nick Rosbrook <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rdflib-sqlalchemy/+bug/2025166
+Forwarded: https://salsa.debian.org/python-team/packages/rdflib-sqlalchemy/-/merge_requests/1
+Last-Update: 2023-06-27
+--- a/tox.ini
++++ b/tox.ini
+@@ -14,6 +14,8 @@
+     psycopg2
+     mysqlclient
+ 
++allowlist_externals = pytest
++
+ [testenv:lint]
+ commands = flake8 rdflib_sqlalchemy test
+ deps =