Merge main.

Author: nealkruis

.github/actions/build-cse/action.yml

@@ -53,31 +53,23 @@ jobs:
       - name: Get number of CPU cores # Can replace when CMake is upgraded to 3.29
         uses: SimenB/github-actions-cpu-cores@v2
         id: cpu-cores
-      - name: Install uv
+      # - name: Setup Mesa3D
+      #   uses: bigladder/github-actions/setup-mesa3d@main
+      #   with:
+      #     install-directory: msvc
+      - name: Install uv and set the python version
         uses: astral-sh/setup-uv@v5
         with:
           python-version: "3.13"
       - name: Build CSE
-        uses: ./.github/actions/build-cse
-        with:
-          arch: ${{ matrix.arch }}
-          config: ${{ matrix.config }}
-          compiler: ${{ matrix.compiler }}
-      - name: Build cse_tests.exe (unit tests)
-        run: cmake -DBUILD_ARCHITECTURE=${{ matrix.arch }} -DCONFIGURATION=${{ matrix.config }} -DTARGET_NAME=cse_tests -DBUILD_DIRECTORY=build -P cmake/build.cmake
+        run: cmake -DBUILD_ARCHITECTURE=${{ matrix.arch }} -DCOMPILER_ID=${{ matrix.compiler }} -DCONFIGURATION=${{ matrix.config }} -DBUILD_DIRECTORY=build -DBUILD_DOCS_WITH_ALL=ON -P cmake/configure-and-build.cmake
       - name: Upload executable artifact
         uses: actions/upload-artifact@v4
         with:
-          name: CSE_${{ matrix.os }}-${{ matrix.os_ver }}-${{ matrix.arch }}bit_${{ matrix.config }}
+          name: CSE-${{ matrix.os }}-${{ matrix.os_ver }}-${{ matrix.arch }}bit-${{ matrix.config }}
           path: |
             build/CSE*
             build/cse*
-      - name: Build wcmp executable
-        run: cmake -DBUILD_ARCHITECTURE=${{ matrix.arch }} -DCONFIGURATION=${{ matrix.config }} -DTARGET_NAME=wcmp -DBUILD_DIRECTORY=build -P cmake/build.cmake
-      # - name: Setup Mesa3D
-      #   uses: bigladder/github-actions/setup-mesa3d@main
-      #   with:
-      #     install-directory: msvc
       - name: Test
         id: test
         run: ctest -C ${{ matrix.config }} -j ${{ steps.cpu-cores.outputs.count }} --output-on-failure -E shadetest  # CI can't do GPU calcs at this time (the steps above get us close, but throws an exception on destruction)
