From 08ca21d6573b3129781a26a332b88ded07856c93 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Fri, 4 Oct 2024 14:57:31 +0200 Subject: [PATCH 1/2] bump GHA --- .github/workflows/deploy-docs.yml | 2 +- .github/workflows/tarball-tests.yml | 2 +- .github/workflows/test_code_generation.yml | 2 +- .github/workflows/tests.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 3690a7c..49ac6eb 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Micromamba - uses: mamba-org/setup-micromamba@v1 + uses: mamba-org/setup-micromamba@v2 with: environment-name: TEST init-shell: bash diff --git a/.github/workflows/tarball-tests.yml b/.github/workflows/tarball-tests.yml index b7c788c..cd2f3e8 100644 --- a/.github/workflows/tarball-tests.yml +++ b/.github/workflows/tarball-tests.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Micromamba - uses: mamba-org/setup-micromamba@v1 + uses: mamba-org/setup-micromamba@v2 with: environment-name: TEST init-shell: bash diff --git a/.github/workflows/test_code_generation.yml b/.github/workflows/test_code_generation.yml index caea97c..0cae6d2 100644 --- a/.github/workflows/test_code_generation.yml +++ b/.github/workflows/test_code_generation.yml @@ -19,7 +19,7 @@ jobs: fetch-depth: 0 - name: Setup Micromamba - uses: mamba-org/setup-micromamba@v1 + uses: mamba-org/setup-micromamba@v2 with: environment-name: TEST init-shell: bash diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4d7a5f2..e666bb8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Micromamba Python ${{ matrix.python-version }} numpy ${{ matrix.numpy-version }} - uses: mamba-org/setup-micromamba@v1 + uses: mamba-org/setup-micromamba@v2 with: environment-name: TEST init-shell: bash From 1910feddbd52055e40ae06fe0693c363ed757f06 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Fri, 4 Oct 2024 14:57:52 +0200 Subject: [PATCH 2/2] don't use dev releases --- .github/workflows/test_code_generation.yml | 8 +++----- .github/workflows/tests.yml | 20 ++------------------ 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/.github/workflows/test_code_generation.yml b/.github/workflows/test_code_generation.yml index 0cae6d2..651a98b 100644 --- a/.github/workflows/test_code_generation.yml +++ b/.github/workflows/test_code_generation.yml @@ -24,14 +24,12 @@ jobs: environment-name: TEST init-shell: bash create-args: >- - python=3 pip + python=3 + python-build + numpy --file requirements-dev.txt --channel conda-forge - - name: Install nightly version of numpy - run: | - python -m pip install --pre --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple --extra-index-url https://pypi.org/simple numpy scipy pandas -U - - name: Test Code Generation run: > git clone https://github.com/TEOS-10/GSW-C.git ../GSW-C diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e666bb8..1666b82 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,19 +10,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] - os: [windows-latest, ubuntu-latest, macos-latest] - experimental: [false] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] + os: [ windows-latest, ubuntu-latest, macos-latest ] # Oldest one based on NEP-29 and latest one. # See https://numpy.org/neps/nep-0029-deprecation_policy.html numpy-version: ["1.23", "1.26"] exclude: - python-version: "3.12" numpy-version: "1.23" - include: - - python-version: "3.12" - os: "ubuntu-latest" - experimental: true fail-fast: false defaults: run: @@ -39,18 +34,7 @@ jobs: create-args: >- python=${{ matrix.python-version }} python-build numpy=${{ matrix.numpy-version }} --file requirements-dev.txt --channel conda-forge - - name: Install unstable dependencies - if: matrix.experimental == true - run: | - python -m pip install \ - --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/ \ - --trusted-host pypi.anaconda.org \ - --no-deps --pre --upgrade \ - numpy scipy pandas; - python -m pip install -v -e . --no-deps --no-build-isolation --force-reinstall - - name: Install gsw - if: matrix.experimental != true run: | python -m pip install -e . --no-deps --force-reinstall