From 0449cb13bba8b90bcfb490e2dcf42aa62a88907c Mon Sep 17 00:00:00 2001 From: Kristen Thyng Date: Wed, 30 Oct 2024 07:18:39 -0700 Subject: [PATCH 1/4] added win specific env for ci --- .github/workflows/test.yaml | 27 ++++++++++++- ci/environment-py3.10-win.yml | 39 +++++++++++++++++++ ci/environment-py3.11-win.yml | 39 +++++++++++++++++++ ci/environment-py3.12-win.yml | 39 +++++++++++++++++++ ...nment-py3.9.yml => environment-py3.12.yml} | 2 +- 5 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 ci/environment-py3.10-win.yml create mode 100644 ci/environment-py3.11-win.yml create mode 100644 ci/environment-py3.12-win.yml rename ci/{environment-py3.9.yml => environment-py3.12.yml} (97%) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e3f07e7..e695213 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,8 @@ jobs: os: ["macos-latest", "ubuntu-latest", "windows-latest"] python-version: ["3.9", "3.10", "3.11"] steps: - - uses: actions/checkout@v4 + - name: Checkout source + uses: actions/checkout@v4 # - name: Cache conda # uses: actions/cache@v3 # env: @@ -21,7 +22,8 @@ jobs: # path: ~/conda_pkgs_dir # key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment-py${{ matrix.python-version }}.yml') }} - - name: Setup Micromamba Python ${{ matrix.python-version }} + - name: Setup Linux/macOS Micromamba Python ${{ matrix.python-version }} + if: ${{ runner.os != 'Windows' }} uses: mamba-org/setup-micromamba@v1 with: init-shell: bash @@ -31,6 +33,27 @@ jobs: cache-environment: true post-cleanup: 'all' + - name: Setup Windows Micromamba Python ${{ matrix.python-version }} + if: ${{ runner.os == 'Windows' }} + uses: mamba-org/setup-micromamba@v1 + with: + init-shell: bash + create-args: >- + python=${{ matrix.python-version }} --channel conda-forge + environment-file: ci/environment-py${{ matrix.python-version }}-win.yml + cache-environment: true + post-cleanup: 'all' + + # - name: Setup Micromamba Python ${{ matrix.python-version }} + # uses: mamba-org/setup-micromamba@v1 + # with: + # init-shell: bash + # create-args: >- + # python=${{ matrix.python-version }} --channel conda-forge + # environment-file: ci/environment-py${{ matrix.python-version }}.yml + # cache-environment: true + # post-cleanup: 'all' + # - name: Set up conda environment # uses: conda-incubator/setup-miniconda@v2 diff --git a/ci/environment-py3.10-win.yml b/ci/environment-py3.10-win.yml new file mode 100644 index 0000000..20f13c0 --- /dev/null +++ b/ci/environment-py3.10-win.yml @@ -0,0 +1,39 @@ +name: test_env_model_assessor +channels: + - conda-forge +dependencies: + - python=3.10 + ############## These will have to be adjusted to your specific project + # - cf_pandas + - cartopy + - cf_xarray + - cmocean + - datetimerange + # - esmf>=8.5.0 + # - esmpy>=8.5.0 # https://github.com/esmf-org/esmf/issues/140 + - extract_model + # - intake + # - intake-axds + # - intake-erddap + - matplotlib-base + - numpy + - pandas + - pyproj + - scipy + - xarray + - xcmocean + - alphashape + - cf_pandas + - intake-axds + - intake-erddap + - intake>=0.7.0 + - nested-lookup + # - xesmf + - xroms # github actions won't find on conda-forge + ############## + - pytest + - pip: + - codecov + - pytest-cov + - pytest-mpl + - coverage[toml] diff --git a/ci/environment-py3.11-win.yml b/ci/environment-py3.11-win.yml new file mode 100644 index 0000000..cc26ab3 --- /dev/null +++ b/ci/environment-py3.11-win.yml @@ -0,0 +1,39 @@ +name: test_env_model_assessor +channels: + - conda-forge +dependencies: + - python=3.11 + ############## These will have to be adjusted to your specific project + # - cf_pandas + - cartopy + - cf_xarray + - cmocean + - datetimerange + # - esmf>=8.5.0 + # - esmpy>=8.5.0 # https://github.com/esmf-org/esmf/issues/140 + - extract_model + # - intake + # - intake-axds + # - intake-erddap + - matplotlib-base + - numpy + - pandas + - pyproj + - scipy + - xarray + - xcmocean + ############## + - alphashape + - cf_pandas + - intake-axds + - intake-erddap + - intake>=0.7.0 + - nested-lookup + # - xesmf + - xroms # github actions won't find on conda-forge + - pytest + - pip: + - codecov + - pytest-cov + - pytest-mpl + - coverage[toml] diff --git a/ci/environment-py3.12-win.yml b/ci/environment-py3.12-win.yml new file mode 100644 index 0000000..e273e33 --- /dev/null +++ b/ci/environment-py3.12-win.yml @@ -0,0 +1,39 @@ +name: test_env_model_assessor +channels: + - conda-forge +dependencies: + - python=3.12 + ############## These will have to be adjusted to your specific project + # - cf_pandas + - cartopy + - cf_xarray + - cmocean + - datetimerange + # - esmf>=8.5.0 + # - esmpy>=8.5.0 # https://github.com/esmf-org/esmf/issues/140 + - extract_model + # - intake + # - intake-axds + # - intake-erddap + - matplotlib-base + - numpy + - pandas + - pyproj + - scipy + - xarray + - xcmocean + ############## + - alphashape + - cf_pandas + - intake-axds + - intake-erddap + - intake + - nested-lookup + # - xesmf + - xroms # github actions won't find on conda-forge + - pytest + - pip: + - codecov + - pytest-cov + - pytest-mpl + - coverage[toml] diff --git a/ci/environment-py3.9.yml b/ci/environment-py3.12.yml similarity index 97% rename from ci/environment-py3.9.yml rename to ci/environment-py3.12.yml index 050c1bc..24d3fee 100644 --- a/ci/environment-py3.9.yml +++ b/ci/environment-py3.12.yml @@ -2,7 +2,7 @@ name: test_env_model_assessor channels: - conda-forge dependencies: - - python=3.9 + - python=3.12 ############## These will have to be adjusted to your specific project # - cf_pandas - cartopy From 3691f41b03ae890276ce870c9eea91b62ac275d5 Mon Sep 17 00:00:00 2001 From: Kristen Thyng Date: Wed, 30 Oct 2024 07:21:39 -0700 Subject: [PATCH 2/4] updated whats new --- docs/whats_new.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/whats_new.md b/docs/whats_new.md index 342ee60..e689771 100644 --- a/docs/whats_new.md +++ b/docs/whats_new.md @@ -1,5 +1,8 @@ # What's New +## v1.3.2 (October 30, 2024) +* added Windows-specific CI build environments that exclude xESMF-related packages + ## v1.3.1 (October 30, 2024) * updated release workflow so it will work on PyPI From 1a1502acd6c579ee04ceb925cbde37e92bad5e84 Mon Sep 17 00:00:00 2001 From: Kristen Thyng Date: Wed, 30 Oct 2024 07:28:08 -0700 Subject: [PATCH 3/4] switched from 3.9 to 3.12 --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e695213..158e0d4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: os: ["macos-latest", "ubuntu-latest", "windows-latest"] - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] steps: - name: Checkout source uses: actions/checkout@v4 From 07d60f9cf636d257b7429018914e419eeb5a1b8e Mon Sep 17 00:00:00 2001 From: Kristen Thyng Date: Wed, 30 Oct 2024 07:33:12 -0700 Subject: [PATCH 4/4] back to 3.9 bc 3.12 errored --- .github/workflows/test.yaml | 2 +- ci/{environment-py3.12-win.yml => environment-py3.9-win.yml} | 2 +- ci/{environment-py3.12.yml => environment-py3.9.yml} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename ci/{environment-py3.12-win.yml => environment-py3.9-win.yml} (97%) rename ci/{environment-py3.12.yml => environment-py3.9.yml} (97%) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 158e0d4..e695213 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: os: ["macos-latest", "ubuntu-latest", "windows-latest"] - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11"] steps: - name: Checkout source uses: actions/checkout@v4 diff --git a/ci/environment-py3.12-win.yml b/ci/environment-py3.9-win.yml similarity index 97% rename from ci/environment-py3.12-win.yml rename to ci/environment-py3.9-win.yml index e273e33..509f28b 100644 --- a/ci/environment-py3.12-win.yml +++ b/ci/environment-py3.9-win.yml @@ -2,7 +2,7 @@ name: test_env_model_assessor channels: - conda-forge dependencies: - - python=3.12 + - python=3.9 ############## These will have to be adjusted to your specific project # - cf_pandas - cartopy diff --git a/ci/environment-py3.12.yml b/ci/environment-py3.9.yml similarity index 97% rename from ci/environment-py3.12.yml rename to ci/environment-py3.9.yml index 24d3fee..050c1bc 100644 --- a/ci/environment-py3.12.yml +++ b/ci/environment-py3.9.yml @@ -2,7 +2,7 @@ name: test_env_model_assessor channels: - conda-forge dependencies: - - python=3.12 + - python=3.9 ############## These will have to be adjusted to your specific project # - cf_pandas - cartopy