Merge branch 'main' into linear-walker-wrt

.github/workflows/test_branches.yml

@@ -855,9 +855,6 @@ jobs:
         token: ${{ secrets.PYOMO_CODECOV_TOKEN }}
         name: ${{ matrix.TARGET }}
         flags: ${{ matrix.TARGET }}
-        # downgrading after v0.7.0 broke tokenless upload
-        # see codecov/codecov-action#1487
-        version: v0.6.0
         fail_ci_if_error: true
 
     - name: Upload other coverage reports
@@ -870,7 +867,4 @@ jobs:
         token: ${{ secrets.PYOMO_CODECOV_TOKEN }}
         name: ${{ matrix.TARGET }}/other
         flags: ${{ matrix.TARGET }},other
-        # downgrading after v0.7.0 broke tokenless upload
-        # see codecov/codecov-action#1487
-        version: v0.6.0
         fail_ci_if_error: true

.github/workflows/test_pr_and_main.yml

@@ -68,8 +68,9 @@ jobs:
         verbose: true
         # How many times to retry a failed request (defaults to 1)
         retry_count: 3
-        # Exclude Jenkins because it's behind a firewall; ignore RTD because
-        # a magically-generated string is triggering a failure
+        # Exclude:
+        #  - Jenkins because it's behind a firewall
+        #  - RTD because a magically-generated string triggers failures
         exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html
 
 
@@ -899,9 +900,6 @@ jobs:
         token: ${{ secrets.PYOMO_CODECOV_TOKEN }}
         name: ${{ matrix.TARGET }}
         flags: ${{ matrix.TARGET }}
-        # downgrading after v0.7.0 broke tokenless upload
-        # see codecov/codecov-action#1487
-        version: v0.6.0
         fail_ci_if_error: true
 
     - name: Upload other coverage reports
@@ -914,7 +912,4 @@ jobs:
         token: ${{ secrets.PYOMO_CODECOV_TOKEN }}
         name: ${{ matrix.TARGET }}/other
         flags: ${{ matrix.TARGET }},other
-        # downgrading after v0.7.0 broke tokenless upload
-        # see codecov/codecov-action#1487
-        version: v0.6.0
         fail_ci_if_error: true

.github/workflows/typos.toml

@@ -38,6 +38,8 @@ caf = "caf"
 WRONLY = "WRONLY"
 # Ignore the name Hax
 Hax = "Hax"
+# Ignore dout (short for dual output in SAS solvers)
+dout = "dout"
 # Big Sur
 Sur = "Sur"
 # contrib package named mis and the acronym whence the name comes
@@ -67,4 +69,6 @@ RO = "RO"
 EOF = "EOF"
 # Ignore lst as shorthand for list
 lst = "lst"
+# Abbreviation of gamma (used in stochpdegas1_automatic.py)
+gam = "gam"
 # AS NEEDED: Add More Words Below

.jenkins.sh

@@ -20,8 +20,11 @@
 #
 # CODECOV_TOKEN: the token to use when uploading results to codecov.io
 #
-# CODECOV_ARGS: additional arguments to pass to the codecov uploader
-#     (e.g., to support SSL certificates)
+# CODECOV_SOURCE_BRANCH: passed to the 'codecov-cli' command; branch of Pyomo
+#     (e.g., to enable correct codecov uploads)
+#
+# CODECOV_REPO_OWNER: passed to the 'codecov-cli' command; owner of repo
+#     (e.g., to enable correct codecov uploads)
 #
 # DISABLE_COVERAGE: if nonempty, then coverage analysis is disabled
 #
@@ -202,22 +205,28 @@ if test -z "$MODE" -o "$MODE" == test; then
         # Note, that the PWD should still be $WORKSPACE/pyomo
         #
         coverage combine || exit 1
-        coverage report -i
+        coverage report -i || exit 1
+        coverage xml -i || exit 1
         export OS=`uname`
-        if test -z "$CODECOV_TOKEN"; then
-            coverage xml
-        else
+        if test -n "$CODECOV_TOKEN"; then
             CODECOV_JOB_NAME=`echo ${JOB_NAME} | sed -r 's/^(.*autotest_)?Pyomo_([^\/]+).*/\2/'`.$BUILD_NUMBER.$python
+            if test -z "$CODECOV_REPO_OWNER"; then
+                CODECOV_REPO_OWNER="pyomo"
+            fi
+            if test -z "CODECOV_SOURCE_BRANCH"; then
+                CODECOV_SOURCE_BRANCH="main"
+            fi
             i=0
             while /bin/true; do
                 i=$[$i+1]
                 echo "Uploading coverage to codecov (attempt $i)"
