Merge branch 'main' into modernize-relax-integer-vars

Author: blnicho

.github/workflows/test_branches.yml

@@ -534,9 +534,8 @@ jobs:
         echo "DYLD_LIBRARY_PATH=${env:DYLD_LIBRARY_PATH}:$GAMS_DIR" `
             Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         $INSTALLER = "${env:DOWNLOAD_DIR}/gams_install.exe"
-        # We are pinning to 29.1.0 because a license is required for
-        # versions after this in order to run in demo mode.
-        $URL = "https://d37drm4t2jghv5.cloudfront.net/distributions/29.1.0"
+        # Demo licenses are included for 5mo from the newest release
+        $URL = "https://d37drm4t2jghv5.cloudfront.net/distributions/50.1.0"
         if ( "${{matrix.TARGET}}" -eq "win" ) {
             $URL = "$URL/windows/windows_x64_64.exe"
         } elseif ( "${{matrix.TARGET}}" -eq "osx" ) {

.github/workflows/test_pr_and_main.yml

@@ -586,9 +586,8 @@ jobs:
         echo "DYLD_LIBRARY_PATH=${env:DYLD_LIBRARY_PATH}:$GAMS_DIR" `
             Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         $INSTALLER = "${env:DOWNLOAD_DIR}/gams_install.exe"
-        # We are pinning to 29.1.0 because a license is required for
-        # versions after this in order to run in demo mode.
-        $URL = "https://d37drm4t2jghv5.cloudfront.net/distributions/29.1.0"
+        # Demo licenses are included for 5mo from the newest release
+        $URL = "https://d37drm4t2jghv5.cloudfront.net/distributions/50.1.0"
         if ( "${{matrix.TARGET}}" -eq "win" ) {
             $URL = "$URL/windows/windows_x64_64.exe"
         } elseif ( "${{matrix.TARGET}}" -eq "osx" ) {

pyomo/common/dependencies.py

@@ -443,25 +443,9 @@ def check_min_version(module, min_version):
             module = indicator._module
         else:
             return False
-    if check_min_version._parser is None:
-        try:
-            from packaging import version as _version
-
-            _parser = _version.parse
-        except ImportError:
-            # pkg_resources is an order of magnitude slower to import than
-            # packaging.  Only use it if the preferred (but optional)
-            # packaging library is not present
-            from pkg_resources import parse_version as _parser
-        check_min_version._parser = _parser
-    else:
-        _parser = check_min_version._parser
 
     version = getattr(module, '__version__', '0.0.0')
-    return _parser(min_version) <= _parser(version)
-
-
-check_min_version._parser = None
+    return packaging.version.parse(min_version) <= packaging.version.parse(version)
 
 
 #
@@ -993,6 +977,12 @@ def _finalize_pympler(module, available):
         import pympler.muppy
 
 
+def _finalize_packaging(module, available):
+    if available:
+        # Import key subpackages that we will want to assume are present
+        import packaging.version
+
+
 def _finalize_matplotlib(module, available):
     if not available:
         return
@@ -1094,6 +1084,10 @@ def _pyutilib_importer():
     )
     random, _ = attempt_import('random')
 
+    # Necessary for minimum version checking for other optional dependencies
+    packaging, packaging_available = attempt_import(
+        'packaging', deferred_submodules=['version'], callback=_finalize_packaging
+    )
     # Commonly-used optional dependencies
     dill, dill_available = attempt_import('dill')
     mpi4py, mpi4py_available = attempt_import(

pyomo/common/tests/test_dependencies.py

@@ -31,6 +31,7 @@
     dill,
     dill_available,
     mpi4py_available,
+    packaging_available,
 )
 
 import pyomo.common.tests.dep_mod as dep_mod
@@ -125,6 +126,9 @@ def test_imported_deferred_import(self):
         self.assertIs(dep_mod.bogus_nonexisting_module_available, False)
         self.assertIs(type(dep_mod.bogus_nonexisting_module), ModuleUnavailable)
 
