Merge branch 'main' of https://github.com/Pyomo/pyomo into xpress-fix-nonconvex-miqcp

Author: djunglas

.coin-or/projDesc.xml

@@ -107,7 +107,7 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
                      license file directly.
                 -->
 		<projectLicenseURL>
-		  https://github.com/Pyomo/pyomo/blob/main/LICENSE.txt
+		  https://github.com/Pyomo/pyomo/blob/main/LICENSE.md
 		</projectLicenseURL>
 
 		<!-- Below, you can list other COIN projects your project      -->
@@ -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.4.2</stableVersionNumber>
-			<releaseNumber>6.4.2</releaseNumber>
+			<stableVersionNumber>6.4.3</stableVersionNumber>
+			<releaseNumber>6.4.3</releaseNumber>
 
 		</developmentStatus>
 

.github/workflows/release_wheel_creation.yml

@@ -10,21 +10,26 @@ on:
         description: Git Hash (Optional)
         required: false
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
   PYOMO_SETUP_ARGS: --with-distributable-extensions
 
 jobs:
   manylinux:
-    name: ${{ matrix.TARGET }}/wheel_creation
+    name: ${{ matrix.TARGET }}/${{ matrix.wheel-version }}_wheel_creation
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        wheel-version: ['cp37-cp37m', 'cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311']
         os: [ubuntu-latest]
         include:
         - os: ubuntu-latest
           TARGET: manylinux
-        python-version: [3.7]
+        python-version: [3.8]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -35,10 +40,11 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install twine wheel setuptools pybind11
+    # TODO: Update the manylinux builder to next tagged release
     - name: Build manylinux Python wheels
-      uses: RalfG/python-wheels-manylinux-build@v0.4.0-manylinux2010_x86_64
+      uses: RalfG/python-wheels-manylinux-build@a1e012c58ed3960f81b7ed2759a037fb0ad28e2d
       with:
-        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+        python-versions: ${{ matrix.wheel-version }}
         build-requirements: 'cython pybind11'
         package-path: ''
         pip-wheel-args: ''
@@ -56,51 +62,6 @@ jobs:
         name: manylinux-wheels
         path: dist
 
-  manylinuxaarch64:
-    if: ${{ false }}
-    name: ${{ matrix.TARGET }}/wheel_creation
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        include:
-        - os: ubuntu-latest
-          TARGET: manylinuxaarch64
-        python-version: [3.7]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - uses: docker/setup-qemu-action@v1
-      name: Set up QEMU
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install twine wheel setuptools pybind11
-    - name: Build manylinux Python wheels
-      uses: RalfG/[email protected]_aarch64
-      with:
-        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39'
-        build-requirements: 'cython'
-        package-path: ''
-        pip-wheel-args: ''
-        # When locally testing, --no-deps flag is necessary (PyUtilib dependency will trigger an error otherwise)
-    - name: Consolidate wheels
-      run: |
-        sudo test -d dist || mkdir -v dist
-        sudo find . -name \*.whl | grep -v /dist/ | xargs -n1 -i mv -v "{}" dist/
-    - name: Delete linux wheels
-      run: |
-        sudo rm -rfv dist/*-linux_aarch64.whl
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: manylinux-aarch64-wheels
-        path: dist
-
   generictarball:
     name: ${{ matrix.TARGET }}
     runs-on: ${{ matrix.os }}
@@ -111,7 +72,7 @@ jobs:
         include:
         - os: ubuntu-latest
           TARGET: generic_tarball
-        python-version: [3.7]
+        python-version: [3.8]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -141,7 +102,7 @@ jobs:
         include:
         - os: macos-latest
           TARGET: osx
-        python-version: [ 3.7, 3.8, 3.9, '3.10' ]
+        python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -172,7 +133,7 @@ jobs:
         include:
         - os: windows-latest
           TARGET: win
-        python-version: [ 3.7, 3.8, 3.9, '3.10' ]
+        python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/test_branches.yml

@@ -10,6 +10,10 @@ on:
         description: Git Hash (Optional)
         required: false
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash -l {0}
@@ -308,7 +312,7 @@ jobs:
                 || echo "WARNING: Gurobi is not available"
             conda install -q -y -c fico-xpress xpress \
                 || echo "WARNING: Xpress Community Edition is not available"
-            for PKG in cyipopt pymumps; do
+            for PKG in cyipopt pymumps scip; do
                 conda install -q -y -c conda-forge $PKG \
                     || echo "WARNING: $PKG is not available"
             done

.github/workflows/test_pr_and_main.yml

@@ -13,6 +13,10 @@ on:
         description: Git Hash (Optional)
         required: false
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash -l {0}
@@ -114,11 +118,6 @@ jobs:
           TARGET: win
           PYENV: pip
 
-        exclude:
-        # Exclude 3.11 on conda until matplotlib!=3.6.1 is released on
-        # conda-forge for python 3.11
-        - {os: windows-latest, python: 3.11}
-
     steps:
     - name: Checkout Pyomo source
       uses: actions/checkout@v3
@@ -334,7 +333,7 @@ jobs:
                 || echo "WARNING: Gurobi is not available"
             conda install -q -y -c fico-xpress xpress \
                 || echo "WARNING: Xpress Community Edition is not available"
-            for PKG in cyipopt pymumps; do
+            for PKG in cyipopt pymumps scip; do
                 conda install -q -y -c conda-forge $PKG \
                     || echo "WARNING: $PKG is not available"
             done

.jenkins.sh

@@ -86,9 +86,13 @@ if test -z "$MODE" -o "$MODE" == setup; then
     echo "#"
     echo "# Installing pyomo modules"
     echo "#"
-    pushd "$WORKSPACE/pyutilib" || echo "PyUtilib not found"
-    python setup.py develop || echo "PyUtilib failed - skipping."
-    popd
+    if test -d "$WORKSPACE/pyutilib"; then
+        pushd "$WORKSPACE/pyutilib"
+        python setup.py develop || echo "PyUtilib failed - skipping."
+        popd
+    else
+        echo "PyUtilib not found; skipping"
+    fi
     pushd "$WORKSPACE/pyomo" || exit 1
     python setup.py develop $PYOMO_SETUP_ARGS || exit 1
     popd