Bas Couwenberg pushed to branch master at Debian GIS Project / pycsw
Commits: 190c68be by Bas Couwenberg at 2025-11-18T05:37:59+01:00 Add patch to not use python3-apipkg. (closes: #1120888) - - - - - 49bb33c5 by Bas Couwenberg at 2025-11-18T05:37:59+01:00 Replace python3-tz with python3-pytz. - - - - - 371b387e by Bas Couwenberg at 2025-11-18T05:41:58+01:00 Update lintian overrides. - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/apipkg.patch - debian/patches/series - debian/source/lintian-overrides Changes: ===================================== debian/changelog ===================================== @@ -6,6 +6,9 @@ pycsw (2.6.2+dfsg-3) UNRELEASED; urgency=medium * Drop Rules-Requires-Root: no, default since dpkg 1.22.13. * Use test-build-validate-cleanup instead of test-build-twice. * Add copyright for debian/*. + * Add patch to not use python3-apipkg. + (closes: #1120888) + * Replace python3-tz with python3-pytz. -- Bas Couwenberg <[email protected]> Thu, 20 Mar 2025 06:17:17 +0100 ===================================== debian/control ===================================== @@ -14,21 +14,21 @@ Build-Depends: apache2-dev, dh-sequence-sphinxdoc, procps, python3-all, - python3-apipkg, python3-geolinks, python3-lxml, python3-mock, python3-owslib, python3-pkg-resources, + python3-psycopg2 <!nocheck>, python3-pyproj, python3-pytest, python3-pytest-cov, python3-pytest-timeout, + python3-pytz, python3-setuptools, python3-shapely, python3-sphinx, python3-sqlalchemy, - python3-tz, python3-xmltodict, ronn (>= 0.9.0) Standards-Version: 4.7.2 @@ -65,8 +65,8 @@ Depends: python3-geolinks, python3-owslib, python3-pkg-resources, python3-pyproj, + python3-pytz, python3-shapely, - python3-tz, python3-xmltodict, ${python3:Depends}, ${misc:Depends} ===================================== debian/patches/apipkg.patch ===================================== @@ -0,0 +1,38 @@ +Description: Don't use apipkg, not compatible with pytest 9. + Reverts https://github.com/geopython/pycsw/pull/536 +Author: Bas Couwenberg <[email protected]> +Bug-Debian: https://bugs.debian.org/1120888 +Forwarded: https://github.com/geopython/pycsw/pull/536#issuecomment-3544961862 + +--- a/requirements-dev.txt ++++ b/requirements-dev.txt +@@ -1,7 +1,6 @@ + -r requirements.txt + -r requirements-standalone.txt + +-apipkg>=1.4 + mock>=2.0.0 + Paver>=1.2.4 + pytest>=3.0.3 +--- a/tests/functionaltests/conftest.py ++++ b/tests/functionaltests/conftest.py +@@ -35,18 +35,12 @@ import os + import re + import configparser + +-import apipkg ++import psycopg2 + import pytest + + from pycsw.core import admin + from pycsw.core.config import StaticContext + +-apipkg.initpkg("optionaldependencies", { +- "psycopg2": "psycopg2", +-}) +- +-from optionaldependencies import psycopg2 # NOQA: E402 +- + TESTS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + SuiteDirs = namedtuple("SuiteDirs", [ ===================================== debian/patches/series ===================================== @@ -4,3 +4,4 @@ version-requirements.patch interpreter-path.patch tests_config_path.patch +apipkg.patch ===================================== debian/source/lintian-overrides ===================================== @@ -3,6 +3,7 @@ source-is-missing [docs/_templates/indexsidebar.html] # https://github.com/geopython/pycsw/issues/1089 uses-deprecated-python-stdlib cgi * +uses-deprecated-python-stdlib cgitb * # Not supported by devscripts in trixie older-debian-watch-file-standard 4 * View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/-/compare/728029caeb715c0466e506f9cb6721ad550e9071...371b387e1ab679c914899e3dd7b378a427f03066 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/-/compare/728029caeb715c0466e506f9cb6721ad550e9071...371b387e1ab679c914899e3dd7b378a427f03066 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
