diff --git a/.gitignore b/.gitignore index e3b302d..45464ab 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ /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 +/OWSLib-0.34.1-filtered.tar.zst +/OWSLib-0.35.0-filtered.tar.zst 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") diff --git a/python-OWSLib.spec b/python-OWSLib.spec index e73f570..a2316a9 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -1,8 +1,8 @@ # 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 +Version: 0.35.0 Release: %autorelease Summary: OGC Web Service utility library @@ -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 @@ -102,9 +112,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" @@ -167,5 +174,11 @@ ignore="${ignore-} --ignore=tests/test_csw_inspire.py" %doc README.md +%files doc +%license LICENSE +%doc README.md +%doc examples/ + + %changelog %autochangelog diff --git a/sources b/sources index 546199e..da0ff49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OWSLib-0.33.0-filtered.tar.zst) = c7fcafce066029620ff538b7e75cf67e3199596bc1920fc0b13320416009554b43db05f051beb4bfaf42994ecd3c6f222625e5a1d3a40229c10f07165fca16ba +SHA512 (OWSLib-0.35.0-filtered.tar.zst) = be1eb52fa09049b720c1ebd476363e01c6442c9905c9adf0d35ccc11f39b228b9f3e64ed882a7c04987f2f38f9c8500a61aeef61e48a41602098ff22df0ed526