From d6ab1204530113fb4bcbdb161a93aa03dda698ee Mon Sep 17 00:00:00 2001 From: jwhite Date: Fri, 19 Jan 2024 09:41:39 -0700 Subject: [PATCH 1/5] trying to use micromamba --- .github/workflows/ci.yml | 58 +++++++++++++++++++++++----------------- etc/environment.yml | 6 ++++- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef75aae8..ab5598d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,6 +89,16 @@ jobs: # environment-file: etc/environment.yml # use-only-tar-bz2: true + - uses: mamba-org/setup-micromamba@v1 + with: + micromamba-version: '1.3.1-0' + environment-file: etc/environment.yml + init-shell: >- + bash + powershell + cache-environment: true + post-cleanup: 'all' + # - name: Add packages to pyemu environment using mamba or conda # shell: bash -l {0} # run: | @@ -98,32 +108,32 @@ jobs: # conda env update --name pyemu --file etc/environment.yml # fi - - name: Add packages to pyemu environment using conda - if: ${{ matrix.python-version < 3.8 }} - # if: ${{ runner.os == 'Windows' || matrix.python-version < 3.8 }} - shell: bash -l {0} - run: | - conda env update --name pyemu --file etc/environment.yml + # - name: Add packages to pyemu environment using conda + # if: ${{ matrix.python-version < 3.8 }} + # # if: ${{ runner.os == 'Windows' || matrix.python-version < 3.8 }} + # shell: bash -l {0} + # run: | + # conda env update --name pyemu --file etc/environment.yml - - name: Add packages to pyemu environment using mamba - # if: ${{ runner.os != 'Windows' && matrix.python-version >= 3.8 }} - if: ${{ matrix.python-version >= 3.8 }} - shell: bash -l {0} - run: | - mamba env update --name pyemu --file etc/environment.yml + # - name: Add packages to pyemu environment using mamba + # # if: ${{ runner.os != 'Windows' && matrix.python-version >= 3.8 }} + # if: ${{ matrix.python-version >= 3.8 }} + # shell: bash -l {0} + # run: | + # mamba env update --name pyemu --file etc/environment.yml - - name: Install Flopy & pyemu? - shell: bash -l {0} - run: | - # git clone -b develop --depth 1 https://github.com/modflowpy/flopy.git - # cd flopy - # python setup.py install - # cd .. - # pip install https://github.com/modflowpy/pymake/zipball/master - git clone -b develop --depth 1 https://github.com/pypest/pyemu.git - cd pyemu - python setup.py install - cd .. + # - name: Install Flopy & pyemu? + # shell: bash -l {0} + # run: | + # # git clone -b develop --depth 1 https://github.com/modflowpy/flopy.git + # # cd flopy + # # python setup.py install + # # cd .. + # # pip install https://github.com/modflowpy/pymake/zipball/master + # git clone -b develop --depth 1 https://github.com/pypest/pyemu.git + # cd pyemu + # python setup.py install + # cd .. # - name: Get specific version CMake, v3.19 # if: ${{ runner.os == 'Windows' }} diff --git a/etc/environment.yml b/etc/environment.yml index c6868c3d..364369e3 100644 --- a/etc/environment.yml +++ b/etc/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: # required - - python=3.9 + - python - numpy>=1.15.0 - pandas - scipy @@ -21,3 +21,7 @@ dependencies: - mfpymake - imp - nose + - pip + - pip: + - git+https://github.com/pypest/pyemu.git@develop + - git+https://github.com/modflowpy/flopy.git \ No newline at end of file From 3fc81534e63e72e821c283687bab4ee2f1a423ef Mon Sep 17 00:00:00 2001 From: jwhite Date: Fri, 19 Jan 2024 09:42:16 -0700 Subject: [PATCH 2/5] trying to use micromamba --- etc/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/environment.yml b/etc/environment.yml index 364369e3..5489c564 100644 --- a/etc/environment.yml +++ b/etc/environment.yml @@ -22,6 +22,7 @@ dependencies: - imp - nose - pip + - git - pip: - git+https://github.com/pypest/pyemu.git@develop - git+https://github.com/modflowpy/flopy.git \ No newline at end of file From e37afb587c97489900c838035a4e6e67559e3a9d Mon Sep 17 00:00:00 2001 From: jwhite Date: Fri, 19 Jan 2024 09:48:03 -0700 Subject: [PATCH 3/5] trying to use micromamba --- .github/workflows/ci.yml | 57 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab5598d9..9acefe2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,36 +68,37 @@ jobs: # Standard python fails on windows without GDAL installation # Using custom bash shell ("shell: bash -l {0}") with Miniconda - - name: Setup Miniconda - uses: conda-incubator/setup-miniconda@v2 - with: - # python-version: ${{ matrix.python-version }} - # #mamba-version: "0.20.0" - # channels: conda-forge - # auto-update-conda: true - # activate-environment: pyemu - # use-only-tar-bz2: true - miniforge-version: latest - # miniconda-version: "latest" - python-version: ${{ matrix.python-version }} - # mamba-version: "*" - # channels: conda-forge - miniforge-variant: Mambaforge - # auto-update-conda: true - activate-environment: pyemu - use-mamba: true - # environment-file: etc/environment.yml - # use-only-tar-bz2: true - + # - name: Setup Miniconda + # uses: conda-incubator/setup-miniconda@v2 + # with: + # # python-version: ${{ matrix.python-version }} + # # #mamba-version: "0.20.0" + # # channels: conda-forge + # # auto-update-conda: true + # # activate-environment: pyemu + # # use-only-tar-bz2: true + # miniforge-version: latest + # # miniconda-version: "latest" + # python-version: ${{ matrix.python-version }} + # # mamba-version: "*" + # # channels: conda-forge + # miniforge-variant: Mambaforge + # # auto-update-conda: true + # activate-environment: pyemu + # use-mamba: true + # # environment-file: etc/environment.yml + # # use-only-tar-bz2: true + + - name: setup micromamba - uses: mamba-org/setup-micromamba@v1 with: - micromamba-version: '1.3.1-0' - environment-file: etc/environment.yml - init-shell: >- - bash - powershell - cache-environment: true - post-cleanup: 'all' + micromamba-version: '1.3.1-0' + environment-file: etc/environment.yml + init-shell: >- + bash + powershell + cache-environment: true + post-cleanup: 'all' # - name: Add packages to pyemu environment using mamba or conda # shell: bash -l {0} From 7d70aef02737931ae810e790f63305d1381c83bb Mon Sep 17 00:00:00 2001 From: jwhite Date: Fri, 19 Jan 2024 09:53:34 -0700 Subject: [PATCH 4/5] trying to use micromamba --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9acefe2a..f38c62d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: # # use-only-tar-bz2: true - name: setup micromamba - - uses: mamba-org/setup-micromamba@v1 + uses: mamba-org/setup-micromamba@v1 with: micromamba-version: '1.3.1-0' environment-file: etc/environment.yml From b215d0c4fe90c3a0ac84eeddcc70d26cfdf522c5 Mon Sep 17 00:00:00 2001 From: jwhite Date: Fri, 19 Jan 2024 10:02:38 -0700 Subject: [PATCH 5/5] more --- etc/environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/environment.yml b/etc/environment.yml index 5489c564..07aeb036 100644 --- a/etc/environment.yml +++ b/etc/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: # required - - python + - python<=3.11 - numpy>=1.15.0 - pandas - scipy @@ -23,6 +23,7 @@ dependencies: - nose - pip - git + - imp - pip: - git+https://github.com/pypest/pyemu.git@develop - git+https://github.com/modflowpy/flopy.git \ No newline at end of file