From 050f3f9895255525139fda5000d71e933d2bcfdd Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 20 Mar 2025 06:20:01 -0400 Subject: [PATCH 1/5] 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 2/5] 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 82454675d58743912a35e3ac864488fc3abcaaff Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 2 Jun 2025 06:27:19 -0400 Subject: [PATCH 3/5] 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 e26d436b1274e7146a039ce694192adba41372e9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 28 Oct 2025 21:27:09 +0000 Subject: [PATCH 4/5] 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 5/5] 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