提交 2f096264 编写于 作者: K Kentaro Wada

Fix GitHub CI around PyInstaller

上级 ab3d9b32
...@@ -50,10 +50,8 @@ jobs: ...@@ -50,10 +50,8 @@ jobs:
- name: Set up Python - name: Set up Python
shell: bash -l {0} shell: bash -l {0}
env:
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
run: | run: |
conda install -q -y python=$PYTHON_VERSION conda install -q -y python=${{ matrix.python-version }}
which python which python
python --version python --version
pip --version pip --version
...@@ -62,7 +60,7 @@ jobs: ...@@ -62,7 +60,7 @@ jobs:
shell: bash -l {0} shell: bash -l {0}
run: | run: |
if [ "${{ matrix.PYTEST_QT_API }}" = "pyside2" ]; then 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 conda install -q -y 'pyside2!=5.12.4' -c conda-forge
else else
conda install -q -y pyside2 -c conda-forge conda install -q -y pyside2 -c conda-forge
...@@ -70,7 +68,11 @@ jobs: ...@@ -70,7 +68,11 @@ jobs:
elif [ "${{ matrix.PYTEST_QT_API }}" = "pyqt4v2" ]; then elif [ "${{ matrix.PYTEST_QT_API }}" = "pyqt4v2" ]; then
conda install -q -y pyqt=4 -c conda-forge conda install -q -y pyqt=4 -c conda-forge
else # pyqt5 else # pyqt5
if [ "${{ matrix.python-version }}" = "2.7" ]; then
conda install -q -y pyqt=5 conda install -q -y pyqt=5
else
pip install pyqt5
fi
fi fi
if [ "${{ matrix.os }}" != "windows-latest" ]; then if [ "${{ matrix.os }}" != "windows-latest" ]; then
conda install -q -y help2man conda install -q -y help2man
...@@ -137,7 +139,6 @@ jobs: ...@@ -137,7 +139,6 @@ jobs:
if: matrix.PYTEST_QT_API == 'pyqt5' && matrix.python-version == '3.7' if: matrix.PYTEST_QT_API == 'pyqt5' && matrix.python-version == '3.7'
run: | run: |
# Build the standalone executable # Build the standalone executable
pip install 'pyinstaller!=3.4' pip install pyinstaller
pip install 'setuptools<45.0.0'
pyinstaller labelme.spec pyinstaller labelme.spec
dist/labelme --version dist/labelme --version
...@@ -58,8 +58,7 @@ jobs: ...@@ -58,8 +58,7 @@ jobs:
- name: Run pyinstaller - name: Run pyinstaller
shell: bash -l {0} shell: bash -l {0}
run: | run: |
pip install 'pyinstaller!=3.4' pip install pyinstaller
pip install 'setuptools<45.0.0'
pyinstaller labelme.spec pyinstaller labelme.spec
- name: Load release url file from release job - name: Load release url file from release job
......
...@@ -18,7 +18,7 @@ a = Analysis( ...@@ -18,7 +18,7 @@ a = Analysis(
hiddenimports=[], hiddenimports=[],
hookspath=[], hookspath=[],
runtime_hooks=[], runtime_hooks=[],
excludes=['matplotlib'], excludes=[],
) )
pyz = PYZ(a.pure, a.zipped_data) pyz = PYZ(a.pure, a.zipped_data)
exe = EXE( exe = EXE(
......
...@@ -30,7 +30,7 @@ def get_install_requires(): ...@@ -30,7 +30,7 @@ def get_install_requires():
install_requires = [ install_requires = [
"imgviz>=0.11.0", "imgviz>=0.11.0",
"matplotlib", "matplotlib<3.3", # for PyInstaller
"numpy", "numpy",
"Pillow>=2.8.0", "Pillow>=2.8.0",
"PyYAML", "PyYAML",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册