ctsm5.3.041: Merge b4b-dev to master 2025-04-24

.git-blame-ignore-revs

@@ -62,3 +62,5 @@ e8fc526e0d7818d45f171488c78392c4ff63902a
 890b4633c5477dc074f79c69c40d650196337591
 1972cef6bba0d97169b30a53f540d56bcbd97281
 cdf40d265cc82775607a1bf25f5f527bacc97405
+251e389b361ba673b508e07d04ddcc06b2681989
+8ec50135eca1b99c8b903ecdaa1bd436644688bd

.github/workflows/fleximod_test.yaml

@@ -0,0 +1,31 @@
+name: git-fleximod test
+#
+# Test git-fleximod update and cleanliness
+# Based closely on workflow from CESM repo
+#
+on: [push, pull_request]
+
+jobs:
+  fleximod-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # oldest supported and latest supported
+        python-version: ["3.7", "3.x"]
+    steps:
+      - id: checkout-CTSM
+        uses: actions/checkout@v4
+      - id: run-fleximod
+        run: |
+          $GITHUB_WORKSPACE/bin/git-fleximod update
+          echo
+          echo "Update complete, checking status"
+          echo
+          $GITHUB_WORKSPACE/bin/git-fleximod test
+      - id: check-cleanliness
+        run: |
+          echo
+          echo "Checking if git fleximod matches expected externals"
+          echo
+          git diff --exit-code

.github/workflows/formatting_python.yml

@@ -0,0 +1,44 @@
+name: Check Python formatting
+
+on:
+  push:
+    paths:
+      - 'python/**'
+      - 'cime_config/SystemTests/**'
+      - 'cime_config/buildlib/**'
+      - 'cime_config/buildnml/**'
+  pull_request:
+    paths:
+      - 'python/**'
+      - 'cime_config/SystemTests/**'
+      - 'cime_config/buildlib/**'
+      - 'cime_config/buildnml/**'
+
+jobs:
+  lint-and-format-check:
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the code
+      - uses: actions/checkout@v4
+
+      # Set up the conda environment
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          activate-environment: ctsm_pylib
+          environment-file: python/conda_env_ctsm_py.yml
+          channels: conda-forge
+          auto-activate-base: false
+
+      # Run pylint check
+      - name: Run pylint
+        run: |
+          cd python
+          conda run -n ctsm_pylib make lint
+
+      # Run black check
+      - name: Run black
+        # Run this step even if previous step(s) failed
+        if: success() || failure()
+        run: |
+          cd python
+          conda run -n ctsm_pylib make black

.gitmodules

@@ -31,7 +31,7 @@ url = https://github.com/NGEET/fates
 fxtag = sci.1.82.3_api.39.0.0
 fxrequired = AlwaysRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
-fxDONOTUSEurl = https://github.com/NCAR/fates-release
+fxDONOTUSEurl = https://github.com/NGEET/fates
 
 [submodule "cism"]
 path = components/cism