diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 303a577d121c0d19b31577393b23d70aa047f1d4..b8e8371fa8e1fa0f53ea1e1990b638ac4f87ca41 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 16edc713d0fd6d3303e5a4b6dc46f419b162b06c..a29b9f76a41580d5e9ea0de188ef7c5bc0779fd6 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 d67750865485ff36d652de7dd6a2c9b52b59f4de..1a62831b3a0f8691c2d35a64166181712c4fa53b 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 6e87e73749d41b1d267703ead6bffe9cc0aebcac..fdf2a9d086c55c5edfd893d744f1f87a1b1a067e 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",