Merge pull request #184 from ocefpaf/no_need_4_dev

Remove nightly version of numpy
TEOS-10 · Oct 4, 2024 · 1a142dd · 1a142dd
2 parents 6784eda + 1910fed
commit 1a142dd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git 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
@@ -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
@@ -19,19 +19,17 @@ 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
         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
@@ -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:
@@ -32,25 +27,14 @@ 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
         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