diff --git a/.gitignore b/.gitignore index f49408a..45464ab 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,15 @@ /OWSLib-0.27.2.tar.gz /OWSLib-0.28.0.tar.gz /OWSLib-0.28.1.tar.gz -/OWSLib-0.28.1-filtered.tar.zst +/OWSLib-0.29.0.tar.gz +/OWSLib-0.29.1.tar.gz +/OWSLib-0.29.2.tar.gz +/OWSLib-0.29.3.tar.gz +/OWSLib-0.30.0.tar.gz +/OWSLib-0.30.0-filtered.tar.zst +/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..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") diff --git a/python-OWSLib.spec b/python-OWSLib.spec index b079441..a44a326 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -1,15 +1,5 @@ -# Sphinx-generated HTML documentation is not suitable for packaging; see -# https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. -# -# We can generate PDF documentation as a substitute. However, EPEL9 is -# currently missing some documentation dependencies: -# - python-ipykernel -# - python-nbconvert -# - python-nbsphinx -%bcond doc_pdf 0 - Name: python-OWSLib -Version: 0.28.1 +Version: 0.35.0 Release: %autorelease Summary: OGC Web Service utility library @@ -33,16 +23,29 @@ URL: https://geopython.github.io/OWSLib Source0: OWSLib-%{version}-filtered.tar.zst Source1: get_source +BuildSystem: pyproject +BuildOption(install): -l owslib + BuildArch: noarch -BuildRequires: python3-devel - -%if %{with doc_pdf} -BuildRequires: make -BuildRequires: python3-sphinx-latex -BuildRequires: latexmk -BuildRequires: pandoc -%endif +# Tests; dependencies are in requirements-dev.txt. +BuildRequires: %{py3_dist pytest} +BuildRequires: %{py3_dist pytest_httpserver} +BuildRequires: %{py3_dist Pillow} +# We don’t have pytest-socket packaged, and we can get by without it. +# - pytest-socket +# We don’t use tox to run the tests. It would run "python3 setup.py develop", +# which is unwanted. +# - tox +# Unwanted linting/coverage dependencies: +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters +# - coverage +# - coveralls +# - flake8 +# - pytest-cov +# These are just for the maintainer to upload to PyPI. +# - build +# - twine %global common_description %{expand: OWSLib is a Python package for client programming with Open Geospatial @@ -62,69 +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/[-]-cov[^[:blank:]]*[[:blank:]][^[[:blank:]]+//g' tox.ini -# Don’t generate linting/coverage dependencies. -# -# We don’t have python3dist(pandoc) packaged, and besides, we don’t actually -# need python3dist(pandoc)—only the pandoc command-line tool, which we have -# manually BR’d. -# -# Don’t generate twine dependency, which is just for the upstream maintainer -# uploading to PyPI. -sed -r -e '/^(flake8|pytest-cov|pandoc|coverage|coveralls|twine)\b/d' \ -%if %{without doc_pdf} - -e '/^(ipykernel|nbconvert|.*sphinx)/d' \ -%endif - requirements-dev.txt | tee requirements-dev-filtered.txt - -# 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 - -# Because at least one notebook requires Internet access, we must continue past -# notebook errors when building documentation. -echo 'nbsphinx_allow_errors = True' >> docs/conf.py +sed -r -i 's/^([[:blank:]]*)(--cov\b)/\1# \2/' tox.ini -%generate_buildrequires -%pyproject_buildrequires requirements-dev-filtered.txt - - -%build -%pyproject_wheel - -%if %{with doc_pdf} -PYTHONPATH="${PWD}" %make_build -C docs latex \ - SPHINXOPTS='-j%{?_smp_build_ncpus}' -%make_build -C docs/build/latex/en LATEXMKOPTS='-quiet' -%endif - - -%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 @@ -160,24 +113,30 @@ ignore="${ignore-} --ignore=tests/test_wps_getcapabilities_ceda.py" ignore="${ignore-} --ignore=tests/test_wps_getcapabilities_usgs.py" ignore="${ignore-} --ignore-glob=tests/test_wps_request*.py" ignore="${ignore-} --ignore-glob=tests/test_wps_response*.py" -# Not in 0.30.0: -k="${k-}${k+ and }not test_wmts_example_informatievlaanderen" +k="${k-}${k+ and }not test_metadata" +k="${k-}${k+ and }not test_responsibility" +k="${k-}${k+ and }not test_distributor" +k="${k-}${k+ and }not test_online_distribution" +k="${k-}${k+ and }not test_identification" +k="${k-}${k+ and }not test_identification_contact" +k="${k-}${k+ and }not test_identification_date" +k="${k-}${k+ and }not test_identification_extent" +k="${k-}${k+ and }not test_identification_keywords" +k="${k-}${k+ and }not test_get_all_contacts" +k="${k-}${k+ and }not test_aus" +k="${k-}${k+ and }not test_service" +k="${k-}${k+ and }not test_md_featurecataloguedesc" +k="${k-}${k+ and }not test_md_imagedescription" +k="${k-}${k+ and }not test_dq_dataquality" +k="${k-}${k+ and }not test_md_reference_system" +k="${k-}${k+ and }not test_service2" +k="${k-}${k+ and }not test_md_distribution" %pytest -m 'not online' -k "${k-}" ${ignore-} -v -rs %files -n python3-OWSLib -f %{pyproject_files} - - -%files doc -%license LICENSE -%doc AUTHORS.rst -%doc CHANGES.rst -%doc README.rst -%doc examples -%if %{with doc_pdf} -%doc docs/build/latex/en/OWSLib.pdf -%endif +%doc README.md %changelog diff --git a/sources b/sources index ab670fa..da0ff49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OWSLib-0.28.1-filtered.tar.zst) = b32734fb953612e617ab28387ae55c349b8ce119454c712e7c425322d952895031c0fb15f6614a17bb34e7588cd5f90ccfcb2cc1eba1a719c569d3ae4eb44684 +SHA512 (OWSLib-0.35.0-filtered.tar.zst) = be1eb52fa09049b720c1ebd476363e01c6442c9905c9adf0d35ccc11f39b228b9f3e64ed882a7c04987f2f38f9c8500a61aeef61e48a41602098ff22df0ed526