Merge branch 'bugfix/101-pyinstaller-expose-trees' into 'master'

jaraco · jaraco · commit 6b7e858bf9b1 · 2020-06-30T14:39:12.000Z
Declare hidden imports for pyinstaller Closes python#101 See merge request python-devs/importlib_resources!104
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -6,6 +6,7 @@ v2.0.2
 ======
 
 * Package now always includes its data. Closes #93.
+* Declare hidden imports for PyInstaller. Closes #101.
 
 v2.0.1
 ======
diff --git a/hook-importlib_resources.py b/hook-importlib_resources.py
@@ -0,0 +1,5 @@
+# Used by pyinstaller to expose hidden imports
+
+# Remove when trees module is removed. Ref #101.
+
+hiddenimports = ['importlib_resources.trees']
diff --git a/importlib_resources/__init__.py b/importlib_resources/__init__.py
@@ -7,7 +7,8 @@
     as_file, files,
     )
 
-# for compatibility. Ref #88
+# For compatibility. Ref #88.
+# Also requires hook-importlib_resources.py (Ref #101).
 __import__('importlib_resources.trees')
 
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`	`as_file, files,`
`8`	`8`	`)`
`9`	`9`
`10`		`-# for compatibility. Ref #88`
	`10`	`+# For compatibility. Ref #88.`
	`11`	`+# Also requires hook-importlib_resources.py (Ref #101).`
`11`	`12`	`__import__('importlib_resources.trees')`
`12`	`13`
`13`	`14`