Merge branch 'main' into fix-issue_1287-bug-in-subcritical-powerplant-report-method

Author: ksbeattie

idaes/core/util/env_info.py

@@ -19,8 +19,8 @@
 import sys
 import platform
 import json
-import importlib
-import pkg_resources
+import importlib.metadata
+from packaging.requirements import Requirement
 
 import pyomo
 import pyomo.environ as pyo
@@ -72,22 +72,21 @@ def __init__(self, additional_solvers=()):
         self.pyomo_version = pyomo.version.__version__
         # Get dependency info
         self.dependency_versions = {}
-        reqs = pkg_resources.get_distribution("idaes-pse").requires()
-        for dep in [x.name for x in reqs]:
+        reqs = importlib.metadata.requires("idaes-pse")
+        for req in reqs:
+            dep = Requirement(req).name
             if dep == "pyomo":
                 continue  # pyomo is special
             try:
-                self.dependency_versions[dep] = pkg_resources.get_distribution(
-                    dep
-                ).version
-            except pkg_resources.DistributionNotFound:
+                self.dependency_versions[dep] = importlib.metadata.version(dep)
+            except importlib.metadata.PackageNotFoundError:
                 self.dependency_versions[dep] = None
         # Extra packages, users must install these for esoteric features
         self.extra_versions = {}
         for dep in self.extras:
             try:
-                self.extra_versions[dep] = pkg_resources.get_distribution(dep).version
-            except pkg_resources.DistributionNotFound:
+                self.extra_versions[dep] = importlib.metadata.version(dep)
+            except importlib.metadata.PackageNotFoundError:
                 self.extra_versions[dep] = None
         self.solver_versions = {}
         for s in self.known_solvers + list(additional_solvers):

idaes/models/unit_models/__init__.py

@@ -23,6 +23,7 @@
 from .heat_exchanger_lc import HeatExchangerLumpedCapacitance
 from .mixer import Mixer, MomentumMixingType, MixingType, MixerInitializer
 from .mscontactor import MSContactor, MSContactorInitializer
+from .pipe import Pipe
 from .plug_flow_reactor import PFR
 from .pressure_changer import (
     PressureChanger,