Switch to public Pyomo Data objects (#12)

* Address defer_check -> defer_import deprecation

* Switch to non-underscore base class names

* Update pyomo requirement with minimum version

* Add test to verify that no deprecations are emitted

* Temporarily revert to deprecated name to ensure test fails

* Revert "Temporarily revert to deprecated name to ensure test fails"

This reverts commit 4596356.

* ExpressionData -> NamedExpressionData

---------

Co-authored-by: Ludovico Bianchi <[email protected]>

pyproject.toml

@@ -10,7 +10,7 @@ name = "parameter-sweep"
 readme = "README.md"
 dynamic = ["version"]
 dependencies = [
-    "pyomo",
+    "pyomo>=6.7.3",  # see watertap-org/parameter-sweep#10
     "numpy",
     "h5py",
     "pyyaml",

src/parameter_sweep/parallel/parallel_manager_factory.py

@@ -23,8 +23,8 @@
 )
 
 
-MPI, mpi4py_available = attempt_import("mpi4py.MPI", defer_check=False)
-ray, ray_avaialble = attempt_import("ray", defer_check=False)
+MPI, mpi4py_available = attempt_import("mpi4py.MPI", defer_import=False)
+ray, ray_avaialble = attempt_import("ray", defer_import=False)
 if ray_avaialble:
     from parameter_sweep.parallel.ray_io_parallel_manager import (
         RayIoParallelManager,

src/parameter_sweep/parallel/ray_io_parallel_manager.py

@@ -20,7 +20,7 @@
 )
 from pyomo.common.dependencies import attempt_import
 
-ray, ray_available = attempt_import("ray", defer_check=False)
+ray, ray_available = attempt_import("ray", defer_import=False)
 import os
 import platform
 

src/parameter_sweep/parallel/tests/test_parallel_manager.py

@@ -26,7 +26,7 @@
 
 from parameter_sweep.parallel.parallel_manager_factory import create_parallel_manager
 
-ray, ray_available = attempt_import("ray", defer_check=False)
+ray, ray_available = attempt_import("ray", defer_import=False)
 if ray_available:
     from parameter_sweep.parallel.ray_io_parallel_manager import (
         RayIoParallelManager,

src/parameter_sweep/parameter_sweep.py

@@ -21,8 +21,8 @@
 from pyomo.common.deprecation import deprecation_warning
 from pyomo.common.config import ConfigValue
 from pyomo.common.modeling import unique_component_name
-from pyomo.core.base import _VarData, _ExpressionData
-from pyomo.core.base.param import _ParamData
+from pyomo.core.base import VarData, NamedExpressionData
+from pyomo.core.base.param import ParamData
 from pyomo.common.dependencies import attempt_import
 
 requests, requests_available = attempt_import("requests")
@@ -304,7 +304,7 @@ def assign_variable_names(model, outputs):
             unique_component_name(model, "_parameter_sweep_expressions"), exprs
         )
         for output_name, _pyo_obj in outputs.items():
-            if not isinstance(_pyo_obj, (_VarData, _ExpressionData, _ParamData)):
+            if not isinstance(_pyo_obj, (VarData, NamedExpressionData, ParamData)):
                 # Add this object as an expression and assign a name
                 exprs[output_name] = _pyo_obj
                 outputs[output_name] = exprs[output_name]

src/parameter_sweep/tests/test_deprecations.py

@@ -0,0 +1,30 @@
+import subprocess
+import sys
+
+import pytest
+
+
+@pytest.mark.parametrize(
+    "statement",
+    [
+        "import parameter_sweep",
+    ],
+    ids=repr,
+)
+@pytest.mark.parametrize(
+    "sentinel",
+    [
+        "DEPRECATED",
+    ],
+    ids=repr,
+)
+def test_no_deprecation_warnings_emitted(sentinel: str, statement: str):
+    res = subprocess.run(
+        [sys.executable, "-c", statement],
+        text=True,
+        stderr=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+    )
+    assert res.returncode == 0
+    assert not sentinel in res.stdout
+    assert not sentinel in res.stderr