+    @unittest.skipUnless(
+        packaging_available, "min_version tests require packaging module"
+    )
     def test_min_version(self):
         mod, avail = attempt_import(
             'pyomo.common.tests.dep_mod', minimum_version='1.0', defer_import=False
@@ -177,6 +181,9 @@ def test_min_version(self):
         mod, avail = attempt_import('pyomo.common.tests.bogus', minimum_version='1.0')
         self.assertFalse(check_min_version(mod, '1.0'))
 
+    @unittest.skipUnless(
+        packaging_available, "min_version tests require packaging module"
+    )
     def test_and_or(self):
         mod0, avail0 = attempt_import('ply', defer_import=True)
         mod1, avail1 = attempt_import('pyomo.common.tests.dep_mod', defer_import=True)
@@ -231,6 +238,9 @@ def test_and_or(self):
         self.assertIsInstance(_ror, _DeferredOr)
         self.assertTrue(_ror)
 
+    @unittest.skipUnless(
+        packaging_available, "min_version tests require packaging module"
+    )
     def test_callbacks(self):
         ans = []
 

pyomo/contrib/appsi/solvers/maingo.py

@@ -173,11 +173,18 @@ def available(self):
         return self._available
 
     def version(self):
-        import pkg_resources
+        import importlib.metadata
 
-        version = pkg_resources.get_distribution('maingopy').version
-
-        return tuple(int(k) for k in version.split('.'))
+        try:
+            version = importlib.metadata.version('maingopy').split('.')
+        except ImportError:
+            return None
+        for i, n in enumerate(version):
+            try:
+                version[i] = int(version[i])
+            except:
+                pass
+        return tuple(version)
 
     @property
     def config(self) -> MAiNGOConfig:

pyomo/neos/kestrel.py

@@ -122,7 +122,12 @@ def setup_connection(self):
         try:
             result = self.neos.ping()
             logger.info("OK.")
-        except (socket.error, xmlrpclib.ProtocolError, http.client.BadStatusLine):
+        except (
+            socket.error,
+            xmlrpclib.ProtocolError,
+            http.client.BadStatusLine,
+            NotImplementedError,
+        ):
             e = sys.exc_info()[1]
             self.neos = None
             logger.info("Fail: %s" % (e,))

pyomo/scripting/pyomo_main.py

@@ -13,33 +13,28 @@
 import copy
 from pyomo.common.deprecation import deprecation_warning
 
-try:
-    import pkg_resources
 
-    pyomo_commands = pkg_resources.iter_entry_points('pyomo.command')
-except:
-    pyomo_commands = []
-#
-# Load modules associated with Plugins that are defined in
-# EGG files.
-#
-for entrypoint in pyomo_commands:
-    try:
-        plugin_class = entrypoint.load()
-    except Exception:
-        exctype, err, tb = sys.exc_info()  # BUG?
-        import traceback
+pyomo_commands = []
 
-        msg = (
-            "Error loading pyomo.command entry point %s:\nOriginal %s: %s\n"
-            "Traceback:\n%s"
-            % (entrypoint, exctype.__name__, err, ''.join(traceback.format_tb(tb)))
-        )
-        # clear local variables to remove circular references
-        exctype = err = tb = None
-        # TODO: Should this just log an error and re-raise the original
-        # exception?
-        raise ImportError(msg)
+
+def load_entry_points():
+    import importlib.metadata
+
+    try:
+        # Python >= 3.10
+        ep_list = importlib.metadata.entry_points(group='pyomo.command')
+    except:
+        # Python 3.8 - 3.9
+        ep_list = importlib.metadata.entry_points().get('pyomo.command', [])
+    for ep in ep_list:
+        try:
+            pyomo_commands.append(ep.load())
+        except:
+            logger.error(
+                f"Importing 'pyomo.command' entry point '{ep.name}' failed:\n"
+                f"{traceback.format_exc(limit=1)}"
+            )
+            raise
 
 
 def main(args=None):
@@ -49,6 +44,11 @@ def main(args=None):
     from pyomo.scripting import pyomo_parser
     import pyomo.environ
 
+    #
+    # Load the pyomo.command entry points
+    #
+    if not pyomo_commands:
+        load_entry_points()
     #
     # Parse the arguments
     #

pyomo/version/tests/test_version.py

@@ -20,17 +20,17 @@ def test_releaselevel(self):
 
     def test_version(self):
         try:
-            import pkg_resources
+            from importlib.metadata import version
 
-            version = pkg_resources.get_distribution('pyomo').version
+            pyomo_version = version('pyomo')
         except:
-            self.skipTest('pkg_resources is not available')
+            self.skipTest('importlib.metadata is not available')
 
         if pyomo_ver.version_info[3] == 'final':
-            self.assertEqual(pyomo_ver.version, version)
+            self.assertEqual(pyomo_ver.version, pyomo_version)
 
         else:
-            tmp_ = version.split('.')
+            tmp_ = pyomo_version.split('.')
             self.assertEqual(str(tmp_[0]), str(pyomo_ver.version_info[0]))
             self.assertEqual(str(tmp_[1]), str(pyomo_ver.version_info[1]))
             if tmp_[-1].startswith('dev'):

setup.py

@@ -244,6 +244,7 @@ def __ne__(self, other):
             'networkx; python_version>="3.9"',
             'numpy',
             'openpyxl',  # dataportals
+            'packaging',  # for checking other dependency versions
             #'pathos',   # requested for #963, but PR currently closed
             'pint',  # units
             'plotly',  # incidence_analysis