Merge branch 'Pyomo:main' into latex_printer

Pyomo · Oct 11, 2023 · d11667a · d11667a
2 parents e9232d2 + 4267cbd
commit d11667a
Show file tree

Hide file tree

Showing 54 changed files with 1,683 additions and 336 deletions.
diff --git a/.coin-or/projDesc.xml b/.coin-or/projDesc.xml
@@ -287,7 +287,7 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
 
 			<platform>
 				<operatingSystem>Any</operatingSystem>
-				<compiler>Python 3.7, 3.8, 3.9, 3.10, 3.11</compiler>
+				<compiler>Python 3.8, 3.9, 3.10, 3.11</compiler>
 			</platform>
 
 		</testedPlatforms>

diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        wheel-version: ['cp37-cp37m', 'cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311']
+        wheel-version: ['cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311']
         os: [ubuntu-latest]
         include:
         - os: ubuntu-latest
@@ -102,7 +102,7 @@ jobs:
         include:
         - os: macos-latest
           TARGET: osx
-        python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
+        python-version: [ 3.8, 3.9, '3.10', '3.11' ]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -133,7 +133,7 @@ jobs:
         include:
         - os: windows-latest
           TARGET: win
-        python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
+        python-version: [ 3.8, 3.9, '3.10', '3.11' ]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml
@@ -320,19 +320,34 @@ jobs:
         echo "*** Install Pyomo dependencies ***"
         conda install --update-deps -q -y $CONDA_DEPENDENCIES
         if test -z "${{matrix.slim}}"; then
-            echo "*** Install CPLEX ***"
-            conda install -q -y 'cplex>=12.10' docplex \
-                || echo "WARNING: CPLEX Community Edition is not available"
-            echo "*** Install Gurobi ***"
-            conda install -q -y gurobi \
-                || echo "WARNING: Gurobi is not available"
-            echo "*** Install Xpress ***"
-            conda install -q -y xpress \
-                || echo "WARNING: Xpress Community Edition is not available"
-            for PKG in cyipopt pymumps scip; do
+            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
+                echo ""
                 echo "*** Install $PKG ***"
-                conda install -q -y $PKG \
-                    || echo "WARNING: $PKG is not available"
+                # conda can literally take an hour to determine that a
+                # package is not available.  Perform a quick search to see
+                # if the package is available for this interpreter before
+                # attempting an install.
+                # NOTE: conda search will attempt approximate matches.
+                _PKGLIST=$(conda search -f "$PKG") || echo "Package $PKG not found"
+                echo "$_PKGLIST"
+                _BASE=$(echo "$PKG" | sed 's/[=<>].*//')
+                _BUILDS=$(echo "$_PKGLIST" | grep "^$_BASE " \
+                    | sed -r 's/\s+/ /g' | cut -d\  -f3) || echo ""x
+                if test -n "$_BUILDS"; then
+                    _ISPY=$(echo "$_BUILDS" | grep "^py") \
+                        || echo "No python build detected"
+                    _PYOK=$(echo "$_BUILDS" | grep "^$PYVER") \
+                        || echo "No python build matching $PYVER detected"
+                    if test -z "$_ISPY" -o -n "$_PYOK"; then
+                        echo "... INSTALLING $PKG"
+                        conda install -y "$PKG" || _BUILDS=""
+                    fi
+                fi
+                if test -z "$_BUILDS"; then
+                    echo "WARNING: $PKG is not available"
+                fi
             done
             # TODO: This is a hack to stop test_qt.py from running until we
             # can better troubleshoot why it fails on GHA

diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml
@@ -37,6 +37,10 @@ jobs:
     steps:
     - name: Checkout Pyomo source
       uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: Black Formatting Check
       run: |
         pip install black
@@ -56,7 +60,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: [3.7, 3.8, 3.9, '3.10', '3.11']
+        python: [ 3.8, 3.9, '3.10', '3.11' ]
         other: [""]
         category: [""]
 
@@ -83,7 +87,7 @@ jobs:
           PACKAGES:
 
         - os: ubuntu-latest
-          python: 3.8
+          python: 3.9
           other: /mpi
           mpi: 3
           skip_doctest: 1
@@ -116,15 +120,15 @@ jobs:
           PYENV: pip
 
         - os: ubuntu-latest
-          python: 3.7
+          python: 3.8
           other: /slim
           slim: 1
           skip_doctest: 1
           TARGET: linux
           PYENV: pip
 
         - os: ubuntu-latest
-          python: 3.8
+          python: 3.9
           other: /pyutilib
           TARGET: linux
           PYENV: pip
@@ -346,19 +350,34 @@ jobs:
         echo "*** Install Pyomo dependencies ***"
         conda install --update-deps -q -y $CONDA_DEPENDENCIES
         if test -z "${{matrix.slim}}"; then
-            echo "*** Install CPLEX ***"
-            conda install -q -y 'cplex>=12.10' docplex \
-                || echo "WARNING: CPLEX Community Edition is not available"
-            echo "*** Install Gurobi ***"
-            conda install -q -y gurobi \
-                || echo "WARNING: Gurobi is not available"
-            echo "*** Install Xpress ***"
-            conda install -q -y xpress \
-                || echo "WARNING: Xpress Community Edition is not available"
-            for PKG in cyipopt pymumps scip; do
+            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
+                echo ""
                 echo "*** Install $PKG ***"
-                conda install -q -y $PKG \
-                    || echo "WARNING: $PKG is not available"
+                # conda can literally take an hour to determine that a
+                # package is not available.  Perform a quick search to see
+                # if the package is available for this interpreter before
+                # attempting an install.
+                # NOTE: conda search will attempt approximate matches.
+                _PKGLIST=$(conda search -f "$PKG") || echo "Package $PKG not found"
+                echo "$_PKGLIST"
+                _BASE=$(echo "$PKG" | sed 's/[=<>].*//')
+                _BUILDS=$(echo "$_PKGLIST" | grep "^$_BASE " \
+                    | sed -r 's/\s+/ /g' | cut -d\  -f3) || echo ""
+                if test -n "$_BUILDS"; then
+                    _ISPY=$(echo "$_BUILDS" | grep "^py") \
+                        || echo "No python build detected"
+                    _PYOK=$(echo "$_BUILDS" | grep "^$PYVER") \
+                        || echo "No python build matching $PYVER detected"
+                    if test -z "$_ISPY" -o -n "$_PYOK"; then
+                        echo "... INSTALLING $PKG"
+                        conda install -y "$PKG" || _BUILDS=""
+                    fi
+                fi
+                if test -z "$_BUILDS"; then
+                    echo "WARNING: $PKG is not available"
+                fi
             done
             # TODO: This is a hack to stop test_qt.py from running until we
             # can better troubleshoot why it fails on GHA

diff --git a/README.md b/README.md
@@ -51,8 +51,8 @@ Pyomo is available under the BSD License - see the
 
 Pyomo is currently tested with the following Python implementations:
 
-* CPython: 3.7, 3.8, 3.9, 3.10, 3.11
-* PyPy: 3.7, 3.8, 3.9
+* CPython: 3.8, 3.9, 3.10, 3.11
+* PyPy: 3.9
 
 _Testing and support policy_:
 

diff --git a/doc/OnlineDocs/installation.rst b/doc/OnlineDocs/installation.rst
@@ -3,7 +3,7 @@ Installation
 
 Pyomo currently supports the following versions of Python:
 
-* CPython: 3.7, 3.8, 3.9, 3.10, 3.11
+* CPython: 3.8, 3.9, 3.10, 3.11
 * PyPy: 3
 
 At the time of the first Pyomo release after the end-of-life of a minor Python