From 1f6ddc820db04164f979eafd2730399f4254dbdd Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Sat, 29 Aug 2020 08:53:04 -0400 Subject: [PATCH 1/7] ci(update): update miniconda action --- .github/workflows/ci.yml | 2 +- .github/workflows/rtd.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4b34e33d7..ccbe0ccdc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,7 +96,7 @@ jobs: # Standard python fails on windows without GDAL installation # Using custom bash shell ("shell: bash -l {0}") with Miniconda - name: Setup Miniconda - uses: goanpeca/setup-miniconda@v1.6.0 + uses: conda-incubator/setup-miniconda@v1.7.0 with: python-version: ${{ matrix.python-version }} auto-update-conda: true diff --git a/.github/workflows/rtd.yml b/.github/workflows/rtd.yml index 7d479c57d5..8e24c1c83c 100644 --- a/.github/workflows/rtd.yml +++ b/.github/workflows/rtd.yml @@ -29,9 +29,11 @@ jobs: # Standard python fails on windows without GDAL installation # Using custom bash shell ("shell: bash -l {0}") with Miniconda - name: Setup Miniconda - uses: goanpeca/setup-miniconda@v1.6.0 + uses: conda-incubator/setup-miniconda@v1.7.0 with: python-version: 3.8 + mamba-version: "*" + channels: conda-forge,defaults auto-update-conda: true auto-activate-base: true activate-environment: flopy From 6b2b381e47e81adc1edd0499c562a94d1bfcfd0a Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Sat, 29 Aug 2020 09:05:13 -0400 Subject: [PATCH 2/7] ci(update): update miniconda action --- .github/workflows/rtd.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/rtd.yml b/.github/workflows/rtd.yml index 8e24c1c83c..8b5632378f 100644 --- a/.github/workflows/rtd.yml +++ b/.github/workflows/rtd.yml @@ -41,12 +41,12 @@ jobs: - name: Add jupyter and jupytext to scripts run shell: bash -l {0} run: | - conda install -n flopy -c conda-forge jupyter jupytext + mamba install -n flopy jupyter jupytext - name: Add packages to flopy environment shell: bash -l {0} run: | - conda env update --name flopy --file etc/environment.yml + mamba install -n flopy --file etc/environment.yml - name: Install pymake, xmipy, and flopy shell: bash -l {0} @@ -74,11 +74,7 @@ jobs: - name: Upload completed jupyter notebooks as an artifact for ReadtheDocs if: - github.repository_owner == 'modflowpy' && - contains(github.ref, ' - refs/heads/master - refs/heads/develop - ') + github.repository_owner == 'modflowpy' && github.event_name == 'push' uses: actions/upload-artifact@v2 with: name: notebooks-for-${{ github.sha }} @@ -87,11 +83,7 @@ jobs: - name: Trigger RTDs build on master and develop branches if: - github.repository_owner == 'modflowpy' && - contains(' - refs/heads/master - refs/heads/develop - ', github.ref) + github.repository_owner == 'modflowpy' && github.event_name == 'push' uses: dfm/rtds-action@v1.0.0 with: webhook_url: ${{ secrets.RTDS_WEBHOOK_URL }} From 87f2f6a9e828d22d5389d42e56e2993cbacccef8 Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Sat, 29 Aug 2020 09:10:20 -0400 Subject: [PATCH 3/7] ci(update): update miniconda action --- etc/environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/environment.yml b/etc/environment.yml index f4eebf09c7..6e7d52b002 100644 --- a/etc/environment.yml +++ b/etc/environment.yml @@ -1,4 +1,3 @@ -name: flopy channels: - conda-forge dependencies: From e9dc940ddd90193a05a7eddec0ed1b78ece25db0 Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Sat, 29 Aug 2020 09:25:41 -0400 Subject: [PATCH 4/7] ci(update): update miniconda action --- .github/workflows/rtd.yml | 4 ++-- etc/environment.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rtd.yml b/.github/workflows/rtd.yml index 8b5632378f..a6080dbe02 100644 --- a/.github/workflows/rtd.yml +++ b/.github/workflows/rtd.yml @@ -41,12 +41,12 @@ jobs: - name: Add jupyter and jupytext to scripts run shell: bash -l {0} run: | - mamba install -n flopy jupyter jupytext + mamba install --name flopy jupyter jupytext - name: Add packages to flopy environment shell: bash -l {0} run: | - mamba install -n flopy --file etc/environment.yml + mamba env update --name flopy --file etc/environment.yml - name: Install pymake, xmipy, and flopy shell: bash -l {0} diff --git a/etc/environment.yml b/etc/environment.yml index 6e7d52b002..f4eebf09c7 100644 --- a/etc/environment.yml +++ b/etc/environment.yml @@ -1,3 +1,4 @@ +name: flopy channels: - conda-forge dependencies: From 4198532169b49046ec4c2c73e34cfb630751f76c Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Sat, 29 Aug 2020 09:34:17 -0400 Subject: [PATCH 5/7] ci(update): update miniconda action --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ccbe0ccdc1..4dc6662a83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,6 +99,8 @@ jobs: uses: conda-incubator/setup-miniconda@v1.7.0 with: python-version: ${{ matrix.python-version }} + mamba-version: "*" + channels: conda-forge,defaults auto-update-conda: true auto-activate-base: true activate-environment: flopy @@ -108,12 +110,12 @@ jobs: if: matrix.run-type == 'nb' shell: bash -l {0} run: | - conda install -n flopy -c conda-forge jupyter nbconvert + mamba install --name flopy jupyter nbconvert - name: Add packages to flopy environment shell: bash -l {0} run: | - conda env update --name flopy --file etc/environment.yml + mamba env update --name flopy --file etc/environment.yml - name: Install pymake, xmipy, and flopy shell: bash -l {0} From 363fb38eaf352d59ce84fe61305135ae9c650455 Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Sat, 29 Aug 2020 09:57:41 -0400 Subject: [PATCH 6/7] ci(update): update miniconda action --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dc6662a83..2469b28b73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,10 +112,14 @@ jobs: run: | mamba install --name flopy jupyter nbconvert - - name: Add packages to flopy environment + - name: Add packages to flopy environment using mamba or conda shell: bash -l {0} run: | - mamba env update --name flopy --file etc/environment.yml + if [ "$RUNNER_OS" == "Windows" ]; then + conda env update --name flopy --file etc/environment.yml + else + mamba env update --name flopy --file etc/environment.yml + fi - name: Install pymake, xmipy, and flopy shell: bash -l {0} From c5709ed612065792ed62e435f31c85dae4a1454d Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Sat, 29 Aug 2020 11:17:47 -0400 Subject: [PATCH 7/7] ci(update): update miniconda action --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2469b28b73..03087eb72f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,6 +78,9 @@ jobs: python-version: 3.8 run-type: script test-path: autotest_scripts.py + exclude: + - os: macos-latest + python-version: 3.6 steps: # check out repo