Update MindtPy online doc

.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.1.2</stableVersionNumber>
-			<releaseNumber>6.1.2</releaseNumber>
+			<stableVersionNumber>6.2</stableVersionNumber>
+			<releaseNumber>6.2</releaseNumber>
 
 		</developmentStatus>
 

.github/workflows/release_wheel_creation.yml

@@ -54,6 +54,7 @@ jobs:
         path: dist
 
   manylinuxaarch64:
+    if: ${{ false }}
     name: ${{ matrix.TARGET }}/wheel_creation
     runs-on: ${{ matrix.os }}
     strategy:

.github/workflows/test_branches.yml

@@ -683,7 +683,7 @@ jobs:
             exit 1
         fi
 
-    - name: Upload codecov reports
+    - name: Combine coverage reports
       if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main'
       run: |
         set +e
@@ -692,71 +692,47 @@ jobs:
         else
             SHA=$GITHUB_SHA
         fi
-        function upload {
-            echo ""
-            echo "Build group: $1"
-            export CODECOV_NAME=$1
-            export TAG=$1
-            export GHA_OS_NAME=${{matrix.TARGET}}
-            shift
-            rm -vf .coverage coverage.xml
-            echo "    $@" | sed 's/ /\n    /'
-            coverage combine --debug=dataio $@
-            if test ! -e .coverage; then
-                echo "No coverage to upload."
-                return
-            fi
-            coverage xml || coverage xml -i
-            i=0
-            while : ; do
-                ((i+=1))
-                rm -f codecov.log
-                echo "Uploading coverage to codecov (attempt ${i})"
-                bash $CODECOV -Z -e TAG,GHA_OS_NAME -X gcov -X s3 \
-                    -f coverage.xml -C $SHA | tee codecov.log
-                if test $? == 0; then
-                    echo "PASS $CODECOV_NAME" >> codecov.result
-                    break
-                elif test $i -ge 2; then
-                    if test `grep successfully codecov.log | wc -l` -gt 0; then
-                        echo "PASS $CODECOV_NAME (implied)" >> codecov.result
-                    else
-                        # Do not fail the build (yet) just because the
-                        # codecov upload fails
-                        echo "FAIL $CODECOV_NAME" >> codecov.result
-                        break
-                    fi
-                fi
-                DELAY=$(( RANDOM % 30 + 30))
-                echo "Pausing $DELAY seconds before re-attempting upload"
-                sleep $DELAY
-            done
-        }
         for ARTIFACT in artifacts/*_*${{matrix.TARGET}}_*; do
             NAME=`echo $ARTIFACT | cut -d/ -f2`
             cp -v $ARTIFACT/.coverage .coverage-$NAME
         done
-        upload ${{matrix.TARGET}} .coverage-*_${{matrix.TARGET}}-*
-        if compgen -G ".coverage-*" > /dev/null; then
-            upload ${{matrix.TARGET}}/other .coverage-*
+        rm -vf .coverage coverage.xml
+        echo "Build: ${{ matrix.TARGET }}/other"
+        echo ""
+        FILES=.coverage-*_other-*
+        coverage combine --debug=dataio $FILES
+        if test ! -e .coverage; then
+            echo "No coverage to upload."
+        else
+            coverage xml || coverage xml -i
+            mv -v coverage.xml coverage-other.xml
         fi
-        # Legacy builds that don't support coverage 5.x
-        if compgen -G ".coverage-*" > /dev/null; then
-            echo ""
-            echo "Installing coverage 4.x for legacy builds"
-            pip install --cache-dir cache/pip 'coverage<5'
-            upload ${{matrix.TARGET}}/legacy .coverage-*
+        echo ""
+        echo "Build: ${{ matrix.TARGET }}"
+        echo ""
+        FILES=.coverage-*_${{matrix.TARGET}}-*
+        coverage combine --debug=dataio $FILES
+        rm -vf artifacts/*/*.xml
+        if test ! -e .coverage; then
+            echo "No coverage to upload."
+        else
+            coverage xml || coverage xml -i
         fi
 
