Fix GitHub CI around PyInstaller

wkentaro · wkentaro · commit 2f0962648a44 · 2020-09-30T01:53:12.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,10 +50,8 @@ jobs:
 
     - name: Set up Python
       shell: bash -l {0}
-      env:
-        PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
       run: |
-        conda install -q -y python=$PYTHON_VERSION
+        conda install -q -y python=${{ matrix.python-version }}
         which python
         python --version
         pip --version
@@ -62,15 +60,19 @@ jobs:
       shell: bash -l {0}
       run: |
         if [ "${{ matrix.PYTEST_QT_API }}" = "pyside2" ]; then
-          if [ "${{ matrix.PYTHON_VERSION }}" = "2.7" ]; then
+          if [ "${{ matrix.python-version }}" = "2.7" ]; then
             conda install -q -y 'pyside2!=5.12.4' -c conda-forge
           else
             conda install -q -y pyside2 -c conda-forge
           fi
         elif [ "${{ matrix.PYTEST_QT_API }}" = "pyqt4v2" ]; then
           conda install -q -y pyqt=4 -c conda-forge
         else  # pyqt5
-          conda install -q -y pyqt=5
+          if [ "${{ matrix.python-version }}" = "2.7" ]; then
+            conda install -q -y pyqt=5
+          else
+            pip install pyqt5
+          fi
         fi
         if [ "${{ matrix.os }}" != "windows-latest" ]; then
           conda install -q -y help2man
@@ -137,7 +139,6 @@ jobs:
       if: matrix.PYTEST_QT_API == 'pyqt5' && matrix.python-version == '3.7'
       run: |
         # Build the standalone executable
-        pip install 'pyinstaller!=3.4'
-        pip install 'setuptools<45.0.0'
+        pip install pyinstaller
         pyinstaller labelme.spec
         dist/labelme --version
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -58,8 +58,7 @@ jobs:
     - name: Run pyinstaller
       shell: bash -l {0}
       run: |
-        pip install 'pyinstaller!=3.4'
-        pip install 'setuptools<45.0.0'
+        pip install pyinstaller
         pyinstaller labelme.spec
 
     - name: Load release url file from release job
diff --git a/labelme.spec b/labelme.spec
@@ -18,7 +18,7 @@ a = Analysis(
     hiddenimports=[],
     hookspath=[],
     runtime_hooks=[],
-    excludes=['matplotlib'],
+    excludes=[],
 )
 pyz = PYZ(a.pure, a.zipped_data)
 exe = EXE(
diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@ def get_install_requires():
 
     install_requires = [
         "imgviz>=0.11.0",
-        "matplotlib",
+        "matplotlib<3.3",  # for PyInstaller
         "numpy",
         "Pillow>=2.8.0",
         "PyYAML",

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ a = Analysis(`
`18`	`18`	`hiddenimports=[],`
`19`	`19`	`hookspath=[],`
`20`	`20`	`runtime_hooks=[],`
`21`		`- excludes=['matplotlib'],`
	`21`	`+ excludes=[],`
`22`	`22`	`)`
`23`	`23`	`pyz = PYZ(a.pure, a.zipped_data)`
`24`	`24`	`exe = EXE(`