Merge branch 'main' into fme-del-fix

Author: blnicho

.codecov.yml

@@ -1,15 +1,18 @@
 codecov:
   notify:
     # GHA: 5, Jenkins: 11
-    # Accurate as of July 3, 2024
-    # Potential to change when Python versions change
-    after_n_builds: 16
-    wait_for_ci: true
+    # Accurate as of April 1, 2025
+    # Potential to change when Python versions change.  We will allow
+    # codecov to start reporting when 80% of the reports are in.  This
+    # will hopefully help avoid an issue where codecov is not tracking
+    # PR branches (see https://github.com/codecov/feedback/issues/692).
+    after_n_builds: 13
+    wait_for_ci: false
   require_ci_to_pass: false
+comment:
+  after_n_builds: 13
 coverage:
-  range:
-  - 50.0
-  - 100.0
+  range: 70..98
   status:
     patch:
       default:

.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.9.1</stableVersionNumber>
-			<releaseNumber>6.9.1</releaseNumber>
+			<stableVersionNumber>6.9.2</stableVersionNumber>
+			<releaseNumber>6.9.2</releaseNumber>
 
 		</developmentStatus>
 

.github/workflows/release_wheel_creation.yml

@@ -59,17 +59,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Create pyproject.toml
-        run: |
-          # Per the cibuildwheel documentation, you can technically use
-          # CIBW_BEFORE_BUILD to do these steps; however, as of the newest
-          # version (2.21.3) this feature does not work. This is a hack
-          # to make cibuildwheel recognize our pre-build requirements
-          echo -e '[build-system]\n\nrequires = [ "setuptools", "wheel", "cython", "pybind11" ]' > $GITHUB_WORKSPACE/pyproject.toml
-          cat $GITHUB_WORKSPACE/pyproject.toml
-          ls -la $GITHUB_WORKSPACE
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@main
         with:
           output-dir: dist
         env:
@@ -118,17 +109,8 @@ jobs:
         uses: docker/setup-qemu-action@v3
         with:
           platforms: all
-      - name: Create pyproject.toml
-        run: |
-          # Per the cibuildwheel documentation, you can technically use
-          # CIBW_BEFORE_BUILD to do these steps; however, as of the newest
-          # version (2.21.3) this feature does not work. This is a hack
-          # to make cibuildwheel recognize our pre-build requirements
-          echo -e '[build-system]\n\nrequires = [ "setuptools", "wheel", "cython", "pybind11" ]' > $GITHUB_WORKSPACE/pyproject.toml
-          cat $GITHUB_WORKSPACE/pyproject.toml
-          ls -la $GITHUB_WORKSPACE
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@main
         with:
           output-dir: dist
         env:
@@ -158,10 +140,11 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install twine wheel setuptools pybind11
+          pip install build twine wheel setuptools pybind11
       - name: Build pure python wheel
         run: |
-          python setup.py --without-cython sdist --format=gztar bdist_wheel
+          export PYOMO_SETUP_ARGS=--without-cython
+          python -m build --wheel --outdir dist --config-setting="--build-option=--without-cython"
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
@@ -189,10 +172,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install twine wheel setuptools pybind11
+        pip install build twine wheel 'setuptools>=65' pybind11
     - name: Build generic tarball
       run: |
-        python setup.py --without-cython sdist --format=gztar
+        export PYOMO_SETUP_ARGS=--without-cython
+        python -m build --sdist --outdir dist --config-setting="--build-option=--without-cython"
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:

.github/workflows/test_branches.yml

@@ -26,10 +26,14 @@ env:
   CACHE_VER: v221013.1
   NEOS_EMAIL: tests@pyomo.org
   SRC_REF: ${{ github.head_ref || github.ref }}
+  PYOMO_WORKFLOW: branch
 
 jobs:
   lint:
     name: lint/style-and-typos
+    if: |
+      ${{ ! ( contains(github.event.pull_request.title, '[WIP]') ||
+            github.event.pull_request.draft ) }}
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Pyomo source
@@ -48,6 +52,7 @@ jobs:
       with: 
         config: ./.github/workflows/typos.toml
     - name: URL Checker
+      if: env.PYOMO_WORKFLOW == 'branch'
       uses: urlstechie/urlchecker-action@0.0.34
       with:
         # A comma-separated list of file types to cover in the URL checks
@@ -479,33 +484,38 @@ jobs:
         IPOPT_DIR=$TPL_DIR/ipopt
         echo "$IPOPT_DIR" >> $GITHUB_PATH
         echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$IPOPT_DIR" >> $GITHUB_ENV
+        echo "DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$IPOPT_DIR" >> $GITHUB_ENV
         NEW_PYOMO_PATH="$IPOPT_DIR:$PYOMO_PATH"
         echo "PYOMO_PATH=$NEW_PYOMO_PATH" >> $GITHUB_ENV
         mkdir -p $IPOPT_DIR
         IPOPT_TAR=${DOWNLOAD_DIR}/ipopt.tar.gz
         if test ! -e $IPOPT_TAR; then
             echo "...downloading Ipopt"
