Merge pull request Pyomo#4 from Pyomo/master

Update Pyomo fork with units fixes

.codecov.yml

@@ -1,4 +1,19 @@
 coverage:
   range: "50...100"
+  status:
+    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: 18, Travis: 13, Jenkins: 6
+    after_n_builds: 33
+    wait_for_ci: yes

.coin-or/projDesc.xml

@@ -227,8 +227,8 @@ Carl D. Laird, Chair, Pyomo Management Committee, cdlaird at sandia dot gov
 			     Use explicit overrides to disable use of automated
 			     version reporting.
 			-->
-			<stableVersionNumber>5.6.8</stableVersionNumber>
-			<releaseNumber>5.6.8</releaseNumber>
+			<stableVersionNumber>5.6.9</stableVersionNumber>
+			<releaseNumber>5.6.9</releaseNumber>
 
 		</developmentStatus>
 

.coveragerc

@@ -1,13 +1,16 @@
 [report]
 omit =
-    */python?.?/*
-    */site-packages/nose/*
-    *__init__*
-    */setup.py
+    setup.py
     */tests/*
     */tmp/*
 
 # The [run] section must be at the end, as the build harness will add a
 # "data_file" directive to the end of this file.
 [run]
 parallel = True
+source =
+    pyomo
+    examples
+omit =
+    # github actions creates a cache directory we don't want measured
+    cache/*

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@
 
 ### Legal Acknowledgement
 
-By contributing to this software project, I agree to the following terms and conditions for my contribution:
+By contributing to this software project, I have read the [contribution guide](https://pyomo.readthedocs.io/en/stable/contribution_guide.html) and agree to the following terms and conditions for my contribution:
 
 1. I agree my contributions are submitted under the BSD license.
 2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.