From 8918c7edbf4d3fa98a5ce981d739ba65fd59fe93 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Wed, 6 Nov 2024 21:05:24 +0100
Subject: [PATCH 1/2] perform all tarball tests in the sdist build

---
 .github/workflows/cibuildwheel.yml  |  4 +++-
 .github/workflows/tarball-tests.yml | 27 ---------------------------
 requirements-dev.txt                |  2 --
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 .github/workflows/tarball-tests.yml

diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
index 2bf994f..a4d7578 100644
--- a/.github/workflows/cibuildwheel.yml
+++ b/.github/workflows/cibuildwheel.yml
@@ -68,8 +68,10 @@ jobs:
 
       - name: Build sdist
         run: >
-          pip install build
+          pip install build twine check-manifest
           && python -m build --sdist . --outdir dist
+          && twine check dist/*
+          && check-manifest --verbose
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/tarball-tests.yml b/.github/workflows/tarball-tests.yml
deleted file mode 100644
index cd2f3e8..0000000
--- a/.github/workflows/tarball-tests.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Tarball tests
-
-on:
-  pull_request:
-  push:
-    branches: [main]
-
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v2
-      with:
-        environment-name: TEST
-        init-shell: bash
-        create-args: >-
-          python=3 python-build numpy --file requirements-dev.txt --channel conda-forge
-
-    - name: Tarball
-      shell: bash -l {0}
-      run: >
-        python -m build --skip-dependency-check --sdist --wheel .
-        && check-manifest --verbose
-        && twine check dist/*
diff --git a/requirements-dev.txt b/requirements-dev.txt
index dbeb3a3..7b8d47a 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,3 @@
-check-manifest
 dask
 numpydoc
 pandas>=2
@@ -7,5 +6,4 @@ scipy
 setuptools_scm
 sphinx
 sphinx_rtd_theme
-twine
 xarray
\ No newline at end of file

From f336c38ed5839a156204382e90a5dfc962618189 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Thu, 7 Nov 2024 08:50:36 +0100
Subject: [PATCH 2/2] ditch micromamba

---
 .github/workflows/deploy-docs.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index 49ac6eb..e5be8a1 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -7,27 +7,27 @@ on:
     tags:
       - "v*"
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   run:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
 
-    - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v2
+    - name: Set up Python
+      uses: actions/setup-python@v5
       with:
-        environment-name: TEST
-        init-shell: bash
-        create-args: >-
-          python=3 numpy --file requirements-dev.txt --channel conda-forge
+        python-version: "3.x"
 
     - name: Install gsw
-      shell: bash -l {0}
-      run: |
-        python -m pip install -e . --no-deps --force-reinstall
+      run: >
+        python -m pip install -r requirements-dev.txt
+        && python -m pip install -e .
 
     - name: Build documentation
-      shell: bash -l {0}
       run: >
         set -e
         && pushd docs