From ddae510f8ac0ae6e16e0441b069123de2f6acd39 Mon Sep 17 00:00:00 2001 From: Tieqiong Zhang Date: Sun, 25 Aug 2024 22:25:03 -0400 Subject: [PATCH 1/2] matrix workflow fix mac pdffit2 install --- .github/workflows/matrix.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml index ee75b329..da15a673 100644 --- a/.github/workflows/matrix.yml +++ b/.github/workflows/matrix.yml @@ -19,7 +19,7 @@ jobs: python-version: ['3.10', '3.11', '3.12'] os: ["macos-latest", "ubuntu-latest", "windows-latest"] steps: - - name: check out test_workflow + - name: check out diffpy.pdfgui uses: actions/checkout@v4 - name: Initialize miniconda @@ -36,12 +36,19 @@ jobs: conda config --set always_yes yes --set changeps1 no - - name: Install test_workflow and requirements + - name: Install diffpy.pdfgui and requirements run: | conda install --file requirements/run.txt conda install --file requirements/test.txt python -m pip install -r requirements/pip.txt python -m pip install . --no-deps + + - name: Install latest diffpy.pdffit2 for Mac + if: runner.os == 'macos-latest' + run: | + conda uninstall diffpy.pdffit2 + brew install gsl + pip install diffpy.pdffit2==1.4.4rc1 - name: Install Xvfb if: runner.os == 'Linux' @@ -53,7 +60,7 @@ jobs: export DISPLAY=:99 Xvfb :99 -screen 0 1024x768x16 & - - name: Validate test_workflow + - name: Validate diffpy.pdfgui run: | if [ "$RUNNER_OS" == "Linux" ]; then export DISPLAY=:99 From 7d1ad5e669a0130b4865e99fad323ecf9b6fd12f Mon Sep 17 00:00:00 2001 From: Tieqiong Zhang Date: Mon, 26 Aug 2024 00:01:34 -0400 Subject: [PATCH 2/2] fix pcmt --- .github/workflows/matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml index da15a673..c2d3446c 100644 --- a/.github/workflows/matrix.yml +++ b/.github/workflows/matrix.yml @@ -42,7 +42,7 @@ jobs: conda install --file requirements/test.txt python -m pip install -r requirements/pip.txt python -m pip install . --no-deps - + - name: Install latest diffpy.pdffit2 for Mac if: runner.os == 'macos-latest' run: |