diff --git a/python-OWSLib.rpmlintrc b/python-OWSLib.rpmlintrc index 610479e..694038d 100644 --- a/python-OWSLib.rpmlintrc +++ b/python-OWSLib.rpmlintrc @@ -3,3 +3,5 @@ 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") diff --git a/python-OWSLib.spec b/python-OWSLib.spec index a2316a9..a44a326 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 0 - Name: python-OWSLib Version: 0.35.0 Release: %autorelease @@ -26,15 +23,14 @@ 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} -%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,46 +65,19 @@ Summary: %{summary} %py_provides python3-owslib +# 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 + %description -n python3-OWSLib %{common_description} -%package doc -Summary: Documentation and examples for OWSLib - -%description doc -%{summary}. - - -%prep -%autosetup -n OWSLib-%{version} - +%prep -a # 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 - - -%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 @@ -163,10 +132,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 @@ -174,11 +139,5 @@ ignore="${ignore-} --ignore=tests/test_csw_inspire.py" %doc README.md -%files doc -%license LICENSE -%doc README.md -%doc examples/ - - %changelog %autochangelog