[Git][debian-gis-team/mapproxy][master] 2 commits: Make pytest more verbose.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / mapproxy


Commits:
bf1017f1 by Bas Couwenberg at 2025-09-03T14:38:38+02:00
Make pytest more verbose.

- - - - -
6e9b5e2d by Bas Couwenberg at 2025-09-03T14:38:38+02:00
Add patch to fix FTBFS with jsonschema 4.25. (closes: #1113852)

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/jsonschema-4.25.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mapproxy (5.0.0+dfsg-3) UNRELEASED; urgency=medium
+
+  * Make pytest more verbose.
+  * Add patch to fix FTBFS with jsonschema 4.25.
+    (closes: #1113852)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 03 Sep 2025 14:08:50 +0200
+
 mapproxy (5.0.0+dfsg-2) unstable; urgency=medium
 
   * Update xfail.patch to fix FTBFS with lxml rebuild for libxml2 2.14.


=====================================
debian/patches/jsonschema-4.25.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Fix test failure with jsonschema 4.25.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapproxy/mapproxy/pull/1240
+
+--- a/mapproxy/test/unit/test_conf_validator.py
++++ b/mapproxy/test/unit/test_conf_validator.py
+@@ -80,8 +80,13 @@ class TestValidator(object):
+         ''')
+ 
+         errors = validate(conf)
+-        assert errors == [
+-            "[] is too short in root.layers[0].sources"
++        assert errors in [
++            [
++                "[] is too short in root.layers[0].sources"
++            ],
++            [
++                "[] should be non-empty in root.layers[0].sources"
++            ]
+         ]
+ 
+     def test_missing_cache_source(self):


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ mapnik.patch
 javascript.patch
 version.patch
 xfail.patch
+jsonschema-4.25.patch


=====================================
debian/rules
=====================================
@@ -4,6 +4,7 @@
 
 export PYBUILD_NAME=mapproxy
 export PYBUILD_BEFORE_TEST=mkdir -p {build_dir}/mapproxy && cp -r {dir}/mapproxy/test {build_dir}/mapproxy
+export PYBUILD_TEST_ARGS=-vv
 
 include /usr/share/dpkg/pkg-info.mk
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/compare/605389c28d9744102fce04b9c55e19dcb638b448...6e9b5e2df7511eefa273be8224a11c4beb15f585

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/compare/605389c28d9744102fce04b9c55e19dcb638b448...6e9b5e2df7511eefa273be8224a11c4beb15f585
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250903/4365f09f/attachment-0001.htm>