-                codecov -X gcovcodecov -X gcov -X s3 --no-color \
-                    -t $CODECOV_TOKEN --root `pwd` -e OS,python \
-                    --name $CODECOV_JOB_NAME $CODECOV_ARGS \
-                    | tee .cover.upload
-                if test $? == 0 -a `grep -i error .cover.upload \
-                        | grep -v branch= | wc -l` -eq 0; then
+                codecovcli -v upload-process --sha $PYOMO_SOURCE_SHA \
+                    --fail-on-error --git-service github --token $CODECOV_TOKEN \
+                    --slug pyomo/pyomo --file coverage.xml --disable-search \
+                    --name $CODECOV_JOB_NAME \
+                    --branch $CODECOV_REPO_OWNER:$CODECOV_SOURCE_BRANCH \
+                    --env OS,python --network-root-folder `pwd` --plugin noop
+                if test $? == 0; then
                     break
                 elif test $i -ge 4; then
                     exit 1

.codecov.yml → codecov.yml

@@ -1,19 +1,21 @@
+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
 coverage:
-  range: "50...100"
+  range:
+  - 50.0
+  - 100.0
   status:
+    patch:
+      default:
+        # Force patches to be covered at the level of the codebase
+        threshold: 0.0
     project:
       default:
         # Allow overall coverage to drop to avoid failures due to code
         # cleanup or CI unavailability/lag
-        threshold: 5%
-    patch:
-      default:
-        # Force patches to be covered at the level of the codebase
-        threshold: 0%
-#  ci:
-#    - !ci.appveyor.com
-codecov:
-  notify:
-    # GHA: 4, Jenkins: 8
-    after_n_builds: 12  # all
-    wait_for_ci: yes
+        threshold: 5.0

pyomo/common/config.py

@@ -996,7 +996,7 @@ class will still create ``c`` instances that only have the single
 :py:meth:`generate_documentation()`.  The simplest is
 :py:meth:`display()`, which prints out the current values of the
 configuration object (and if it is a container type, all of it's
-children).  :py:meth:`generate_yaml_template` is simular to
+children).  :py:meth:`generate_yaml_template` is similar to
 :py:meth:`display`, but also includes the description fields as
 formatted comments.
 

pyomo/common/tests/test_dependencies.py

@@ -209,7 +209,7 @@ def test_and_or(self):
         _and_or = avail0 & avail1 | avail2
         self.assertTrue(_and_or)
 
-        # Verify operator prescedence
+        # Verify operator precedence
         _or_and = avail0 | avail2 & avail2
         self.assertTrue(_or_and)
         _or_and = (avail0 | avail2) & avail2

pyomo/core/base/set.py

@@ -1986,7 +1986,7 @@ class InsertionOrder(object):
     class SortedOrder(object):
         pass
 
-    _ValidOrderedAuguments = {True, False, InsertionOrder, SortedOrder}
+    _ValidOrderedArguments = {True, False, InsertionOrder, SortedOrder}
     _UnorderedInitializers = {set}
 
     @overload
@@ -2015,7 +2015,7 @@ def __new__(cls, *args, **kwds):
         ordered = kwds.get('ordered', Set.InsertionOrder)
         if ordered is True:
             ordered = Set.InsertionOrder
-        if ordered not in Set._ValidOrderedAuguments:
+        if ordered not in Set._ValidOrderedArguments:
             if inspect.isfunction(ordered):
                 ordered = Set.SortedOrder
             else:
@@ -2032,7 +2032,7 @@ def __new__(cls, *args, **kwds):
                             str(_)
                             for _ in sorted_robust(
                                 'Set.' + x.__name__ if isinstance(x, type) else x
-                                for x in Set._ValidOrderedAuguments.union(
+                                for x in Set._ValidOrderedArguments.union(
                                     {'<function>'}
                                 )
                             )

pyomo/core/plugins/transform/radix_linearization.py

@@ -280,7 +280,7 @@ def _collect_bilinear(self, expr, bilin, quad):
         if type(expr) is PowExpression and value(expr._args[1]) == 2:
             # Note: directly testing the value of the exponent above is
             # safe: we have already verified that this expression is
-            # polynominal, so the exponent must be constant.
+            # polynomial, so the exponent must be constant.
             tmp = ProductExpression()
             tmp._numerator = [expr._args[0], expr._args[0]]
             tmp._denominator = []