Merge branch 'Pyomo:main' into Example-seed-issue

Author: sscini

.github/workflows/test_branches.yml

@@ -76,13 +76,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python: ['3.13.3']  # FIXME: Remove specific 3.13 version once logging tests are fixed
+        python: [3.13]
         other: [""]
         category: [""]
 
         include:
         - os: ubuntu-latest
-          python: '3.13.3'  # FIXME: Remove specific 3.13 version once logging tests are fixed
+          python: 3.13
           test_docs: 1
           TARGET: linux
           PYENV: pip

.github/workflows/test_pr_and_main.yml

@@ -88,7 +88,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: [ 3.9, '3.10', 3.11, 3.12, '3.13.3' ]  # FIXME: Remove specific 3.13 version once logging tests are fixed
+        python: [ 3.9, '3.10', 3.11, 3.12, 3.13 ]
         other: [""]
         category: [""]
 

pyomo/common/download.py

@@ -440,9 +440,20 @@ def filter_fcn(info):
             info.mode &= 0o755
             return True
 
+        if sys.version_info[:2] < (3, 12):
+            tar_args = {}
+        else:
+            # Add a tar filter to suppress deprecation warning in Python 3.12+
+            #
+            # Note that starting in Python 3.14 the default is 'data',
+            # however, this method is already filtering for many of the
+            # things that 'data' would catch (and raise an exception
+            # for).  For backwards compatibility, we will use the more
+            # permissive "tar" filter.
+            tar_args = {'filter': tarfile.tar_filter}
         with tarfile.open(fileobj=io.BytesIO(self.retrieve_url(url))) as TAR:
             dest = os.path.realpath(self._fname)
-            TAR.extractall(dest, filter(filter_fcn, TAR.getmembers()))
+            TAR.extractall(dest, filter(filter_fcn, TAR.getmembers()), **tar_args)
 
     def get_gzipped_binary_file(self, url):
         if self._fname is None:

pyomo/common/log.py

@@ -73,11 +73,10 @@ def is_debug_set(logger):
         """
         if logger.manager.disable >= _DEBUG:
             return False
-        _level = logger.getEffectiveLevel()
         # Filter out NOTSET and higher levels
-        return _NOTSET < _level <= _DEBUG
+        return _NOTSET < logger.getEffectiveLevel() <= _DEBUG
 
-else:
+elif sys.version_info[:3] < (3, 13, 4):
     # This is inefficient (it indirectly checks effective level twice),
     # but is included for [as yet unknown] platforms that ONLY implement
     # the API documented in the logging library
@@ -86,6 +85,15 @@ def is_debug_set(logger):
             return False
         return logger.getEffectiveLevel() > _NOTSET
 
+else:
+    # Python 3.14 (and backported to python 3.13.4) changed the behavior
+    # of isEnabledFor() so that it always returns False when called
+    # while a log record is in flight (learned this from
+    # https://github.com/hynek/structlog/pull/723).  In newer versions
+    # of Python, we will only rely on getEffectiveLevel().
+    def is_debug_set(logger):
+        return _NOTSET < logger.getEffectiveLevel() <= _DEBUG
+
 
 class WrappingFormatter(logging.Formatter):
     _flag = "<<!MSG!>>"
@@ -262,7 +270,7 @@ def filter(self, record):
 pyomo_logger = logging.getLogger('pyomo')
 pyomo_handler = logging.StreamHandler(sys.stdout)
 pyomo_formatter = LegacyPyomoFormatter(
-    base=PYOMO_ROOT_DIR, verbosity=lambda: pyomo_logger.isEnabledFor(logging.DEBUG)
+    base=PYOMO_ROOT_DIR, verbosity=lambda: is_debug_set(pyomo_logger)
 )
 pyomo_handler.setFormatter(pyomo_formatter)
 pyomo_handler.addFilter(_GlobalLogFilter())
@@ -469,7 +477,7 @@ def __enter__(self):
         # #3587), so we will just handle it explicitly ourselves.
         self.local_fd = os.dup(self.fd)
         self.handler.stream = os.fdopen(
-            self.local_fd, mode="a", closefd=False
+            self.local_fd, mode="w", closefd=False
         ).__enter__()
 
     def __exit__(self, et, ev, tb):
@@ -495,7 +503,7 @@ def __enter__(self):
         # #3587), so we will just handle it explicitly ourselves.
         self.local_fd = os.dup(self.fd)
         logging.lastResort = logging.StreamHandler(
-            os.fdopen(self.local_fd, mode="a", closefd=False).__enter__()
+            os.fdopen(self.local_fd, mode="w", closefd=False).__enter__()
         )
 
     def __exit__(self, et, ev, tb):

pyomo/common/tee.py

@@ -169,7 +169,7 @@ def __enter__(self):
 
         if self.synchronize and self.std:
             # Cause Python's stdout to point to our new file
-            self.target_file = os.fdopen(self.fd, 'a', closefd=False)
+            self.target_file = os.fdopen(self.fd, "w", closefd=False)
             setattr(sys, self.std, self.target_file)
 
         return self
@@ -349,7 +349,7 @@ def _enter_impl(self):
                 log_stream = self._enter_context(
                     os.fdopen(
                         self._enter_context(_fd_closer(os.dup(old_fd[1] or 2))),
-                        mode="a",
+                        mode="w",
                         closefd=False,
                     )
                 )
@@ -358,7 +358,7 @@ def _enter_impl(self):
             self._enter_context(LoggingIntercept(log_stream, logger=logger, level=None))
 
             if isinstance(self.output, str):
-                self.output_stream = self._enter_context(open(self.output, 'a'))
+                self.output_stream = self._enter_context(open(self.output, "a"))
             elif self.output is None:
                 self.output_stream = io.StringIO()
             else:
@@ -415,7 +415,7 @@ def _enter_impl(self):
                                     _fd_closer(os.dup(fd_redirect[fd].original_fd)),
                                     prior_to=self.tee,
                                 ),
-                                mode="a",
+                                mode="w",
                                 closefd=False,
                             ),
                             prior_to=self.tee,
@@ -673,7 +673,7 @@ def STDERR(self):
             self._stderr = self.open(buffering=b)
         return self._stderr
 
-    def open(self, mode='a', buffering=-1, encoding=None, newline=None):
+    def open(self, mode="w", buffering=-1, encoding=None, newline=None):
         if encoding is None:
             encoding = self.encoding
         handle = _StreamHandle(mode, buffering, encoding, newline)