Revert all changes after commit 1085a14 (Remove 'cmor' from run dependencies)

rbeucher · rbeucher · commit 207f1197c1d5 · 2025-11-21T13:42:36.000+10:00
diff --git a/.conda/environment.yml b/.conda/environment.yml
@@ -6,3 +6,4 @@ channels:
 dependencies:
   - anaconda-client
   - conda-build
+  - conda-verify
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
@@ -12,16 +12,14 @@ build:
     noarch: python
     number: 0
     script: "{{ PYTHON }} -m pip install . -vv"
-    skip: true  # [py>=3.13]
 
 requirements:
     host:
         - python
         - pip
-        - setuptools
         - versioneer
     run:
-        - python >=3.11,<3.14
+        - python >=3.11
         - xarray
         - numpy
         - dask
@@ -30,7 +28,8 @@ requirements:
 
 about:
     home: https://github.com/ACCESS-NRI/ACCESS-MOPPy
-    license: Apache-2.0
+    license: Apache Software
+    license_family: APACHE
     summary: 'ACCESS-MOPPy post-process ACCESS raw model output using CMOR and pre-defined data standards'
 
 extra:
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -7,94 +7,89 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version to publish (e.g. 2.3.0a9)'
+        description: 'Version to update to (e.g. 2.3.0a9)'
         required: false
         type: string
 
 jobs:
   pypi:
-    name: Build & Deploy to PyPI
+    name: build and deploy to PyPI
     runs-on: ubuntu-latest
     permissions:
       id-token: write
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6.0.0
-
-      - name: Set up Python
+      - name: Checkout source
+        uses: actions/checkout@v5.0.0
+      - name: Set up Python 3.11
         uses: actions/setup-python@v6
         with:
-          python-version: '3.11'
-
-      - name: Install build tooling
-        run: python -m pip install --upgrade pip build twine
-
+          python-version: 3.11
+      - name: Install build dependencies
+        run: python -m pip install build twine
       - name: Build distributions
+        shell: bash -l {0}
         run: |
           git clean -xdf
-          python -m build
-
-      - name: Publish to PyPI
+          pyproject-build
+      - name: Publish package to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           skip-existing: true
 
   conda:
-    name: Build & Deploy to Conda
+    name: build and deploy to conda
     needs: pypi
     runs-on: ubuntu-latest
-    env:
-      PACKAGE: access_moppy
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6.0.0
-
-      - name: Derive Version
-        id: ver
-        run: |
-          tag="${GITHUB_REF_NAME}"
-          ver="${tag#moppy-}"
-          ver="${ver#v}"
-          echo "version=$ver" >> $GITHUB_OUTPUT
-
-      - name: Wait for PyPI availability (fast check)
-        env:
-          VER: ${{ steps.ver.outputs.version }}
+      - name: Checkout source
+        uses: actions/checkout@v5.0.0
+      - name: Wait for PyPI propagation
         run: |
-          echo "Checking PyPI for $PACKAGE==$VER..."
-          for i in {1..60}; do
-            if curl -sf https://pypi.org/pypi/$PACKAGE/$VER/json > /dev/null; then
-              echo "🟢 Found $PACKAGE==$VER on PyPI"
-              exit 0
+          echo "Waiting for PyPI package to be downloadable..."
+          PACKAGE_NAME="access_moppy"
+          VERSION=$(python -c "import versioneer; print(versioneer.get_version())")
+          VERSION=${VERSION#v}
+          echo "Looking for package: ${PACKAGE_NAME}==${VERSION}"
+          for i in {1..90}; do
+            echo "Attempt $i/90: Trying to download wheel and sdist..."
+            rm -rf /tmp/pypi_check_download && mkdir -p /tmp/pypi_check_download
+            pip download --no-deps --dest /tmp/pypi_check_download ${PACKAGE_NAME}==${VERSION} >/dev/null 2>&1
+            pip download --no-deps --no-binary=:all: --dest /tmp/pypi_check_download ${PACKAGE_NAME}==${VERSION} >/dev/null 2>&1
+            WHEEL=$(ls /tmp/pypi_check_download/*.whl 2>/dev/null | head -1)
+            SDIST=$(ls /tmp/pypi_check_download/*.tar.gz 2>/dev/null | head -1)
+            if [[ -n "$WHEEL" && -n "$SDIST" ]]; then
+              echo "✅ Both wheel and sdist for ${PACKAGE_NAME}==${VERSION} are downloadable!"
+              break
+            fi
+            if [ $i -eq 90 ]; then
+              echo "❌ Could not download both wheel and sdist after 15 minutes"
+              echo "Available files:"
+              ls -l /tmp/pypi_check_download || echo "No files downloaded"
+              exit 1
             fi
-            echo "Waiting... $i/60"
+            echo "Files not yet downloadable, waiting 10 seconds..."
             sleep 10
           done
-          echo "❌ Timeout waiting for $PACKAGE==$VER on PyPI"
-          exit 1
-
-      - name: Setup conda
+      - name: Setup conda environment
         uses: conda-incubator/setup-miniconda@v3
         with:
+          miniconda-version: "latest"
           python-version: 3.11
           environment-file: .conda/environment.yml
           auto-update-conda: false
           auto-activate-base: false
           show-channel-urls: true
-
-      - name: Build & Upload to Conda
-        uses: ACCESS-NRI/action-build-and-upload-conda-packages@v3.0.0
+      - name: Build and upload the conda package
+        uses: ACCESS-NRI/action-build-and-upload-conda-packages@d97711bc4445ba5c4de55f5a1bccbd4815286289
         with:
           meta_yaml_dir: .conda
           upload: true
           user: accessnri
           label: main
-          token: ${{ secrets.ANACONDA_TOKEN }}
+          token: ${{ secrets.anaconda_token }}
 
   update_analysis3:
-    name: Update access-moppy in Analysis3
+    name: Update ACCESS-MOPPy on Analysis3 Conda Environment
     needs: conda
     runs-on: ubuntu-latest
     permissions:
@@ -106,9 +101,9 @@ jobs:
       FILE_PATH: environments/analysis3/environment.yml
       PACKAGE: access-moppy
       CHANNEL: accessnri
-      GH_TOKEN: ${{ secrets.GH_ANALYSIS3_DEPLOY }}
-      INPUT_VERSION: ${{ github.event.inputs.version }}
       RELEASE_TAG: ${{ github.ref_name }}
+      INPUT_VERSION: ${{ github.event.inputs.version }}
+      GH_TOKEN: ${{ secrets.GH_ANALYSIS3_DEPLOY }}
     steps:
       - name: Derive version string
         id: ver
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,6 +3,8 @@ name: CI
 on:
   pull_request:
     branches: [main]
+  push:
+    branches: [main]
   workflow_dispatch:
     inputs:
       test_suite:
@@ -19,7 +21,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6.0.0
+      - uses: actions/checkout@v5.0.0
       - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           pixi-version: v0.39.5
@@ -32,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v6.0.0
+        uses: actions/checkout@v5.0.0
 
       - name: Setup pixi
         uses: prefix-dev/setup-pixi@v0.9.3
diff --git a/.github/workflows/full-tests.yml b/.github/workflows/full-tests.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v5.0.0
 
       - name: Setup pixi
         uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.0