-            if test "${{matrix.TARGET}}" == osx; then
-                echo "IDAES Ipopt not available on OSX"
-                exit 0
-            fi
             URL=https://github.com/IDAES/idaes-ext
             RELEASE=$(curl --max-time 150 --retry 8 \
                 -L -s -H 'Accept: application/json' ${URL}/releases/latest)
             VER=$(echo $RELEASE | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/')
             URL=${URL}/releases/download/$VER
             if test "${{matrix.TARGET}}" == linux; then
                 curl --max-time 150 --retry 8 \
-                    -L $URL/idaes-solvers-ubuntu2004-x86_64.tar.gz \
-                    > $IPOPT_TAR
+                    -L $URL/idaes-solvers-ubuntu2204-x86_64.tar.gz \
+                    -o $IPOPT_TAR
+            elif test "${{matrix.TARGET}}" == osx; then
+                curl --max-time 150 --retry 8 \
+                    -L $URL/idaes-solvers-darwin-aarch64.tar.gz \
+                    -o $IPOPT_TAR
             else
                 curl --max-time 150 --retry 8 \
                     -L $URL/idaes-solvers-windows-x86_64.tar.gz \
                     $URL/idaes-lib-windows-x86_64.tar.gz > $IPOPT_TAR
             fi
         fi
         cd $IPOPT_DIR
-        tar -xzi < $IPOPT_TAR
+        if test "${{matrix.TARGET}}" == win; then
+            tar -xzi < $IPOPT_TAR
+        else
+            tar -xzf $IPOPT_TAR
+        fi
         echo ""
         echo "$IPOPT_DIR"
         ls -l $IPOPT_DIR
@@ -644,14 +654,15 @@ jobs:
 
     - name: Install Pyomo
       run: |
+        export PYOMO_SETUP_ARGS=${{ matrix.setup_options }}
         echo ""
         echo "Clone Pyomo-model-libraries..."
         URL=https://github.com/Pyomo/pyomo-model-libraries.git
         git clone -b ${SRC_REF##*/} $URL || git clone -b main $URL
         echo ""
         echo "Install Pyomo..."
         echo ""
-        $PYTHON_EXE setup.py develop ${{matrix.setup_options}}
+        $PYTHON_EXE -m pip install -e .
         echo ""
         echo "Set custom PYOMO_CONFIG_DIR"
         echo ""
@@ -780,7 +791,7 @@ jobs:
         echo ""
         echo "Install Pyomo..."
         echo ""
-        python setup.py develop
+        python -m pip install -e .
         echo ""
         echo "Set custom PYOMO_CONFIG_DIR"
         echo ""
@@ -805,7 +816,8 @@ jobs:
   cover:
     name: process-coverage-${{ matrix.TARGET }}
     needs: build
-    if: ${{ false }} # turn off for branches
+    # run even if a build job fails, but not if canceled (except for branches)
+    if: ${{ false }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
     strategy:
@@ -857,13 +869,14 @@ jobs:
 
     - name: Install Pyomo
       run: |
+        export PYOMO_SETUP_ARGS=${{ matrix.setup_options }}
         echo ""
         echo "Clone Pyomo-model-libraries..."
         git clone https://github.com/Pyomo/pyomo-model-libraries.git
         echo ""
         echo "Install Pyomo..."
         echo ""
-        $PYTHON_EXE setup.py develop ${{matrix.setup_options}}
+        $PYTHON_EXE -m pip install -e .
         echo ""
         echo "Set custom PYOMO_CONFIG_DIR"
         echo ""
@@ -876,26 +889,6 @@ jobs:
         $PYTHON_EXE -c "from pyomo.dataportal.parse_datacmds import \
             parse_data_commands; parse_data_commands(data='')"
 
-    - name: Update codecov uploader
-      run: |
-        set +e
-        CODECOV="${GITHUB_WORKSPACE}/codecov.sh"
-        echo "CODECOV=$CODECOV" >> $GITHUB_ENV
-        for i in `seq 3`; do
-            echo "Downloading current codecov script (attempt ${i})"
-            curl -L https://codecov.io/bash -o $CODECOV
-            if test $? == 0; then
-                break
-            fi
-            DELAY=$(( RANDOM % 30 + 30))
-            echo "Pausing $DELAY seconds before re-attempting download"
-            sleep $DELAY
-        done
-        if test ! -e $CODECOV; then
-            echo "Failed to download codecov.sh"
-            exit 1
-        fi
-
     - name: Combine coverage reports
       if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main'
       run: |
@@ -934,7 +927,7 @@ jobs:
 
     - name: Upload codecov reports
       if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main'
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         files: coverage.xml
         token: ${{ secrets.PYOMO_CODECOV_TOKEN }}
@@ -946,7 +939,7 @@ jobs:
       if: |
         hashFiles('coverage-other.xml') != '' &&
         (github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main')
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         files: coverage-other.xml
         token: ${{ secrets.PYOMO_CODECOV_TOKEN }}