Update IDAES requirement in preparation for 2.6 release (watertap-org…

…#1486)

* Update IDAES requirement for 2.6 release

* Update min Python version to 3.9 b/c Pint

* Try removing version constraint for NumPy with Conda

* Add requires_idaes_solver marker for CSTR test affected by watertap-org#1473

.github/workflows/checks.yml

@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.8'
+          python-version: '3.11'
       - name: Install Black
         # unlike the other jobs, we don't need to install WaterTAP and/or all the dev dependencies,
         # but we still want to specify the Black version to use in requirements-dev.txt for local development
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.8'
+          python-version: '3.11'
       - name: Install dev dependencies
         run: |
           pip install -r requirements-dev.txt
@@ -78,7 +78,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.8'
           - '3.9'
           - '3.10'
           - '3.11'
@@ -112,7 +111,7 @@ jobs:
         pip install -r requirements-dev.txt
         echo '::endgroup::'
         echo '::group::Output of "conda install -c conda-forge cyipopt" command'
-        conda install -c conda-forge cyipopt "numpy<2"
+        conda install -c conda-forge cyipopt
         echo '::endgroup::'
         echo '::group::Display installed packages'
         conda list
@@ -179,7 +178,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.8'
+          - '3.9'
           - '3.11'
         os:
           - linux
@@ -233,7 +232,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.8'
+          - '3.9'
           - '3.11'
         os:
           - linux
@@ -284,7 +283,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.8'
+          - '3.9'
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

setup.py

@@ -21,14 +21,14 @@
 long_description = (cwd / "README.md").read_text()
 
 SPECIAL_DEPENDENCIES_FOR_RELEASE = [
-    "idaes-pse>=2.5.0,<2.6.0rc0",  # from PyPI
+    "idaes-pse>=2.6.0,<2.7.0rc0",  # from PyPI
 ]
 
 SPECIAL_DEPENDENCIES_FOR_PRERELEASE = [
     # update with a tag from the nawi-hub/idaes-pse
     # when a version of IDAES newer than the latest stable release from PyPI
     # will become needed for the watertap development
-    "idaes-pse==2.5.0",
+    "idaes-pse==2.6.0rc0",
 ]
 
 # Arguments marked as "Required" below must be included for upload to PyPI.
@@ -60,7 +60,6 @@
         "Operating System :: Unix",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",

watertap/unit_models/tests/test_cstr.py

@@ -273,6 +273,7 @@ def model(self):
 
         return m
 
+    @pytest.mark.requires_idaes_solver
     @pytest.mark.component
     def test_general_hierarchical(self, model):
         initializer = SingleControlVolumeUnitInitializer()