From 05801155833655c3570df5f038fad69f8a0ea510 Mon Sep 17 00:00:00 2001
From: Jos de Kloe <josdekloe@gmail.com>
Date: Sep 10 2022 15:58:16 +0000
Subject: Update to 3.4.0


---

diff --git a/.gitignore b/.gitignore
index e3b2a5f..5d1b00b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /pyproj-3.2.1.tar.gz
 /pyproj-3.3.0.tar.gz
 /pyproj-3.3.1.tar.gz
+/pyproj-3.4.0.tar.gz
diff --git a/pyproj.spec b/pyproj.spec
index d0e592e..00fe281 100644
--- a/pyproj.spec
+++ b/pyproj.spec
@@ -1,10 +1,10 @@
 # note: PROJ_MIN_VERSION is defined in the setup.py file of pyproj
 # a compatibility matrix is also provided in docs/installation.rst
-%global minimal_needed_proj_version 8.0.0
+%global minimal_needed_proj_version 8.2.0
 
 Name:           pyproj
-Version:        3.3.1
-Release:        3%{?dist}
+Version:        3.4.0
+Release:        1%{?dist}
 Summary:        Cython wrapper to provide python interfaces to Proj
 License:        MIT
 URL:            https://github.com/jswhit/%{name}
@@ -25,7 +25,6 @@ BuildRequires:  python3-certifi
 
 # needed to run the tests
 BuildRequires:  python3-pytest
-BuildRequires:  python3-mock
 BuildRequires:  python3-pandas
 BuildRequires:  python3-shapely
 BuildRequires:  python3-xarray
@@ -89,7 +88,18 @@ cd docs
 %global py_build_libdir_old %{_builddir}/%{buildsubdir}/build/lib.%{python3_platform}-%{python3_version}
 %global py_build_libdir_new %{_builddir}/%{buildsubdir}/build/lib.%{python3_platform}-cpython-%{python3_version_nodots}
 
-export PYTHONPATH=%{py_build_libdir_old}:%{py_build_libdir_new}
+# NOTE: need to add %%{_builddir}/%%{buildsubdir} as well to the path
+# since sphinx needs to be able to find the PKG-INFO file
+# before it will generate the documentation,
+# and this is the only place where it is available before installation.
+# (see: https://github.com/python/importlib_metadata/issues/364)
+export PYTHONPATH=%{py_build_libdir_old}:%{py_build_libdir_new}:%{_builddir}/%{buildsubdir}
+
+# default theme is now "furo" which is not available in fedora
+# (see BZ #1910798 and https://github.com/pyproj4/pyproj/discussions/1134)
+# so fall back to the previous theme:
+export PYPROJ_HTML_THEME=sphinx_rtd_theme
+
 make html
 make man
 
@@ -148,8 +158,19 @@ cd pyproj-test-folder
 cp -r ../pyproj-%{version}/test .
 cp -r ../pyproj-%{version}/pytest.ini .
 
-PATH="%{buildroot}%{_bindir}:$PATH" PYTHONPATH="%{buildroot}%{python3_sitearch}" \
+PATH="%{buildroot}%{_bindir}:$PATH" \
+PYTHONPATH="%{buildroot}%{python3_sitearch}" \
 py.test-3 -m "not network"
+#py.test-3 -m "not network and not grid"
+# some notes on the test suite:
+# not network ==> deselects 24 tests
+# not cli     ==> deselects 22 tests
+# not grid    ==> deselects 11 tests
+#
+# network: 24 failures and errors for f36, f37
+# cli:        works fine on all fedora versions
+# grid:     1 failure for f36, f37 (test/test_transformer.py), fixed in rawhide
+
 
 %files -n python3-%{name}
 %doc README.md
@@ -163,10 +184,13 @@ py.test-3 -m "not network"
 
 
 %changelog
+* Sat Sep 10 2022 Jos de Kloe <josdekloe@gmail.com> 3.4.0-1
+- Update to 3.4.0
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Wed Jun 25 2022 Jos de Kloe <josdekloe@gmail.com> 3.3.1-2
+* Sat Jun 25 2022 Jos de Kloe <josdekloe@gmail.com> 3.3.1-2
 - Adjust py_build_libdir to let sphinx build the documentation
   with the latest setuptools version (62.4.0)
 
diff --git a/sources b/sources
index 16b0ab0..3a9ff1b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pyproj-3.3.1.tar.gz) = 3acfbf0d688c5fb495f27f9d2038bce25ab65c461bbeda615292b69bf4648e78b62631c1aeb52da9d6fc485575f48e204a1bd68fb3b45cb5b06c1cf78945b23d
+SHA512 (pyproj-3.4.0.tar.gz) = 0c321ba4d4b0eac91ad52b7fa1e7b211ce2746341eb7d27ffe5b8ac1abcbb5c9ac8d4dcec4189a97f3b839e179aa15542aba6076373d648627b68c4506995a3f