From 050f3f9895255525139fda5000d71e933d2bcfdd Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 20 Mar 2025 06:20:01 -0400 Subject: [PATCH 01/16] Update the .rpmlintrc file --- python-OWSLib.rpmlintrc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-OWSLib.rpmlintrc b/python-OWSLib.rpmlintrc index 981f880..610479e 100644 --- a/python-OWSLib.rpmlintrc +++ b/python-OWSLib.rpmlintrc @@ -1,2 +1,5 @@ -# All documentation is in the -doc subpackage. -addFilter(r" no-documentation$") +# The source cannot be a URL because we have to filter out files before +# uploading to the lookaside cache. +addFilter(r" invalid-url .* OWSLib-.*-filtered\.tar\.zst") +# There is nothing wrong with .tar.zst, but rpmlint does not know that. +addFilter(r" inconsistent-file-extension .*\.tar\.zst") From 87fcc5711788c6080e5b6f1d7a207608c1680b96 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 20 Mar 2025 06:13:32 -0400 Subject: [PATCH 02/16] Backport to EPEL10 - Restore -doc subpackage, removed in Fedora - Remove spec-file conditionals and let the branches diverge --- python-OWSLib.spec | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/python-OWSLib.spec b/python-OWSLib.spec index e73f570..98eb3e0 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -1,5 +1,5 @@ # Not yet in EPEL10: https://bugzilla.redhat.com/show_bug.cgi?id=2324280 -%bcond pytest_httpserver %{undefined el10} +%bcond pytest_httpserver 0 Name: python-OWSLib Version: 0.33.0 @@ -69,21 +69,31 @@ Summary: %{summary} %py_provides python3-owslib -%if %{undefined el10} -# The -doc subpackage was removed for Fedora 42; we can remove this Obsoletes -# after Fedora 44. (EPEL10 never had a -doc subpackage.) -Obsoletes: python-OWSLIB-doc < 0.32.0-1 -%endif - %description -n python3-OWSLib %{common_description} +%package doc +Summary: Documentation and examples for OWSLib + +%description doc +%{summary}. + + %prep %autosetup -n OWSLib-%{version} # Don’t analyze/report test coverage sed -r -i 's/^([[:blank:]]*)(--cov\b)/\1# \2/' tox.ini +# We don’t need shebangs in the examples. The pattern of selecting files +# before modifying them with sed keeps us from unnecessarily discarding the +# original mtimes on unmodified files. +find 'examples' -type f -name '*.py' \ + -exec gawk '/^#!/ { print FILENAME }; { nextfile }' '{}' '+' | + xargs -r sed -r -i '1{/^#!/d}' +# Some of them, but not all of them, were executable. +chmod -v a-x examples/*.py + %generate_buildrequires %pyproject_buildrequires @@ -167,5 +177,11 @@ ignore="${ignore-} --ignore=tests/test_csw_inspire.py" %doc README.md +%files doc +%license LICENSE +%doc README.md +%doc examples/ + + %changelog %autochangelog From cb73aee3e19a01bcf1f53a4990402d6b28f54647 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 20 Mar 2025 06:20:01 -0400 Subject: [PATCH 03/16] Update the .rpmlintrc file --- python-OWSLib.rpmlintrc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python-OWSLib.rpmlintrc b/python-OWSLib.rpmlintrc index 981f880..694038d 100644 --- a/python-OWSLib.rpmlintrc +++ b/python-OWSLib.rpmlintrc @@ -1,2 +1,7 @@ -# All documentation is in the -doc subpackage. -addFilter(r" no-documentation$") +# The source cannot be a URL because we have to filter out files before +# uploading to the lookaside cache. +addFilter(r" invalid-url .* OWSLib-.*-filtered\.tar\.zst") +# There is nothing wrong with .tar.zst, but rpmlint does not know that. +addFilter(r" inconsistent-file-extension .*\.tar\.zst") +# Removed without replacement in Fedora 42 +addFilter(r" obsolete-not-provided python-OWSLIB-doc") From 03dd0e4fd98fdc45ac6753da2301e06978eec0f5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 20 Mar 2025 06:21:04 -0400 Subject: [PATCH 04/16] Drop conditionals for EPEL10 and let the branches diverge --- python-OWSLib.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/python-OWSLib.spec b/python-OWSLib.spec index e73f570..0ce0f91 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -1,6 +1,3 @@ -# Not yet in EPEL10: https://bugzilla.redhat.com/show_bug.cgi?id=2324280 -%bcond pytest_httpserver %{undefined el10} - Name: python-OWSLib Version: 0.33.0 Release: %autorelease @@ -32,9 +29,7 @@ BuildRequires: python3-devel # Tests; dependencies are in requirements-dev.txt. BuildRequires: %{py3_dist pytest} -%if %{with pytest_httpserver} BuildRequires: %{py3_dist pytest_httpserver} -%endif BuildRequires: %{py3_dist Pillow} # We don’t have pytest-socket packaged, and we can get by without it. # - pytest-socket @@ -69,11 +64,9 @@ Summary: %{summary} %py_provides python3-owslib -%if %{undefined el10} # The -doc subpackage was removed for Fedora 42; we can remove this Obsoletes # after Fedora 44. (EPEL10 never had a -doc subpackage.) Obsoletes: python-OWSLIB-doc < 0.32.0-1 -%endif %description -n python3-OWSLib %{common_description} @@ -156,10 +149,6 @@ k="${k-}${k+ and }not test_md_reference_system" k="${k-}${k+ and }not test_service2" k="${k-}${k+ and }not test_md_distribution" -%if %{without pytest_httpserver} -ignore="${ignore-} --ignore=tests/test_csw_inspire.py" -%endif - %pytest -m 'not online' -k "${k-}" ${ignore-} -v -rs From 8ae1e62c6ee9e7a0703cea4d2727fe5c7c622359 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 20 Mar 2025 06:22:47 -0400 Subject: [PATCH 05/16] Use the provisional pyproject declarative buildsystem --- python-OWSLib.rpmlintrc | 2 ++ python-OWSLib.spec | 24 +++++------------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/python-OWSLib.rpmlintrc b/python-OWSLib.rpmlintrc index 694038d..a1dd3bb 100644 --- a/python-OWSLib.rpmlintrc +++ b/python-OWSLib.rpmlintrc @@ -5,3 +5,5 @@ addFilter(r" invalid-url .* OWSLib-.*-filtered\.tar\.zst") addFilter(r" inconsistent-file-extension .*\.tar\.zst") # Removed without replacement in Fedora 42 addFilter(r" obsolete-not-provided python-OWSLIB-doc") +# At least some of these sections are implicit due to declarative buildsystem +addFilter(r" no-%(prep|build|install)-section") diff --git a/python-OWSLib.spec b/python-OWSLib.spec index 0ce0f91..acd6834 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -23,9 +23,10 @@ URL: https://geopython.github.io/OWSLib Source0: OWSLib-%{version}-filtered.tar.zst Source1: get_source -BuildArch: noarch +BuildSystem: pyproject +BuildOption(install): -l owslib -BuildRequires: python3-devel +BuildArch: noarch # Tests; dependencies are in requirements-dev.txt. BuildRequires: %{py3_dist pytest} @@ -71,27 +72,12 @@ Obsoletes: python-OWSLIB-doc < 0.32.0-1 %description -n python3-OWSLib %{common_description} -%prep -%autosetup -n OWSLib-%{version} - +%prep -a # Don’t analyze/report test coverage sed -r -i 's/^([[:blank:]]*)(--cov\b)/\1# \2/' tox.ini -%generate_buildrequires -%pyproject_buildrequires - - -%build -%pyproject_wheel - - -%install -%pyproject_install -%pyproject_save_files -l owslib - - -%check +%check -a # Otherwise, pytest finds the package twice in the Python path and complains. rm -rf owslib From 10c89a527afeddab9cfd57e811af624b0b2a1056 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 2 Jun 2025 06:29:37 -0400 Subject: [PATCH 06/16] Update .rpmlintrc for current rpmlint --- python-OWSLib.rpmlintrc | 2 -- 1 file changed, 2 deletions(-) diff --git a/python-OWSLib.rpmlintrc b/python-OWSLib.rpmlintrc index a1dd3bb..694038d 100644 --- a/python-OWSLib.rpmlintrc +++ b/python-OWSLib.rpmlintrc @@ -5,5 +5,3 @@ addFilter(r" invalid-url .* OWSLib-.*-filtered\.tar\.zst") addFilter(r" inconsistent-file-extension .*\.tar\.zst") # Removed without replacement in Fedora 42 addFilter(r" obsolete-not-provided python-OWSLIB-doc") -# At least some of these sections are implicit due to declarative buildsystem -addFilter(r" no-%(prep|build|install)-section") From 9d57933e437f0481194a05b6c3655c48a7bcadc2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 2 Jun 2025 06:27:19 -0400 Subject: [PATCH 07/16] Update to 0.34.0 (close RHBZ#2369733) --- .gitignore | 1 + python-OWSLib.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e3b302d..350623f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /OWSLib-0.31.0-filtered.tar.zst /OWSLib-0.32.0-filtered.tar.zst /OWSLib-0.33.0-filtered.tar.zst +/OWSLib-0.34.0-filtered.tar.zst diff --git a/python-OWSLib.spec b/python-OWSLib.spec index acd6834..21c0978 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -1,5 +1,5 @@ Name: python-OWSLib -Version: 0.33.0 +Version: 0.34.0 Release: %autorelease Summary: OGC Web Service utility library diff --git a/sources b/sources index 546199e..c83941e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OWSLib-0.33.0-filtered.tar.zst) = c7fcafce066029620ff538b7e75cf67e3199596bc1920fc0b13320416009554b43db05f051beb4bfaf42994ecd3c6f222625e5a1d3a40229c10f07165fca16ba +SHA512 (OWSLib-0.34.0-filtered.tar.zst) = 98b648d55958bd478e01863355f5921f634c5508fd635c9fa1d291e24a7b62d8afe3dbeba0e4d97e43ffab5e9c6d8fbdb3525e0b1e3d30d97b636d2568cdead0 From 82454675d58743912a35e3ac864488fc3abcaaff Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 2 Jun 2025 06:27:19 -0400 Subject: [PATCH 08/16] Update to 0.34.0 (close RHBZ#2369733) --- .gitignore | 1 + python-OWSLib.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e3b302d..350623f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /OWSLib-0.31.0-filtered.tar.zst /OWSLib-0.32.0-filtered.tar.zst /OWSLib-0.33.0-filtered.tar.zst +/OWSLib-0.34.0-filtered.tar.zst diff --git a/python-OWSLib.spec b/python-OWSLib.spec index 98eb3e0..e77a160 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -2,7 +2,7 @@ %bcond pytest_httpserver 0 Name: python-OWSLib -Version: 0.33.0 +Version: 0.34.0 Release: %autorelease Summary: OGC Web Service utility library diff --git a/sources b/sources index 546199e..c83941e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OWSLib-0.33.0-filtered.tar.zst) = c7fcafce066029620ff538b7e75cf67e3199596bc1920fc0b13320416009554b43db05f051beb4bfaf42994ecd3c6f222625e5a1d3a40229c10f07165fca16ba +SHA512 (OWSLib-0.34.0-filtered.tar.zst) = 98b648d55958bd478e01863355f5921f634c5508fd635c9fa1d291e24a7b62d8afe3dbeba0e4d97e43ffab5e9c6d8fbdb3525e0b1e3d30d97b636d2568cdead0 From cf30edef349ac1f7d952a9cb9e0c6e84a1e4b7df Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 16:24:10 +0200 Subject: [PATCH 09/16] Rebuilt for Python 3.14 From 49af8de6ee5162337e567f7b5df409841c243c0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 06:26:40 +0000 Subject: [PATCH 10/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 17440b316fe23da586a9a9cc18a348e94898d761 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:19:00 +0200 Subject: [PATCH 11/16] Rebuilt for Python 3.14.0rc2 bytecode From 529c86e79e9b055b814c41919ba29341092fd336 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 13:55:22 +0200 Subject: [PATCH 12/16] Rebuilt for Python 3.14.0rc3 bytecode From f5e3a97e3af7f2121ad1551b6cdf755156d555a6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 28 Oct 2025 21:27:09 +0000 Subject: [PATCH 13/16] Update to 0.34.1 --- .gitignore | 1 + python-OWSLib.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 350623f..e3fbb2a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /OWSLib-0.32.0-filtered.tar.zst /OWSLib-0.33.0-filtered.tar.zst /OWSLib-0.34.0-filtered.tar.zst +/OWSLib-0.34.1-filtered.tar.zst diff --git a/python-OWSLib.spec b/python-OWSLib.spec index 21c0978..82730c7 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -1,5 +1,5 @@ Name: python-OWSLib -Version: 0.34.0 +Version: 0.34.1 Release: %autorelease Summary: OGC Web Service utility library diff --git a/sources b/sources index c83941e..ccdfaf2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OWSLib-0.34.0-filtered.tar.zst) = 98b648d55958bd478e01863355f5921f634c5508fd635c9fa1d291e24a7b62d8afe3dbeba0e4d97e43ffab5e9c6d8fbdb3525e0b1e3d30d97b636d2568cdead0 +SHA512 (OWSLib-0.34.1-filtered.tar.zst) = fc963f8b8e6c0cb27453334b35e362c95d0854229bf9cd6205b99e66a3bd9107ebabf59f4fee0091397039b20bfdbdd406a19a48e2a777c1ab9b68ee0f788438 From 1958d8a0f469c4e8bf97fb1f767feb5d6f661b42 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 28 Oct 2025 21:29:11 +0000 Subject: [PATCH 14/16] Update to 0.35.0 (close RHBZ#2406840) --- .gitignore | 1 + python-OWSLib.spec | 5 +---- sources | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e3fbb2a..45464ab 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /OWSLib-0.33.0-filtered.tar.zst /OWSLib-0.34.0-filtered.tar.zst /OWSLib-0.34.1-filtered.tar.zst +/OWSLib-0.35.0-filtered.tar.zst diff --git a/python-OWSLib.spec b/python-OWSLib.spec index 82730c7..a44a326 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -1,5 +1,5 @@ Name: python-OWSLib -Version: 0.34.1 +Version: 0.35.0 Release: %autorelease Summary: OGC Web Service utility library @@ -81,9 +81,6 @@ sed -r -i 's/^([[:blank:]]*)(--cov\b)/\1# \2/' tox.ini # Otherwise, pytest finds the package twice in the Python path and complains. rm -rf owslib -# This requires network access (during test collection!) -ignore="${ignore-} --ignore=tests/test_ogcapi_connectedsystems_osh.py" - # These require test data files from tests/resources/, which we have removed: ignore="${ignore-} --ignore-glob=tests/doctests/*.txt" k="${k-}${k+ and }not test_gm03" diff --git a/sources b/sources index ccdfaf2..da0ff49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OWSLib-0.34.1-filtered.tar.zst) = fc963f8b8e6c0cb27453334b35e362c95d0854229bf9cd6205b99e66a3bd9107ebabf59f4fee0091397039b20bfdbdd406a19a48e2a777c1ab9b68ee0f788438 +SHA512 (OWSLib-0.35.0-filtered.tar.zst) = be1eb52fa09049b720c1ebd476363e01c6442c9905c9adf0d35ccc11f39b228b9f3e64ed882a7c04987f2f38f9c8500a61aeef61e48a41602098ff22df0ed526 From e26d436b1274e7146a039ce694192adba41372e9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 28 Oct 2025 21:27:09 +0000 Subject: [PATCH 15/16] Update to 0.34.1 --- .gitignore | 1 + python-OWSLib.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 350623f..e3fbb2a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /OWSLib-0.32.0-filtered.tar.zst /OWSLib-0.33.0-filtered.tar.zst /OWSLib-0.34.0-filtered.tar.zst +/OWSLib-0.34.1-filtered.tar.zst diff --git a/python-OWSLib.spec b/python-OWSLib.spec index e77a160..085fa08 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -2,7 +2,7 @@ %bcond pytest_httpserver 0 Name: python-OWSLib -Version: 0.34.0 +Version: 0.34.1 Release: %autorelease Summary: OGC Web Service utility library diff --git a/sources b/sources index c83941e..ccdfaf2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OWSLib-0.34.0-filtered.tar.zst) = 98b648d55958bd478e01863355f5921f634c5508fd635c9fa1d291e24a7b62d8afe3dbeba0e4d97e43ffab5e9c6d8fbdb3525e0b1e3d30d97b636d2568cdead0 +SHA512 (OWSLib-0.34.1-filtered.tar.zst) = fc963f8b8e6c0cb27453334b35e362c95d0854229bf9cd6205b99e66a3bd9107ebabf59f4fee0091397039b20bfdbdd406a19a48e2a777c1ab9b68ee0f788438 From 44a3b31fe7ae27549ef6aaf048fc382903a578e6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 28 Oct 2025 21:29:11 +0000 Subject: [PATCH 16/16] Update to 0.35.0 (close RHBZ#2406840) --- .gitignore | 1 + python-OWSLib.spec | 5 +---- sources | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e3fbb2a..45464ab 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /OWSLib-0.33.0-filtered.tar.zst /OWSLib-0.34.0-filtered.tar.zst /OWSLib-0.34.1-filtered.tar.zst +/OWSLib-0.35.0-filtered.tar.zst diff --git a/python-OWSLib.spec b/python-OWSLib.spec index 085fa08..a2316a9 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -2,7 +2,7 @@ %bcond pytest_httpserver 0 Name: python-OWSLib -Version: 0.34.1 +Version: 0.35.0 Release: %autorelease Summary: OGC Web Service utility library @@ -112,9 +112,6 @@ chmod -v a-x examples/*.py # Otherwise, pytest finds the package twice in the Python path and complains. rm -rf owslib -# This requires network access (during test collection!) -ignore="${ignore-} --ignore=tests/test_ogcapi_connectedsystems_osh.py" - # These require test data files from tests/resources/, which we have removed: ignore="${ignore-} --ignore-glob=tests/doctests/*.txt" k="${k-}${k+ and }not test_gm03" diff --git a/sources b/sources index ccdfaf2..da0ff49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OWSLib-0.34.1-filtered.tar.zst) = fc963f8b8e6c0cb27453334b35e362c95d0854229bf9cd6205b99e66a3bd9107ebabf59f4fee0091397039b20bfdbdd406a19a48e2a777c1ab9b68ee0f788438 +SHA512 (OWSLib-0.35.0-filtered.tar.zst) = be1eb52fa09049b720c1ebd476363e01c6442c9905c9adf0d35ccc11f39b228b9f3e64ed882a7c04987f2f38f9c8500a61aeef61e48a41602098ff22df0ed526