diff --git a/.github/workflows/binary-applications.yml b/.github/workflows/binary-applications.yml index 68b9bce99..f1ab364b8 100644 --- a/.github/workflows/binary-applications.yml +++ b/.github/workflows/binary-applications.yml @@ -201,19 +201,17 @@ jobs: - name: Build conda env with python dependencies shell: bash -l {0} run: | - conda upgrade -y pip setuptools - conda install toml requests nomkl - conda install $(python -c "import toml;print(' '.join(toml.load('pyproject.toml')['build-system']['requires']))") + conda install nomkl + python ./scripts/convert-requirements-to-conda-yml.py \ requirements.txt \ requirements-dev.txt \ requirements-gui.txt > requirements-all.yml conda env update --file requirements-all.yml - # Libtiff from conda defaults channel gets around issue with missing libwebp - conda install --yes libtiff conda list + - name: Build binaries shell: bash -l {0} run: | diff --git a/requirements-dev.txt b/requirements-dev.txt index 58961ca85..f4d9e5acd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -17,7 +17,7 @@ wheel>=0.27.0 setuptools>=8.0 Sphinx>=1.3.1,!=1.7.1 sphinx-rtd-theme -PyInstaller==3.5 +PyInstaller==3.5 # pip-only setuptools_scm requests coverage diff --git a/requirements-gui.txt b/requirements-gui.txt index c00d85701..de041e85d 100644 --- a/requirements-gui.txt +++ b/requirements-gui.txt @@ -7,7 +7,7 @@ # finding the cocoa plugin interface. And in general the pip distributions # seem better supported by PyInstaller -qtpy>1.3 -qtawesome +qtpy>1.3 # pip-only +qtawesome # pip-only requests -PySide2!=5.15.0 +PySide2!=5.15.0 # pip-only