NatLabRockies · RHammond2 · Mar 9, 2026 · Mar 9, 2026 · Mar 10, 2026 · Mar 10, 2026
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,53 +1,73 @@
 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
+        python-version:
+          - '3.11'
+          - '3.13'
+        optional:
+          - true
         include:
           - python-version: '3.11'
-            optional: true
+            optional: false
+            os: ubuntu-latest
+    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
+        shell: bash -el {0}
+        run: pytest . -m unit --cov=h2integrate --cov-report=lcov:./unit-coverage.lcov
       - name: Run regression tests
-        run: |
-          pytest . -m regression --cov=h2integrate --cov-report=xml:regression-coverage.xml
+        shell: bash -el {0}
+        run: pytest . -m regression --cov=h2integrate --cov-report=lcov:./regression-coverage.lcov
       - 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
+        shell: bash -el {0}
+        run: pytest . -m integration --cov=h2integrate --cov-report=lcov:./integration-coverage.lcov
+      - name: Upload test coverage
+        uses: coverallsapp/github-action@v2
+        if: contains( matrix.os, 'ubuntu') && contains( matrix.python-version, '3.13')
         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 }}
+          files: ./unit-coverage.lcov, ./regression-coverage.lcov, ./integration-coverage.lcov
+          flag-name: unit,regression,integration
+          fail-on-error: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## Unreleased
+
+- Bumps the `coin-or-cbc` dependency to at least 2.10.12 to enable easy Windows compatibility. [PR 590](https://github.com/NatLabRockies/H2Integrate/pull/590)
+- Uses the optional installation parameter `extras` to combine all analysis extras, and remove them
+  from the `develop` options. [PR 590](https://github.com/NatLabRockies/H2Integrate/pull/590)
+- Tests reliant on the `gis` optional dependencies are no longer run when the extra dependencies are not installed
+  similar to the ard tests. [PR 590](https://github.com/NatLabRockies/H2Integrate/pull/590)
+- Updates the testing infrastructure to use function-scoped fixtures unless there is a specific need for sharing
+  data between functions in a module. [PR 590](https://github.com/NatLabRockies/H2Integrate/pull/590)
+
 ## 0.7.1 [March 13, 2026]
 
 ### Updates
@@ -26,6 +36,7 @@
 - Fixed a bug in the discrete variable instantiation within the iron processing stack that caused a failure with OpenMDAO v3.43 [PR 595](https://github.com/NatLabRockies/H2Integrate/pull/595)
 - Fixed a bug in model setup where transporters were added to the system at the end of the system instead after their source [PR 591](https://github.com/NatLabRockies/H2Integrate/pull/591)
 - Fixed a bug in example 1 (steel) where a cable was included between the combiner to steel, but steel uses an internal grid connection [PR 591](https://github.com/NatLabRockies/H2Integrate/pull/591)
+- Introduced a keyword arg to `post_process` to allow users to choose if results are printed to the console. [PR 597](https://github.com/NatLabRockies/H2Integrate/pull/597)
 
 ## 0.7 [March 3, 2026]
 

diff --git a/README.md b/README.md
@@ -113,7 +113,7 @@ pip install h2integrate
 1. Using Git, navigate to a local target directory and clone repository:
 
     ```bash
-    git clone https://github.com/NREL/H2Integrate.git
+    git clone https://github.com/NatLabRockies/H2Integrate.git
     ```
 
 2. Navigate to `H2Integrate`
@@ -141,7 +141,8 @@ environment for development work.
 - Use one of the extra flags as needed:
   - `gis`: adds the iron mapping tools.
   - `ard`: adds the Ard-based wind models.
-  - `develop`: adds developer and documentation tools, plus optional analysis modifiers `gis` and `ard`.
+  - `extras`: installs all extra analysis tool dependencies, e.g., `ard` or `gis`.
+  - `develop`: adds developer and documentation tools.
   - `examples`: allows you to use the Jupyter Notebooks and all examples (includes `ard` and `gis`).
   - `all` simplifies adding all the dependencies.
 
@@ -176,17 +177,9 @@ pip install -e ".[all]"
 4. Install H2Integrate and its dependencies:
 
     ```bash
-    conda install -y -c conda-forge glpk
-    ```
-
-    Note: Unix users should install Cbc via:
-
-    ```bash
-    conda install -y -c conda-forge coin-or-cbc=2.10.8
+    conda install -y -c conda-forge glpk coin-or-cbc>=2.10.12
     ```
 
-    Windows users will have to manually install Cbc: https://github.com/coin-or/Cbc.
-
     - If you want to just use H2Integrate:
 
        ```bash

diff --git a/docs/getting_started/install.md b/docs/getting_started/install.md
@@ -75,7 +75,8 @@ environment for development work.
 - Use one of the extra flags as needed:
   - `gis`: adds the iron mapping tools.
   - `ard`: adds the Ard-based wind models.
-  - `develop`: adds developer and documentation tools, plus optional analysis modifiers `gis` and `ard`.
+  - `extras`: installs all extra analysis tool dependencies, e.g., `ard` or `gis`.
+  - `develop`: adds developer and documentation tools.
   - `examples`: allows you to use the Jupyter Notebooks and all examples (includes `ard` and `gis`).
   - `all` simplifies adding all the dependencies.
 
@@ -110,19 +111,9 @@ pip install -e ".[all]"
 4. Install H2Integrate and its dependencies:
 
     ```bash
-    conda install -y -c conda-forge glpk
+    conda install -y -c conda-forge glpk coin-or-cbc>=2.10.12
     ```
 
-    ````{note}
-    Unix users should install Cbc via:
-
-    ```bash
-    conda install -y -c conda-forge coin-or-cbc=2.10.8
-    ```
-
-    Windows users should install Cbc manually according to https://github.com/coin-or/Cbc.
-    ````
-
     - If you want to just use H2Integrate:
 
        ```bash

diff --git a/docs/user_guide/figures/example_26_iron_map.png b/docs/user_guide/figures/example_26_iron_map.png
diff --git a/environment.yml b/environment.yml
@@ -3,7 +3,7 @@ channels: [conda-forge, defaults]
 dependencies:
   - python=3.11
   - glpk
-  # - coin-or-cbc=2.10.8  # NOTE: uncomment if on Unix
+  - coin-or-cbc>=2.10.12
   # - wisdem  # NOTE: uncomment if installing with Ard
   - pip
   - pip: [.]
diff --git a/examples/test/conftest.py b/examples/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/examples/test/test_all_examples.py b/examples/test/test_all_examples.py
@@ -1,5 +1,4 @@
 import os
-import shutil
 import importlib
 from pathlib import Path
 
@@ -8,26 +7,14 @@
 import pytest
 import openmdao.api as om
 
-from h2integrate import ROOT_DIR, EXAMPLE_DIR
+from h2integrate import ROOT_DIR
 from h2integrate.core.file_utils import load_yaml
 from h2integrate.core.h2integrate_model import H2IntegrateModel
 
 
 ROOT = Path(__file__).parents[1]
 
 
-@pytest.fixture(scope="function")
-def temp_copy_of_example(temp_dir, example_folder, resource_example_folder):
-    original = EXAMPLE_DIR / example_folder
-    shutil.copytree(original, temp_dir / example_folder, dirs_exist_ok=True)
-    if resource_example_folder is not None:
-        secondary = EXAMPLE_DIR / resource_example_folder
-        shutil.copytree(secondary, temp_dir / resource_example_folder, dirs_exist_ok=True)
-    os.chdir(temp_dir / example_folder)
-    yield temp_dir / example_folder
-    os.chdir(Path(__file__).parent)
-
-
 # docs fencepost start: DO NOT REMOVE
 @pytest.mark.integration
 @pytest.mark.parametrize("example_folder,resource_example_folder", [("01_onshore_steel_mn", None)])
@@ -1937,6 +1924,7 @@ def test_24_solar_battery_grid_example(subtests, temp_copy_of_example):
 
 @pytest.mark.integration
 @pytest.mark.parametrize("example_folder,resource_example_folder", [("28_iron_map", None)])
+@pytest.mark.skipif(importlib.util.find_spec("geopandas") is None, reason="`gis` not installed")
 def test_28_iron_map_example(subtests, temp_copy_of_example):
     import geopandas as gpd
     import matplotlib

diff --git a/h2integrate/control/test/conftest.py b/h2integrate/control/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/h2integrate/converters/ammonia/test/conftest.py b/h2integrate/converters/ammonia/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/h2integrate/converters/co2/marine/test/conftest.py b/h2integrate/converters/co2/marine/test/conftest.py
@@ -2,7 +2,11 @@
 
 import pytest
 
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
 
 
 has_mcm = importlib.util.find_spec("mcm") is not None
@@ -23,7 +27,7 @@ def plant_config():
 
 
 # docs fencepost start: DO NOT REMOVE
-@pytest.fixture(scope="module")
+@pytest.fixture(scope="function")
 def driver_config(temp_dir):  # noqa: F811
     driver_config = {
         "general": {

diff --git a/h2integrate/converters/grid/test/conftest.py b/h2integrate/converters/grid/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/h2integrate/converters/hopp/test/conftest.py b/h2integrate/converters/hopp/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/h2integrate/converters/hydrogen/geologic/test/conftest.py b/h2integrate/converters/hydrogen/geologic/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/h2integrate/converters/hydrogen/test/conftest.py b/h2integrate/converters/hydrogen/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/h2integrate/converters/iron/test/conftest.py b/h2integrate/converters/iron/test/conftest.py
@@ -3,7 +3,11 @@
 from h2integrate import EXAMPLE_DIR
 from h2integrate.core.inputs.validation import load_driver_yaml
 
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
 
 
 @fixture

diff --git a/h2integrate/converters/methanol/test/conftest.py b/h2integrate/converters/methanol/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/h2integrate/converters/natural_gas/test/conftest.py b/h2integrate/converters/natural_gas/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/h2integrate/converters/nitrogen/test/conftest.py b/h2integrate/converters/nitrogen/test/conftest.py
@@ -1 +1,5 @@
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
diff --git a/h2integrate/converters/solar/test/conftest.py b/h2integrate/converters/solar/test/conftest.py
@@ -2,7 +2,11 @@
 
 from h2integrate import EXAMPLE_DIR
 
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
 
 
 @pytest.fixture

diff --git a/h2integrate/converters/steel/test/conftest.py b/h2integrate/converters/steel/test/conftest.py
@@ -3,7 +3,11 @@
 from h2integrate import EXAMPLE_DIR
 from h2integrate.core.inputs.validation import load_driver_yaml
 
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
 
 
 @pytest.fixture

diff --git a/h2integrate/converters/test/conftest.py b/h2integrate/converters/test/conftest.py
@@ -4,7 +4,11 @@
 
 import os
 
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
 
 
 def pytest_sessionstart(session):

diff --git a/h2integrate/converters/water/desal/test/conftest.py b/h2integrate/converters/water/desal/test/conftest.py
@@ -4,7 +4,11 @@
 
 import os
 
-from test.conftest import temp_dir, pytest_collection_modifyitems  # noqa: F401
+from test.conftest import (  # noqa: F401
+    temp_dir,
+    temp_copy_of_example,
+    pytest_collection_modifyitems,
+)
 
 
 def pytest_sessionstart(session):