Improve osgeo hook

eggertm · Jan 22, 2024 · 1bbef22 · 1bbef22
1 parent dff7526
commit 1bbef22
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/news/693.update.rst b/news/693.update.rst
@@ -0,0 +1 @@
+    Fix hook for ``osgeo``, to include proj data files.
diff --git a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-osgeo.py b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-osgeo.py
@@ -39,8 +39,8 @@
 
 # Auxiliary data:
 #
-# - general case (data in 'osgeo/data/gdal'):
-datas = collect_data_files('osgeo', subdir=os.path.join('data', 'gdal'))
+# - general case (data in 'osgeo/data'):
+datas = collect_data_files('osgeo', subdir='data')
 
 # check if the data has been effectively found in 'osgeo/data/gdal'
 if len(datas) == 0:

diff --git a/src/_pyinstaller_hooks_contrib/tests/test_libraries.py b/src/_pyinstaller_hooks_contrib/tests/test_libraries.py
@@ -1895,3 +1895,12 @@ def test_pypylon(pyi_builder):
     pyi_builder.test_source("""
         from pypylon import pylon
     """)
+
+@importorskip('osgeo')
+def test_osgeo(pyi_builder):
+    pyi_builder.test_source("""
+        from osgeo import osr
+        sr = osr.SpatialReference()
+        sr.ImportFromEPSG(4326)
+        assert(sr.EPSGTreatsAsLatLong())
+    """)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix hook for ``osgeo``, to include proj data files.