Merge branch 'main' into params-to-vars

Author: blnicho

codecov.yml .codecov.yml

@@ -5,6 +5,7 @@ codecov:
     # Potential to change when Python versions change
     after_n_builds: 16
     wait_for_ci: true
+  require_ci_to_pass: false
 coverage:
   range:
   - 50.0

.coin-or/projDesc.xml

@@ -227,8 +227,8 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
 			     Use explicit overrides to disable use of automated
 			     version reporting.
 			-->
-			<stableVersionNumber>6.8.2</stableVersionNumber>
-			<releaseNumber>6.8.2</releaseNumber>
+			<stableVersionNumber>6.9.1</stableVersionNumber>
+			<releaseNumber>6.9.1</releaseNumber>
 
 		</developmentStatus>
 

.git-blame-ignore-revs

@@ -45,4 +45,5 @@ ed13c8c65d6c3f56973887744be1c62a5d4756de
 363a16a609f519b3edfdfcf40c66d6de7ac135af
 d024718991455519e09149ede53a38df1c067abe
 017e21ee50d98d8b2f2083e6880f030025ed5378
+91972008d109322fc1a3b688333d67def2288625
 

.github/workflows/test_branches.yml

@@ -78,24 +78,26 @@ jobs:
         include:
         - os: ubuntu-latest
           python: 3.13
+          test_docs: 1
           TARGET: linux
           PYENV: pip
 
         - os: macos-latest
           python: 3.12
+          test_docs: 1
           TARGET: osx
           PYENV: pip
 
         - os: windows-latest
           python: 3.11
+          test_docs: 1
           TARGET: win
           PYENV: conda
           PACKAGES: glpk pytest-qt filelock
 
         - os: ubuntu-latest
           python: 3.11
           other: /conda
-          skip_doctest: 1
           TARGET: linux
           PYENV: conda
           PACKAGES: pytest-qt
@@ -104,7 +106,6 @@ jobs:
           python: '3.10'
           other: /mpi
           mpi: 3
-          skip_doctest: 1
           TARGET: linux
           PYENV: conda
           PACKAGES: openmpi mpi4py
@@ -113,15 +114,13 @@ jobs:
           python: 3.12
           other: /cython
           setup_options: --with-cython
-          skip_doctest: 1
           TARGET: linux
           PYENV: pip
           PACKAGES: cython
 
         - os: windows-latest
           python: 3.9
           other: /pip
-          skip_doctest: 1
           TARGET: win
           PYENV: pip
 
@@ -305,15 +304,21 @@ jobs:
         # Set up environment
         conda config --set always_yes yes
         conda config --set auto_update_conda false
+        conda config --set channel_priority strict
         conda config --remove channels defaults
         conda config --append channels nodefaults
         conda config --append channels conda-forge
         # Try to install mamba
-        conda install --update-deps -q -y -n base conda-libmamba-solver \
-            || MAMBA_FAILED=1
-        if test -z "$MAMBA_FAILED"; then
-            echo "*** Activating the mamba environment solver ***"
-            conda config --set solver libmamba
+        CONDA_VER=$(conda --version | cut -d\  -f2)
+        if test 23.10 = "`echo -e "23.10\n$CONDA_VER" | sort -V | tail -1`"; then
+            # Note: removed '--update-deps' on 2025-02-28 to work around
+            #       broken libffi(?)
+            conda install -q -y -n base conda-libmamba-solver \
+                || MAMBA_FAILED=1
+            if test -z "$MAMBA_FAILED"; then
+                echo "*** Activating the mamba environment solver ***"
+                conda config --set solver libmamba
+            fi
         fi
         # Add the rest of the channels
         conda config --append channels gurobi
@@ -365,17 +370,19 @@ jobs:
         # possibly if it outputs messages to stderr)
         conda install --update-deps -q -y $CONDA_DEPENDENCIES
         if test -z "${{matrix.slim}}"; then
-            # xpress.init() (from conda) hangs indefinitely on GHA/Windows under
-            # Python 3.10 and 3.11.  Exclude that release on that platform.
+            # xpress.init() (xpress 9.5.1 from conda) hangs indefinitely
+            # on GHA/Windows under Python 3.10 and 3.11.  Exclude that
+            # release on that platform.
             if [[ ${{matrix.TARGET}} == win && ${{matrix.python}} =~ 3.1[01] ]]; then
                 # We would like to just use something like:
                 #  - "!=9.5.1" (conda errors)
                 #  - "<9.5.1|>9.5.1" (conda installs 9.1.2, which also hangs)
                 #  - "<=9.5.0|>9.5.1" (conda seg faults)
