remove extra steps of conda install

This commit is contained in:
emlys 2020-11-19 13:27:31 -07:00
parent fd7b4b08d2
commit 4ce1e021ee
3 changed files with 7 additions and 9 deletions

View File

@ -201,19 +201,17 @@ jobs:
- name: Build conda env with python dependencies - name: Build conda env with python dependencies
shell: bash -l {0} shell: bash -l {0}
run: | run: |
conda upgrade -y pip setuptools conda install nomkl
conda install toml requests nomkl
conda install $(python -c "import toml;print(' '.join(toml.load('pyproject.toml')['build-system']['requires']))")
python ./scripts/convert-requirements-to-conda-yml.py \ python ./scripts/convert-requirements-to-conda-yml.py \
requirements.txt \ requirements.txt \
requirements-dev.txt \ requirements-dev.txt \
requirements-gui.txt > requirements-all.yml requirements-gui.txt > requirements-all.yml
conda env update --file 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 conda list
- name: Build binaries - name: Build binaries
shell: bash -l {0} shell: bash -l {0}
run: | run: |

View File

@ -17,7 +17,7 @@ wheel>=0.27.0
setuptools>=8.0 setuptools>=8.0
Sphinx>=1.3.1,!=1.7.1 Sphinx>=1.3.1,!=1.7.1
sphinx-rtd-theme sphinx-rtd-theme
PyInstaller==3.5 PyInstaller==3.5 # pip-only
setuptools_scm setuptools_scm
requests requests
coverage coverage

View File

@ -7,7 +7,7 @@
# finding the cocoa plugin interface. And in general the pip distributions # finding the cocoa plugin interface. And in general the pip distributions
# seem better supported by PyInstaller # seem better supported by PyInstaller
qtpy>1.3 qtpy>1.3 # pip-only
qtawesome qtawesome # pip-only
requests requests
PySide2!=5.15.0 PySide2!=5.15.0 # pip-only