-    - name: Check codecov upload success
-      run: |
-        FAIL=`grep FAIL codecov.result | wc -l`
-        ALL=`cat codecov.result | wc -l`
-        echo "$FAIL of $ALL codecov uploads failed"
-        if test $FAIL -gt 0; then
-            grep FAIL codecov.result | sed 's/^/    /'
-            if test $FAIL -gt 1; then
-                echo "More than 1 codecov upload failed."
-                exit 1
-            fi
-        fi
+    - name: Upload codecov reports
+      if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main'
+      uses: codecov/codecov-action@v2
+      with:
+        files: coverage.xml
+        name: ${{ matrix.TARGET }}
+        flags: ${{ matrix.TARGET }}
+
+    - name: Upload other coverage reports
+      if: |
+        hashFiles('coverage-other.xml') != '' &&
+        (github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main')
+      uses: codecov/codecov-action@v2
+      with:
+        files: coverage-other.xml
+        name: ${{ matrix.TARGET }}/other
+        flags: ${{ matrix.TARGET }},other

.github/workflows/test_pr_and_main.yml

@@ -702,7 +702,7 @@ jobs:
             exit 1
         fi
 
-    - name: Upload codecov reports
+    - name: Combine coverage reports
       if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main'
       run: |
         set +e
@@ -711,71 +711,47 @@ jobs:
         else
             SHA=$GITHUB_SHA
         fi
-        function upload {
-            echo ""
-            echo "Build group: $1"
-            export CODECOV_NAME=$1
-            export TAG=$1
-            export GHA_OS_NAME=${{matrix.TARGET}}
-            shift
-            rm -vf .coverage coverage.xml
-            echo "    $@" | sed 's/ /\n    /'
-            coverage combine --debug=dataio $@
-            if test ! -e .coverage; then
-                echo "No coverage to upload."
-                return
-            fi
-            coverage xml || coverage xml -i
-            i=0
-            while : ; do
-                ((i+=1))
-                rm -f codecov.log
-                echo "Uploading coverage to codecov (attempt ${i})"
-                bash $CODECOV -Z -e TAG,GHA_OS_NAME -X gcov -X s3 \
-                    -f coverage.xml -C $SHA | tee codecov.log
-                if test $? == 0; then
-                    echo "PASS $CODECOV_NAME" >> codecov.result
-                    break
-                elif test $i -ge 2; then
-                    if test `grep successfully codecov.log | wc -l` -gt 0; then
-                        echo "PASS $CODECOV_NAME (implied)" >> codecov.result
-                    else
-                        # Do not fail the build (yet) just because the
-                        # codecov upload fails
-                        echo "FAIL $CODECOV_NAME" >> codecov.result
-                        break
-                    fi
-                fi
-                DELAY=$(( RANDOM % 30 + 30))
-                echo "Pausing $DELAY seconds before re-attempting upload"
-                sleep $DELAY
-            done
-        }
         for ARTIFACT in artifacts/*_*${{matrix.TARGET}}_*; do
             NAME=`echo $ARTIFACT | cut -d/ -f2`
             cp -v $ARTIFACT/.coverage .coverage-$NAME
         done
-        upload ${{matrix.TARGET}} .coverage-*_${{matrix.TARGET}}-*
-        if compgen -G ".coverage-*" > /dev/null; then
-            upload ${{matrix.TARGET}}/other .coverage-*
+        rm -vf .coverage coverage.xml
+        echo "Build: ${{ matrix.TARGET }}/other"
+        echo ""
+        FILES=.coverage-*_other-*
+        coverage combine --debug=dataio $FILES
+        if test ! -e .coverage; then
+            echo "No coverage to upload."
+        else
+            coverage xml || coverage xml -i
+            mv -v coverage.xml coverage-other.xml
         fi
-        # Legacy builds that don't support coverage 5.x
-        if compgen -G ".coverage-*" > /dev/null; then
-            echo ""
-            echo "Installing coverage 4.x for legacy builds"
-            pip install --cache-dir cache/pip 'coverage<5'
-            upload ${{matrix.TARGET}}/legacy .coverage-*
+        echo ""
+        echo "Build: ${{ matrix.TARGET }}"
+        echo ""
+        FILES=.coverage-*_${{matrix.TARGET}}-*
+        coverage combine --debug=dataio $FILES
+        rm -vf artifacts/*/*.xml
+        if test ! -e .coverage; then
+            echo "No coverage to upload."
+        else
+            coverage xml || coverage xml -i
         fi
 
-    - name: Check codecov upload success
-      run: |
-        FAIL=`grep FAIL codecov.result | wc -l`
-        ALL=`cat codecov.result | wc -l`
-        echo "$FAIL of $ALL codecov uploads failed"
-        if test $FAIL -gt 0; then
-            grep FAIL codecov.result | sed 's/^/    /'
-            if test $FAIL -gt 1; then
-                echo "More than 1 codecov upload failed."
-                exit 1
-            fi
-        fi
+    - name: Upload codecov reports
+      if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main'
+      uses: codecov/codecov-action@v2
+      with:
+        files: coverage.xml
+        name: ${{ matrix.TARGET }}
+        flags: ${{ matrix.TARGET }}
+
+    - name: Upload other coverage reports
+      if: |
+        hashFiles('coverage-other.xml') != '' &&
+        (github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main')
+      uses: codecov/codecov-action@v2
+      with:
+        files: coverage-other.xml
+        name: ${{ matrix.TARGET }}/other
+        flags: ${{ matrix.TARGET }},other

CHANGELOG.txt

@@ -2,6 +2,78 @@
 Pyomo CHANGELOG
 ===============
 
+-------------------------------------------------------------------------------
+Pyomo 6.2    17 Nov 2021
+-------------------------------------------------------------------------------
+
+- General
+  - Add ListOf domain validator for ConfigValue (#2103)
+  - Remove deprecated calls to warnings.warning (#2106)
+  - Add Bool and Integer domain validators (#2110)
+  - Overhaul of Pyomo TempfileManager (#2109)
+  - Allow passing tuples and expressions to 
+    calculate_variable_from_constraint() (#2133)
+  - Add external functions to block in create_subsystem_block (#2142)
+  - Track changes in pint 0.18 and Xpress 8.13.0 (#2168)
+  - Remove code deprecated in Pyomo version 5.6 or older (#1992)
+  - Add Linux aarch64 wheel build support (#2076)
+  - Update wheel creation GitHub Actions version (#2192)
+  - Remove optional_packages from pyomo.environ (#2195)
+  - Ignore bounds/domain when updating variable value in 
+    calculate_variable_from_constraint() (#2177)
+- Core
+  - Fix Expression.getitem when initialized with Skip (#2136)
+  - Support hierarchical models in logical_to_linear transformation (#2135)
+  - Add ordered=True API for iterating over IndexedComponents (#2149)
+  - Fix bug in differentiate module related to reused subexpressions (#2148)
+  - Rework expression replacement and LinearExpression object (#2143)
+  - Add support for custom pint registries (#2153)
+  - Add support for solving blocks and targets in logical_to_linear 
+    transformation (#2147)
+  - Add support for finding components with a ComponentUID (#2178)
+  - Fix bugs with open NumericRanges (#2170, #2179)
+  - Fix bugs with References (#2158)
+  - Fix Initializer by treating pandas.Series as sequences (#2151)
+  - Fix Initializer support for ConfigList/ConfigDict (#2200)
+  - Add a DataFrameInitializer (#2150)
+  - Add a public API for retrieving variable bound expressions (#2172)
+  - Rework Var component to leverage Initializer (#2184)
+- Documentation
+  - Expand documentation of pyomo.common (#2104)
+  - Minor documentation fixes (#2117)
+- Solver Interfaces
+  - Issue warning when using the Xpress LP/MPS interface (#2125)
+  - Disable implicit repn cache for LP and NL writers (#2144)
+  - Add option to force variables into an NL file (#2152)
+  - Add the exception to the NEOS connection failure warning message (#2166)
+  - Improve GAMS writer performance (#2191)
+- Testing
+  - Resolve test failures when no solvers are available (#2146)
+  - Resolve NumericValue support in assertStructuredAlmostEqual (#2200)
+  - Fix typo in booktest skip declaration (#2186)
+- DAE Updates
+  - Utility function to slice individual components in flatten module (#2141)
+  - Fix errors and deprecation warnings in some DAE examples (#2189)
+  - Fix bug allowing numpy.float64 types to end up in a ContinuousSet (#2193)
+- GDP Updates
+  - Update GDP transformations to handle logical constraints (#2175)
+- Contributed Packages
+  - APPSI: Add support for external functions in NL writer (#2111)
+  - APPSI: Improved handling of immutable parameters (#2112)
+  - PyNumero: Pass AMPLFUNC directly to pynumero_ASL and not through 
+    environment (#2114, #2129)
+  - PyNumero: ExternalPyomoModel performance improvements (#2155)
+  - PyNumero: Remove exception when variable bounds are equal (#2121)
+  - Parmest: Add support for indexed variables (#2108)
+  - incidence_analysis: Simplify extraction of diagonal blocks from a block 
+    triangularization (#2128)
+  - GDPopt: Make line endings PEP8 compliant (#2173)
+  - MindtPy: Add support for MIP solver solution pools (#2164)
+  - MindtPy: Skip specific tests due to failure with Gurobi 9.5.0 on 
+    Windows (#2183)
+  - MindtPy: Fix feasibility pump and fixed variable detection (#2185, #2187)
+  - PyROS: Add uncertain variable bounds detection (#2159)
+
 -------------------------------------------------------------------------------
 Pyomo 6.1.2  20 Aug 2021
 -------------------------------------------------------------------------------

RELEASE.txt

@@ -1,4 +1,4 @@
-We are pleased to announce the release of Pyomo 6.1.2.
+We are pleased to announce the release of Pyomo 6.2.
 
 Pyomo is a collection of Python software packages that supports a
 diverse set of optimization capabilities for formulating and analyzing

doc/OnlineDocs/conf.py

@@ -143,7 +143,7 @@
 html_theme = 'sphinx_rtd_theme'
 
 # Force HTML4: If we don't explicitly force HTML4, then the background
-# of the Paramters/Returns/Return type headers is shaded the same as the
+# of the Parameters/Returns/Return type headers is shaded the same as the
 # method prototype (tested 15 April 21 with Sphinx=3.5.4 and
 # sphinx-rtd-theme=0.5.2).
 html4_writer = True
@@ -152,22 +152,6 @@
 if not on_rtd:  # only import and set the theme if we're building docs locally
     import sphinx_rtd_theme
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-    # Override default css to get a larger width for local build
-    def setup(app):
-        app.add_css_file('theme_overrides.css')
-    html_context = {
-        'css_files': [
-            '_static/theme_overrides.css',
-        ],
-    }
-else:
-    html_context = {
-        'css_files': [
-            'https://media.readthedocs.org/css/sphinx_rtd_theme.css',
-            'https://media.readthedocs.org/css/readthedocs-doc-embed.css',
-            '_static/theme_overrides.css',
-        ],
-    }
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -179,6 +163,9 @@ def setup(app):
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
+html_css_files = [
+    'theme_overrides.css',
+]
 
 html_favicon = "../logos/pyomo/favicon.ico"