NatLabRockies
diff --git a/‎.github/ISSUE_TEMPLATE/config.yaml‎
Lines changed: 2 additions & 2 deletions b/‎.github/ISSUE_TEMPLATE/config.yaml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 10 additions & 9 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 10 additions & 9 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 67 additions & 28 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 67 additions & 28 deletions
diff --git a/‎.readthedocs.yaml‎
Lines changed: 3 additions & 1 deletion b/‎.readthedocs.yaml‎
Lines changed: 3 additions & 1 deletion
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Usage question
-    url: https://github.com/NREL/H2Integrate/discussions
-    about: Have any questions about using H2Integrate? Post in Discussions to engage with the NREL team and H2Integrate community.
+    url: https://github.com/NatLabRockies/H2Integrate/discussions
+    about: Have any questions about using H2Integrate? Post in Discussions to engage with the NLR team and H2Integrate community.
@@ -78,33 +78,33 @@ IMPORTANT NOTES
     "A complete thought. [PR XYZ]((https://github.com/NatLabRockies/H2Integrate/pull/XYZ)", where
     `XYZ` should be replaced with the actual number.
 
-## Section 3: Related Issues
+## Section 4: Related Issues
 <!--If this PR relates to an existing GitHub issue, please link the issue and indicate whether this PR would fully or partially resolve that issue. Please also link any issues that were created due to this PR-->
 
 
-## Section 4: Impacted Areas of the Software
+## Section 5: Impacted Areas of the Software
 <!--
 Replace the below example with any added or modified files, and briefly describe what has been changed or added, and why. Can exclude CHANGELOG.md, doc pages and supported_models.py.
 -->
-### Section 4.1: New Files
+### Section 5.1: New Files
 - `path/to/file.extension`
   - `method1`: What and why something was changed in one sentence or less.
 
-### Section 4.2: Modified Files
+### Section 5.2: Modified Files
 - `path/to/file.extension`
   - `method1`: What and why something was changed in one sentence or less.
 
-## Section 5: Additional Supporting Information
+## Section 6: Additional Supporting Information
 <!--Add any other context about the problem here.-->
 
 
-## Section 6: Test Results, if applicable
+## Section 7: Test Results, if applicable
 <!--
 Add the results from unit tests and regression tests here along with justification for any
 failing test cases.
 -->
 
-## Section 7 (Optional): New Model Checklist
+## Section 8 (Optional): New Model Checklist
 <!-- Complete this section only if you checked "New Model" above -->
 - [ ] **Model Structure**:
   - [ ] Follows established naming conventions outlined in `docs/developer_guide/coding_guidelines.md`
@@ -128,17 +128,18 @@ failing test cases.
   - [ ] Model added to the main models list in `docs/user_guide/model_overview.md`
     - [ ] Model documentation page added to the appropriate `docs/` section
     - [ ] `<model_name>.md` is added to the `_toc.yml`
+  - [ ] Run `generate_class_hierarchy.py` to update the class hierarchy diagram in `docs/developer_guide/class_structure.md`
 
 
 
 
 
 <!--
-__ For NREL use __
+__ For NLR use __
 Release checklist:
 - [ ] Update the version in h2integrate/__init__.py
 - [ ] Verify docs builds correctly
-- [ ] Create a tag on the main branch in the NREL/H2Integrate repository and push
+- [ ] Create a tag on the main branch in the NatLabRockies/H2Integrate repository and push
 - [ ] Ensure the Test PyPI build is successful
 - [ ] Create a release on the main branch
 -->
@@ -1,53 +1,92 @@
 name: Testing
 on:
   push:
-    branches: [main, develop]
+    branches:
+      - main
+      - develop
   pull_request:
-    branches: [main, develop]
+    branches:
+      - main
+      - develop
   schedule:
     - cron: 0 0 * * MON
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.11', '3.13']
-        optional: [false]
+        os:
+          - ubuntu-latest
+          # - windows-latest  # Temporarily disabled
+        python-version:
+          - '3.11'
+          - '3.13'
+        test-type:
+          - unit
+          - regression
+          - integration
+        optional:
+          - true
         include:
           - python-version: '3.11'
-            optional: true
+            optional: false
+            os: ubuntu-latest
+            test-type: unit
+          - python-version: '3.11'
+            optional: false
+            os: ubuntu-latest
+            test-type: regression
+          - python-version: '3.11'
+            optional: false
+            os: ubuntu-latest
+            test-type: integration
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v6
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: conda-incubator/setup-miniconda@v3
         with:
+          miniconda-version: latest
+          auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
+          auto-activate: true
+          activate-environment: h2integrate
+      - name: Install base dependencies
+        shell: bash -el {0}
         env:
           SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL: true
         run: |
-          sudo apt-get update && sudo apt-get install -y libglpk-dev glpk-utils coinor-cbc
+          conda install -y -c conda-forge glpk coin-or-cbc>=2.10.12
           python -m pip install --upgrade pip
-          if [ "${{ matrix.optional }}" = "true" ]; then
-            pip install ".[develop]"
-          else
-            pip install ".[develop]"
-          fi
+          pip install ".[develop]"
+      - if: ${{ matrix.optional }}
+        name: Install optional dependencies
+        shell: bash -el {0}
+        run: |
+          conda install -y -c conda-forge wisdem
+          pip install ".[extras]"
       - name: Create env file
         run: |
           touch .env
-      - name: Run unit tests
-        run: |
-          pytest . -m unit --cov=h2integrate --cov-report=xml:unit-coverage.xml
-      - name: Run regression tests
-        run: |
-          pytest . -m regression --cov=h2integrate --cov-report=xml:regression-coverage.xml
-      - name: Run integration tests
-        run: |
-          pytest . -m integration --cov=h2integrate --cov-report=xml:integration-coverage.xml
-      - name: Upload unit coverage to
-        uses: codecov/codecov-action@v5
+      - name: Run ${{ matrix.test-type }} tests
+        shell: bash -el {0}
+        run: pytest . -m ${{ matrix.test-type }} --cov=h2integrate --cov-report=lcov:./${{ matrix.test-type }}-coverage.lcov
+      - name: Upload test coverage
+        uses: coverallsapp/github-action@v2
+        if: contains(matrix.os, 'ubuntu') && contains(matrix.python-version, '3.13')
+        with:
+          github-token: ${{ secrets.COVERALLS_REPO_TOKEN }}
+          files: ./${{ matrix.test-type }}-coverage.lcov
+          flag-name: ${{ matrix.test-type }}
+          parallel: true
+          fail-on-error: false
+  coverage-finish:
+    needs: build
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls finished
+        uses: coverallsapp/github-action@v2
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: unit-coverage.xml, regression-coverage.xml, integration-coverage.xml
-          flags: unit,regression,integration
+          github-token: ${{ secrets.COVERALLS_REPO_TOKEN }}
+          parallel-finished: true
+          fail-on-error: false
@@ -5,7 +5,9 @@ build:
   tools:
     python: '3.11'
   jobs:
-    pre_build: [jupyter-book config sphinx docs/]
+    pre_build:
+      - python docs/generate_class_hierarchy.py
+      - jupyter-book config sphinx docs/
 python:
   install:
     - method: pip