From 050ce07c62ada5da601dec1760df44eb06fa84f8 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 8 Mar 2023 08:43:34 -0500
Subject: [PATCH] Update to 0.9.2

- Drop the Python 3 subpackage (which was never actually built as an
  update) since pyproj is not available
---
 .gitignore         |  1 +
 python-OWSLib.spec | 46 +++++++++++++++++++++++++++++++++++++++++-----
 sources            |  2 +-
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3a838b..7c7afe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /OWSLib-0.8.12.tar.gz
 /OWSLib-0.8.13.tar.gz
 /OWSLib-0.9.0.tar.gz
+/OWSLib-0.9.2.tar.gz
diff --git a/python-OWSLib.spec b/python-OWSLib.spec
index d769efb..5c69cf3 100644
--- a/python-OWSLib.spec
+++ b/python-OWSLib.spec
@@ -1,7 +1,10 @@
 # Works with either ElementTree or python-lxml
 
+# No pyproj for Python 3 in EPEL7
+%bcond_with python3
+
 Name:           python-OWSLib
-Version:        0.9.0
+Version:        0.9.2
 Release:        %autorelease
 Summary:        Client library for OGC web services
 
@@ -29,16 +32,19 @@ BuildRequires:  python2-setuptools
 BuildRequires:  python2-pytest
 
 BuildRequires:  python2-dateutil >= 1.5
-BuildRequires:  python2-requests
+BuildRequires:  python2-requests >= 1.0
 BuildRequires:  python2-pytz
+BuildRequires:  pyproj
 
 Requires:       python2-dateutil >= 1.5
-Requires:       python2-requests
+Requires:       python2-requests >= 1.0
 Requires:       python2-pytz
+Requires:       python2-pyproj
 
 %description -n python2-OWSLib %{common_description}
 
 
+%if %{with python3}
 %package -n python%{python3_pkgversion}-OWSLib
 Summary:        %{summary}
 
@@ -49,14 +55,17 @@ BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python%{python3_pkgversion}-pytest
 
 BuildRequires:  python%{python3_pkgversion}-dateutil >= 1.5
-BuildRequires:  python%{python3_pkgversion}-requests >= 2.7
+BuildRequires:  python%{python3_pkgversion}-requests >= 1.0
 BuildRequires:  python%{python3_pkgversion}-pytz
+BuildRequires:  python%{python3_pkgversion}-pyproj
 
 Requires:       python%{python3_pkgversion}-dateutil >= 1.5
-Requires:       python%{python3_pkgversion}-requests >= 2.7
+Requires:       python%{python3_pkgversion}-requests >= 1.0
 Requires:       python%{python3_pkgversion}-pytz
+Requires:       python%{python3_pkgversion}-pyproj
 
 %description -n python%{python3_pkgversion}-OWSLib %{common_description}
+%endif
 
 
 %prep
@@ -75,12 +84,16 @@ sed -r -i 's/--cov[^[:blank:]=]*([=[:blank:]][^-][^[:blank:]]+)?//g' tox.ini
 
 %build
 %py2_build
+%if %{with python3}
 %py3_build
+%endif
 
 
 %install
 %py2_install
+%if %{with python3}
 %py3_install
+%endif
 
 
 %check
@@ -103,7 +116,9 @@ k="${k-}${k+ and }not (WebMapService and getmap)"
 k="${k-}${k+ and }not (WebMapTileService and buildTileRequest)"
 k="${k-}${k+ and }not (WebMapTileService and gettile)"
 k="${k-}${k+ and }not (csw_gdp and txt)"
+k="${k-}${k+ and }not (csw_geonetwork and txt)"
 k="${k-}${k+ and }not (csw_geoserver and txt)"
+k="${k-}${k+ and }not (csw_linz and txt)"
 k="${k-}${k+ and }not (csw_ngdc and txt)"
 k="${k-}${k+ and }not (csw_nlr and txt)"
 k="${k-}${k+ and }not (csw_pycsw and txt)"
@@ -116,6 +131,7 @@ k="${k-}${k+ and }not (tms and txt)"
 k="${k-}${k+ and }not (wcs_idee and txt)"
 k="${k-}${k+ and }not (wfs_USDASSURGO and txt)"
 k="${k-}${k+ and }not (wms_JPLCapabilities and txt)"
+k="${k-}${k+ and }not (wms_getfeatureinfo and txt)"
 k="${k-}${k+ and }not (wmts and txt)"
 k="${k-}${k+ and }not (wps_execute and txt)"
 k="${k-}${k+ and }not (wps_execute_invalid_request and txt)"
@@ -126,11 +142,29 @@ k="${k-}${k+ and } not (TestOffline and test_wfs_110_remotemd_parse_single)"
 k="${k-}${k+ and } not (TestOffline and test_wfs_200_remotemd_parse_single)"
 k="${k-}${k+ and } not (TestOffline and test_wms_130_remotemd_parse_all)"
 k="${k-}${k+ and } not (TestOffline and test_wms_130_remotemd_parse_single)"
+# ____________ [doctest] tests/doctests/wms_GeoServerCapabilities.txt ____________
+# 062     >>> x = wms['opengeo:poi'].styles
+# 063     >>> x == {'point': {'legend': 'http://localhost:8080/geoserver/wms?request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=poi', 'title': 'A boring default style'}}
+# 064     True
+# 065
+# 066 Test nested layer
+# 067
+# 068     >>> wms['parent_layer'].title
+# 069     'Parent Layer'
+# 070
+# 071     >>> wms['parent_layer'].queryable
+# Expected:
+#     1
+# Got:
+#     0
+k="${k-}${k+ and } not (wms_GeoServerCapabilities and txt)"
 
 PYTHONPATH='%{buildroot}%{python2_sitelib}' PYTHONDONTWRITEBYTECODE=1 \
     %{python2} -m pytest -m 'not online' -k "${k-}"
+%if %{with python3}
 PYTHONPATH='%{buildroot}%{python3_sitelib}' PYTHONDONTWRITEBYTECODE=1 \
     %{python3} -m pytest -m 'not online' -k "${k-}"
+%endif
 
 
 %files -n python2-OWSLib
@@ -145,6 +179,7 @@ PYTHONPATH='%{buildroot}%{python3_sitelib}' PYTHONDONTWRITEBYTECODE=1 \
 %{python2_sitelib}/OWSLib-%{version}-py%{python2_version}.egg-info
 
 
+%if %{with python3}
 %files -n python%{python3_pkgversion}-OWSLib
 %license LICENSE.txt
 %doc CHANGES.txt
@@ -155,6 +190,7 @@ PYTHONPATH='%{buildroot}%{python3_sitelib}' PYTHONDONTWRITEBYTECODE=1 \
 
 %{python3_sitelib}/owslib/
 %{python3_sitelib}/OWSLib-%{version}-py%{python3_version}.egg-info
+%endif
 
 
 %changelog
diff --git a/sources b/sources
index f25b222..e64051e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (OWSLib-0.9.0.tar.gz) = 4367d8de31c07499e450f05d78bded15926ed369963fa59b4372c5e658244d5c244443691dc31a436b26027109d99c827a7daf2d678f92ad41f1f51fe9de48f9
+SHA512 (OWSLib-0.9.2.tar.gz) = 1818299d702053b344edd435417785c8dd1c4d811a8bff7919c04624cf62a9324c856604965706f0416bea827dab3e5650b1f1cf6730b1b424535673f90e4cf0