-                XPRESS='xpress=9.5.0'
+                XPRESS='xpress>=9.5.2'
             else
                 XPRESS='xpress'
             fi
+            TIMEOUT_MSG="TIMEOUT: killing conda install process"
             PYVER=$(echo "py${{matrix.python}}" | sed 's/\.//g')
             echo "Installing for $PYVER"
             for PKG in 'cplex>=12.10' docplex gurobi "$XPRESS" cyipopt pymumps scip; do
@@ -400,7 +407,26 @@ jobs:
                     if test -z "$_ISPY" -o -n "$_PYOK"; then
                         echo ""
                         echo "... INSTALLING $PKG"
-                        conda install -y "$PKG" || _BUILDS=""
+                        # Because conda can occasionally hang
+                        # indefinitely (lately while installing SCIP),
+                        # we will run "conda install" in a subshell and
+                        # kill it after 5-minutes.
+                        (conda install -q -y $PKG |& tee conda.log) &
+                        conda_subshell_pid=$!
+                        sleep 1
+                        conda_pid=$(ps | grep conda | sed 's/^ *//' | sed 's/ .*//')
+                        # Only timeout the conda process if it's not to
+                        # the installation phase yet.  Signalling conda
+                        # after it has started the installation process
+                        # can irrecoverably corrupt the environment.
+                        (sleep 300 \
+                            && if test `grep 'Package Plan' conda.log | wc -l` -eq 0; \
+                            then echo "$TIMEOUT_MSG $conda_pid (TERM)" \
+                            && kill -TERM $conda_pid 2>/dev/null ; fi) &
+                        timeout_pid=$!
+                        wait $conda_subshell_pid || _BUILDS=""
+                        kill $timeout_pid 2>/dev/null \
+                            || echo "TIMEOUT: time limit expired"
                     fi
                 fi
                 echo ""
@@ -410,6 +436,8 @@ jobs:
             done
         fi
         # Re-try Pyomo (optional) dependencies with pip
+        echo ""
+        echo "Installing packages only available on PyPI"
         if test -n "$PYPI_DEPENDENCIES"; then
             python -m pip install --cache-dir cache/pip $PYPI_DEPENDENCIES
         fi
@@ -657,7 +685,7 @@ jobs:
             > ${SITE_PACKAGES}/run_coverage_at_startup.pth
 
     - name: Download and install extensions
-      if: ${{ ! matrix.slim }}
+      if: ${{ ! matrix.slim && matrix.category != 'notests' }}
       run: |
         echo ""
         echo "Pyomo download-extensions"
@@ -681,7 +709,7 @@ jobs:
         pyomo help --writers || exit 1
 
     - name: Run Pyomo tests
-      if: matrix.mpi == 0
+      if: ${{ matrix.mpi == 0 && matrix.category != 'notests' }}
       run: |
         export PATH=$PYOMO_PATH
         $PYTHON_EXE -m pytest -v \
@@ -690,7 +718,7 @@ jobs:
             `pwd`/examples `pwd`/doc --junitxml="TEST-pyomo.xml"
 
     - name: Run Pyomo MPI tests
-      if: matrix.mpi != 0
+      if: ${{ matrix.mpi != 0 && matrix.category != 'notests' }}
       run: |
         # Manually invoke the DAT parser so that parse_table_datacmds.py
         # is fully generated by a single process before invoking MPI
@@ -702,8 +730,16 @@ jobs:
             -m "mpi" -W ignore::Warning \
             pyomo `pwd`/pyomo-model-libraries
 
+    - name: Build documentation
+      if: matrix.build_docs != 0
+      run: |
+        sudo apt-get -y install graphviz latexmk texlive texlive-latex-extra \
+            texlive-pictures
+        make -C doc/OnlineDocs html
+        make -C doc/OnlineDocs latexpdf
+
     - name: Run documentation tests
-      if: matrix.skip_doctest == 0
+      if: matrix.test_docs != 0
       run: |
         make -C doc/OnlineDocs doctest -d
 
@@ -915,5 +951,5 @@ jobs:
         files: coverage-other.xml
         token: ${{ secrets.PYOMO_CODECOV_TOKEN }}
         name: ${{ matrix.TARGET }}/other
-        flags: ${{ matrix.TARGET }},other
+        flags: ${{ matrix.TARGET }}_other
         fail_ci_if_error: true