Merge 90a5a38 into 197e3a0

pyinstaller · Mar 12, 2021 · c137ed5 · c137ed5
2 parents 197e3a0 + 90a5a38
commit c137ed5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/PyInstaller/hooks/hook-matplotlib.py b/PyInstaller/hooks/hook-matplotlib.py
@@ -14,6 +14,7 @@
 
 mpl_data_dir = exec_statement(
     "import matplotlib; print(matplotlib.get_data_path())")
+assert mpl_data_dir, "Failed to determine matplotlib's data directory!"
 
 datas = [
     (mpl_data_dir, "matplotlib/mpl-data"),

diff --git a/news/5629.hooks.rst b/news/5629.hooks.rst
@@ -0,0 +1,2 @@
+Prevent ``matplotlib`` hook from collecting current working directory when it 
+fails to determine the path to matplotlib's data directory.
diff --git a/tests/requirements-libraries.txt b/tests/requirements-libraries.txt
@@ -17,7 +17,6 @@
 #
 # - v. 2.2 and above fails.
 Django==2.1.8  # pyup: ignore
-matplotlib==3.2.2 # pyup: ignore
 # - v 21.1.0 fails; earlier versions not tested.
 keyring==19.2.0  # pyup: ignore
 
@@ -45,6 +44,7 @@ pandas==1.1.5
 numpy==1.19.4
 scipy==1.5.4
 Pillow==8.0.1
+matplotlib==3.3.4
 
 
 # Python versions not supported / supported for older package versions