ctsm5.3.055: Remove broken FTorch submodule

.github/workflows/docs-omnibus.yml

@@ -51,4 +51,4 @@ jobs:
       # TODO: Split testing.sh tests into their own steps in this job
       - name: Text Sphinx builds with omnibus script
         run: |
-          cd doc && conda run -n ctsm_pylib ./testing.sh
+          cd doc && ./testing.sh

.github/workflows/fleximod_test.yaml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
       - id: run-fleximod
         run: |
-          $GITHUB_WORKSPACE/bin/git-fleximod update
+          $GITHUB_WORKSPACE/bin/git-fleximod update -o
           echo
           echo "Update complete, checking status"
           echo
@@ -32,4 +32,4 @@ jobs:
           echo
           echo "Checking if git fleximod matches expected externals"
           echo
-          git diff --exit-code
+          git add . && git diff --exit-code && git diff --cached --exit-code

.gitmodules

@@ -128,13 +128,3 @@ fxtag = v2.2.6
 fxrequired = ToplevelOptional
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/doc-builder
-
-# FTorch is an optional library useful for AI and Machine Learning
-# In order to use it -- it must be checked out with git-fleximod
-[submodule "FTorch"]
-path = libraries/FTorch
-url = https://github.com/ESCOMP/FTorch_interface
-fxtag = v0.0.5
-fxrequired = ToplevelOptional
-# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
-fxDONOTUSEurl = https://github.com/ESCOMP/FTorch_interface

doc/testing.sh

@@ -2,6 +2,10 @@
 set -e
 set -x
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "${SCRIPT_DIR}"
+
+../bin/git-fleximod update -o
 rm -rf _publish*
 
 # Build all docs using container
@@ -34,7 +38,7 @@ rm -rf _build_container
 # Check that Makefile method works
 echo "~~~~~ Check that Makefile method works"
 rm -rf _build
-make SPHINXOPTS="-W --keep-going" BUILDDIR=${PWD}/_build html
+conda run -n ctsm_pylib make SPHINXOPTS="-W --keep-going" BUILDDIR=${PWD}/_build html
 
 # Check that -b works
 echo "~~~~~ Check that -b works (Podman)"