@@ -91,39 +83,12 @@ jobs:
           path: |
             test/*.rep
             test/*.REP
-      - name: Check test failure
-        if: steps.test.outcome == 'failure'
-        run: exit 1
-  build-doc:
-    strategy:
-      fail-fast: false
-    name: Build CSE documentation
-    needs: build-cse
-    if: ${{ always() }}
-    runs-on: windows-2022
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          enable-cache: false
-          python-version: "3.13"
-      - name: Configure CMake
-        run: cmake -P cmake/configure.cmake
-      - name: Download CSE artifact
-        uses: ./.github/actions/download-cse-artifact
-      - name: Build docs
-        uses: ./.github/actions/build-docs
-      - name: Run coverage check
-        run: rake coverage
-        working-directory: doc
-        env:
-          CSE_EXE_PATH: ..\\build\\CSE.exe
       - name: Upload documentation
         uses: actions/upload-artifact@v4
         with:
-          name: Documentation
+          name: Documentation-${{ matrix.os }}-${{ matrix.os_ver }}-${{ matrix.arch }}
           path: |
-                doc/output
-                !doc/output/.git
+            doc/build
+      - name: Check test failure
+        if: steps.test.outcome == 'failure'
+        run: exit 1

.github/actions/build-docs/action.yml

@@ -18,19 +18,21 @@ jobs:
         with:
           fetch-depth: 0
           submodules: recursive
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v5
+        with:
+          python-version: "3.13"
       - name: Build CSE
-        uses: ./.github/actions/build-cse
+        run: cmake -DBUILD_ARCHITECTURE=32 -DCOMPILER_ID=msvc -DCONFIGURATION=Release -DBUILD_DIRECTORY=build -DBUILD_DOCS_WITH_ALL=ON -P cmake/configure-and-build.cmake
       - name: Upload executable to release assets
         uses: softprops/action-gh-release@v2
         with:
           files: build/CSE.exe
-      - name: Build docs
-        uses: ./.github/actions/build-docs
       - name: Update gh-pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: doc/output
+          publish_dir: doc/build
           user_name: 'cse-ci'
           user_email: '[email protected]'
           full_commit_message: "Update docs for ${{ github.event.release.tag_name }}."

.github/actions/download-cse-artifact/action.yml

@@ -0,0 +1,18 @@
+repos:
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.9.9
+  hooks:
+    # Run the formatter (automatically fixes in-place)
+    - id: ruff-format
+    # Run the linter
+    - id: ruff
+      args: [ --fix ]
+- repo: local
+  hooks:
+    - id: mypy
+      name: mypy
+      entry: uv run mypy
+      require_serial: true
+      language: system
+      types: [python]

.github/workflows/build-and-test.yml

@@ -0,0 +1 @@
+3.13

.github/workflows/release.yml

@@ -92,3 +92,16 @@ set_directory_properties(PROPERTIES VS_STARTUP_PROJECT CSE)
 enable_testing()
 
 add_subdirectory(test)
+
+# Documentation
+set(cse_documentation_build_options "DoNotBuild;BuildWithAll;BuildSeparately")
+set(CSE_BUILD_DOCUMENTATION "BuildSeparately" CACHE STRING "Choose when/if to build documentation (${cse_documentation_build_options}).")
+set_property(CACHE CSE_BUILD_DOCUMENTATION PROPERTY STRINGS ${cse_documentation_build_options})
+
+if(NOT CSE_BUILD_DOCUMENTATION IN_LIST cse_documentation_build_options)
+  message(FATAL_ERROR "CSE_BUILD_DOCUMENTATION must be one of ${cse_documentation_build_options}")
+endif()
+
+if(NOT CSE_BUILD_DOCUMENTATION STREQUAL "DoNotBuild")
+  add_subdirectory(doc)
+endif()

.pre-commit-config.yaml

@@ -8,8 +8,8 @@ CSE is a general purpose building simulation model developed primarily to perfor
 
 The CSE User Manual can be found on the [CSE Documentation Web Site](https://cse-sim.github.io/cse):
 
-- [HTML Format](https://cse-sim.github.io/cse/cse-user-manual.html) (single page)
-- [HTML Format](https://cse-sim.github.io/cse/cse-user-manual/index.html) (multi page)
+- [HTML Format](https://cse-sim.github.io/cse/single_page/) (single page)
+- [HTML Format](https://cse-sim.github.io/cse/introduction/) (multi page)
 
 ### Issues and Issue Reporting
 

.python-version

@@ -45,7 +45,6 @@ if (GIT_TAG MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+(\\-[0-9A-Za-z-]+)?$")
   string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+)(\\-[0-9A-Za-z-]+)?$" "\\1" CSEVRSN_PATCH "${GIT_TAG}")
   if (GIT_TAG MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+(\\-[0-9A-Za-z-]+)$")
     string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+(\\-[0-9A-Za-z-]+)$" "\\1" CSEVRSN_PRERELEASE "${GIT_TAG}")
-    message(STATUS "CSEVRSN_PRERELEASE is ${CSEVRSN_PRERELEASE}")
   endif()
 elseif(GIT_TAG MATCHES "^cse\\.[0-9]+$")
   # old version scheme