Merge branch 'main' into add-pyglpk

ARM-DOE · Oct 17, 2024 · cdb8aa7 · cdb8aa7
2 parents 9d65a13 + 885422e
commit cdb8aa7
Show file tree

Hide file tree

Showing 147 changed files with 6,510 additions and 655 deletions.
diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml
@@ -20,7 +20,7 @@ jobs:
 
       # Create environment using micromamba
       - name: Install Conda environment with Micromamba
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2.0.0
         with:
           environment-file: doc/environment.yml
           environment-name: pyart-docs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,11 +35,14 @@ jobs:
 
       # Install dependencies
       - name: Setup Conda Environment
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2.0.0
         with:
           environment-file: continuous_integration/environment-ci.yml
-          environment-name: pyart-dev
+          micromamba-version: '2.0.0-0'
+          init-shell: >-
+            bash
           cache-downloads: true
+          post-cleanup: "all"
           create-args: python=${{ matrix.python-version }}
 
       - name: Fetch all history for all tags and branches
@@ -54,7 +57,7 @@ jobs:
       - name: Run Linting
         shell: bash -l {0}
         run: |
-          ruff .
+          ruff check .
 
       - name: Run Tests
         id: run_tests
@@ -63,7 +66,7 @@ jobs:
           python -m pytest -v --cov=./ --cov-report=xml
 
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v4.3.0
+        uses: codecov/codecov-action@v4.6.0
         with:
           file: ./coverage.xml
           flags: unittests

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -28,7 +28,8 @@ jobs:
         os: [
           ubuntu-20.04,
           windows-2019,
-          macos-11,
+          macos-14,
+          macos-13,
         ]
       fail-fast: false
 
@@ -44,14 +45,13 @@ jobs:
            git fetch --prune --unshallow
 
       - name: Build wheels for CPython
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v2.21.3
         with:
           output-dir: dist
         env:
           CIBW_BUILD: "cp39-* cp310-* cp311-* cp312*"
           CIBW_SKIP: "*-musllinux_*"  #  numpy doesn't have wheels for musllinux so we can't build some quickly and without bloating
           CIBW_ARCHS_LINUX: "x86_64"
-          CIBW_ARCHS_MACOS: x86_64 arm64
           MACOSX_DEPLOYMENT_TARGET: "10.9" # as of CIBW 2.9, this is the default value, pin it so it can't be bumped silently
           CIBW_ARCHS_WINDOWS: "auto64"
           CIBW_BUILD_VERBOSITY: 1
@@ -99,7 +99,7 @@ jobs:
           merge-multiple: true
 
       - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.8.14
+        uses: pypa/gh-action-pypi-publish@v1.10.3
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -24,7 +24,7 @@ repos:
       - id: black-jupyter
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: 'v0.0.239'
+    rev: 'v0.4.9'
     hooks:
       - id: ruff
         args: [ "--fix" ]
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -10,6 +10,8 @@ include pyart/testing/registry.txt
 include pyart/correct/src/UWASHINGTON_4DD_README
 include pyart/__check_build/README
 include pyart/graph/balance-rgb.txt
+include pyart/graph/chase-spectral-rgb.txt
+include pyart/graph/spectral-extended-rgb.txt
 include versioneer.py
 include pyart/_version.py
 include pyart/testing/data/*
diff --git a/README.rst b/README.rst
@@ -184,6 +184,7 @@ The required dependencies to install Py-ART in addition to Python are:
 * `pooch <https://pypi.org/project/pooch/>`_
 * `Cython <https://cython.readthedocs.io/en/latest/>`_
 * `setuptools <https://setuptools.pypa.io/en/latest/index.html>`_
+* `cartopy <https://scitools.org.uk/cartopy/docs/latest/>`_
 
 A working C/C++ compiler is required for some optional modules. An easy method
 to install these dependencies is by using a

diff --git a/continuous_integration/environment-ci.yml b/continuous_integration/environment-ci.yml
@@ -24,14 +24,14 @@ dependencies:
   - cftime
   - setuptools
   - shapely
-  - ruff
+  - ruff==0.4.2
   - mda-xdrlib
   - xradar
+  - pooch
+  - versioneer
+  - black
+  - open-radar-data
   - pip
   - pip:
     - cibuildwheel
-    - pooch
-    - versioneer
-    - glpk
-    - black
-    - git+https://github.com/openradar/open-radar-data
+    - glpk
diff --git a/doc/environment.yml b/doc/environment.yml
@@ -41,3 +41,4 @@ dependencies:
       - pooch
       - versioneer
       - ablog
+      - -e ..
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,3 +41,4 @@ dependencies: @@
           - pooch
           - versioneer
           - ablog
+          - -e ..