From 5abd1981f22d72293f60770a1cc8cf23a807e9dc Mon Sep 17 00:00:00 2001 From: Jarrett Johnson Date: Sat, 11 May 2024 10:06:23 -0400 Subject: [PATCH] more fixes --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 694289728..da94b5d77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: shell: cmd run: |- CALL %CONDA_ROOT%\\Scripts\\activate.bat - conda install -y -c conda-forge -c schrodinger python cmake libpng freetype pyqt glew libxml2 numpy catch2=2.13.3 glm libnetcdf collada2gltf + conda install -y -c conda-forge -c schrodinger python cmake libpng freetype pyqt glew libxml2 numpy catch2=2.13.3 glm libnetcdf collada2gltf pytest - name: Conda info shell: cmd @@ -96,7 +96,7 @@ jobs: shell: cmd run: | CALL %CONDA_ROOT%\\Scripts\\activate.bat - install-prefix\\bin\\pymol -ckqy testing\\testing.py --run all + install-prefix\\Scripts\\pymol.bat -ckqy testing\\testing.py --run all build-MacOS: @@ -114,7 +114,7 @@ jobs: bash $CONDA_ROOT.sh -b -p $CONDA_ROOT export PATH="$CONDA_ROOT/bin:$PATH" conda config --set quiet yes - conda install -y -c conda-forge -c schrodinger python cmake libpng freetype pyqt glew libxml2 numpy catch2=2.13.3 glm libnetcdf collada2gltf + conda install -y -c conda-forge -c schrodinger python cmake libpng freetype pyqt glew libxml2 numpy catch2=2.13.3 glm libnetcdf collada2gltf pytest conda info - name: Get additional sources @@ -124,8 +124,9 @@ jobs: - name: Build PyMOL run: |- + export MACOSX_DEPLOYMENT_TARGET=12.0 export PATH="$CONDA_ROOT/bin:$PATH" - python setup.py --testing install --prefix=install-prefix + python setup.py install --prefix=install-prefix - name: Test run: |-