Source: xyzservices
Version: 2022.9.0-1
Severity: important
Tags: ftbfs patch
Control: block 1025244 by -1
Dear Maintainer,
The mercantile package is unmaintained and is going to be removed (#1025244).
You package needs the attached patch to not FTBFS without mercantile.
Please apply the patch before the bookworm freeze (or adopt the mercantile
package).
Kind Regards,
Bas
diff -Nru xyzservices-2022.9.0/debian/changelog
xyzservices-2022.9.0/debian/changelog
--- xyzservices-2022.9.0/debian/changelog 2022-10-25 17:04:47.000000000
+0200
+++ xyzservices-2022.9.0/debian/changelog 2022-12-01 13:50:57.000000000
+0100
@@ -1,3 +1,10 @@
+xyzservices (2022.9.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch to skip tests when mercantile is not available.
+
+ -- Bas Couwenberg <sebas...@debian.org> Thu, 01 Dec 2022 13:50:57 +0100
+
xyzservices (2022.9.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru xyzservices-2022.9.0/debian/control
xyzservices-2022.9.0/debian/control
--- xyzservices-2022.9.0/debian/control 2022-07-26 09:07:29.000000000 +0200
+++ xyzservices-2022.9.0/debian/control 2022-12-01 13:42:48.000000000 +0100
@@ -6,7 +6,6 @@
Build-Depends: debhelper-compat (= 13),
dh-sequence-python3,
python3-all,
- python3-mercantile,
python3-pytest <!nocheck>,
python3-requests,
python3-setuptools
diff -Nru xyzservices-2022.9.0/debian/patches/mercantile.patch
xyzservices-2022.9.0/debian/patches/mercantile.patch
--- xyzservices-2022.9.0/debian/patches/mercantile.patch 1970-01-01
01:00:00.000000000 +0100
+++ xyzservices-2022.9.0/debian/patches/mercantile.patch 2022-12-01
13:50:47.000000000 +0100
@@ -0,0 +1,15 @@
+Description: Skip tests when mercantile is not available.
+Author: Bas Couwenberg <sebas...@debian.org>
+Forwarded: not-needed
+
+--- a/xyzservices/tests/test_providers.py
++++ b/xyzservices/tests/test_providers.py
+@@ -3,7 +3,7 @@ import os
+ import pytest
+ import xyzservices.providers as xyz
+ import requests
+-import mercantile
++pytest.importorskip("mercantile")
+
+ flat_free = xyz.filter(requires_token=False).flatten()
+
diff -Nru xyzservices-2022.9.0/debian/patches/series
xyzservices-2022.9.0/debian/patches/series
--- xyzservices-2022.9.0/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ xyzservices-2022.9.0/debian/patches/series 2022-12-01 13:44:32.000000000
+0100
@@ -0,0 +1 @@
+mercantile.patch
diff -Nru xyzservices-2022.9.0/debian/tests/control
xyzservices-2022.9.0/debian/tests/control
--- xyzservices-2022.9.0/debian/tests/control 2022-06-28 19:34:40.000000000
+0200
+++ xyzservices-2022.9.0/debian/tests/control 2022-12-01 13:43:05.000000000
+0100
@@ -1,2 +1,2 @@
Tests: run-tests
-Depends: python3-all, python3-mercantile, python3-pytest, python3-requests, @
+Depends: python3-all, python3-pytest, python3-requests, @
