Merge branch 'main' into scikit_build

Author: ChrisBarker-NOAA

.github/workflows/conda_test.yml

@@ -1,6 +1,10 @@
 name: Run tests with miniforge
 on: [push]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: Miniconda ${{ matrix.os }} Py${{ matrix.pyver }}
@@ -15,10 +19,8 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
-          activate-environment: test
           miniforge-version: latest
           python-version: ${{ matrix.pyver }}
-          auto-activate-base: false
           conda-remove-defaults: true
 
       - name: Setup environment
@@ -49,10 +51,8 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
-          activate-environment: test
           miniforge-version: latest
           python-version: "3.10"
-          auto-activate-base: false
           conda-remove-defaults: true
       - name: Lint
         shell: bash -l {0}

.github/workflows/static_docs.yml

@@ -6,11 +6,8 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  # Runs on pushes targeting the default branch
   push:
     branches: ["main"]
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
@@ -43,5 +40,6 @@ jobs:
           # Upload entire repository
           path: 'docs/build/html'
       - name: Deploy to GitHub Pages
+        # if: github.ref == 'refs/heads/main'
         id: deployment
         uses: actions/deploy-pages@v4

pyproject.toml

@@ -60,3 +60,4 @@ macos.environment.MACOSX_DEPLOYMENT_TARGET = "13"
 [tool.cibuildwheel.windows]
 before-build = "pip install delvewheel"
 repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel} --add-path C:/vcpkg/vcpkg_installed/"
+