From 2f0962648a4403b3985e70c3dbab8e7897182ec1 Mon Sep 17 00:00:00 2001
From: Kentaro Wada <www.kentaro.wada@gmail.com>
Date: Tue, 15 Sep 2020 06:10:31 +0100
Subject: [PATCH] Fix GitHub CI around PyInstaller

---
 .github/workflows/ci.yml      | 15 ++++++++-------
 .github/workflows/release.yml |  3 +--
 labelme.spec                  |  2 +-
 setup.py                      |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 303a577..b8e8371 100644
--- 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,7 +60,7 @@ 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
@@ -70,7 +68,11 @@ jobs:
         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
index 16edc71..a29b9f7 100644
--- 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
index d677508..1a62831 100644
--- 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
index 6e87e73..fdf2a9d 100644
--- 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",
-- 
GitLab