From 9b5c1c688ce24f61fc5894b1183ce942db3b168f Mon Sep 17 00:00:00 2001 From: Yuanpeng Zhang Date: Thu, 14 Apr 2022 12:18:58 -0400 Subject: [PATCH 1/3] update Python version and Mantid framework (#132) --- .github/workflows/actions.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index a8fc924c..8ae090a4 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -1,7 +1,7 @@ name: mantid_total_scattering_ci env: - PYTHON_MAIN_VERSION: 3.7 + PYTHON_MAIN_VERSION: 3.8 on: workflow_dispatch: @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: ["3.7"] + python-version: ["3.8"] steps: - uses: actions/checkout@v2 @@ -38,7 +38,7 @@ jobs: - name: Conda install deps shell: bash -l {0} run: | - conda install mantid-framework + conda install mantid conda install --file requirements.txt --file requirements-dev.txt pip install tox-gh-actions From f6ea198ffaa18771d2bd1869b5149dce40a7f18d Mon Sep 17 00:00:00 2001 From: Yuanpeng Zhang Date: Thu, 14 Apr 2022 12:24:03 -0400 Subject: [PATCH 2/3] update Python version and Mantid framework (#134) --- .github/workflows/actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 8ae090a4..57a21983 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -1,7 +1,7 @@ name: mantid_total_scattering_ci env: - PYTHON_MAIN_VERSION: 3.8 + PYTHON_MAIN_VERSION: 3.7 on: workflow_dispatch: @@ -38,7 +38,7 @@ jobs: - name: Conda install deps shell: bash -l {0} run: | - conda install mantid + conda install mantid-framework conda install --file requirements.txt --file requirements-dev.txt pip install tox-gh-actions From cf169babd8526a2b4cf93a2fc9f3cf2950735e85 Mon Sep 17 00:00:00 2001 From: Yuanpeng Zhang Date: Thu, 14 Apr 2022 12:29:31 -0400 Subject: [PATCH 3/3] update Python version and Mantid framework (#135) --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 57a21983..a8fc924c 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: ["3.8"] + python-version: ["3.7"] steps: - uses: actions/checkout@v2