Update fiona hook for compatibility with fiona 1.9.0

news/541.update.1.rst

@@ -0,0 +1 @@
+Update ``fiona`` hook for compatibility with ``fiona`` 1.9.0.

news/541.update.rst

@@ -0,0 +1,2 @@
+Have ``fiona`` hook collect the package's data files (e.g., the
+projections database).

requirements-test-libraries.txt

@@ -27,7 +27,7 @@ dash-uploader==0.6.0
 # We install it via apt-get and brew on ubuntu and macOS CI runners, respectively.
 discid==1.2.0; sys_platform != 'win32'
 fabric==3.0.0
-fiona==1.8.22; sys_platform != 'win32'
+fiona==1.9.0; sys_platform != 'win32'
 folium==0.14.0
 ffpyplayer==4.3.5; python_version < '3.10' # doesn't have py310 wheels
 geopandas==0.12.2; python_version >= '3.8' and sys_platform != 'win32'

src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-fiona.py

@@ -10,8 +10,17 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # ------------------------------------------------------------------
 
+from PyInstaller.utils.hooks import collect_data_files, is_module_satisfies
+
 hiddenimports = [
     "fiona._shim",
     "fiona.schema",
     "json",
 ]
+
+# As of fiona 1.9.0, `fiona.enums` is also a hidden import, made in cythonized `fiona.crs`.
+if is_module_satisfies("fiona >= 1.9.0"):
+    hiddenimports.append("fiona.enums")
+
+# Collect data files that are part of the package (e.g., projections database)
+datas = collect_data_files("fiona")

src/_pyinstaller_hooks_contrib/tests/test_libraries.py

@@ -28,6 +28,38 @@ def test_fiona(pyi_builder):
         '''
     )
 
+
+@importorskip('fiona')
+def test_fiona_transform(pyi_builder):
+    # Test that fiona in frozen application has access to its projections database. If projection data is unavailable,
+    # the transform becomes an identity transform.
+    pyi_builder.test_source(
+        """
+        from fiona.transform import transform_geom
+        from fiona.crs import from_epsg
+
+        eiffel_tower = {
+            'type': 'Point',
+            'coordinates': (2.294694, 48.858093),
+        }
+
+        crs_source = from_epsg(4326)  # WGS84
+        crs_target = from_epsg(25831)  # ETRS89 / UTM zone 31N
+
+        transformed = transform_geom(crs_source, crs_target, eiffel_tower)
+        print(f"Transformed point: {transformed}")
+
+        # Expected coordinates: obtained by manually running this program unfrozen
+        EXPECTED_COORDINATES = (448265.9146792292, 5411920.651338793)
+        EPS = 1e-6
+
+        delta = [abs(value - expected) for value, expected in zip(transformed["coordinates"], EXPECTED_COORDINATES)]
+        print(f"Delta: {delta}")
+        assert all([value < EPS for value in delta]), f"Delta {delta} exceeds threshold!"
+        """
+    )
+
+
 @importorskip('jinxed')
 def test_jinxed(pyi_builder):
     pyi_builder.test_source(