Merge pull request #19 from Pyomo/main

Resync IDAES/pyomo@IDAES with Pyomo/pyomo@main
ZedongPeng · Apr 7, 2021 · 842a2a4 · 842a2a4
2 parents e71a82b + 5b84095
commit 842a2a4
Show file tree

Hide file tree

Showing 2,972 changed files with 19,467 additions and 341,000 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -14,6 +14,6 @@ coverage:
 #    - !ci.appveyor.com
 codecov:
   notify:
-    # GHA: 5, Jenkins: 6
-    after_n_builds: 11  # all
+    # GHA: 4, Jenkins: 4
+    after_n_builds: 8  # all
     wait_for_ci: yes
diff --git a/.coin-or/projDesc.xml b/.coin-or/projDesc.xml
@@ -107,7 +107,7 @@ Carl D. Laird, Chair, Pyomo Management Committee, cdlaird at sandia dot gov
                      license file directly.
                 -->
 		<projectLicenseURL>
-		  https://github.com/Pyomo/pyomo/blob/master/LICENSE.txt
+		  https://github.com/Pyomo/pyomo/blob/main/LICENSE.txt
 		</projectLicenseURL>
 
 		<!-- Below, you can list other COIN projects your project      -->

diff --git a/.coveragerc b/.coveragerc
@@ -7,6 +7,7 @@ omit =
 # 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]
+concurrency = multiprocessing,thread
 parallel = True
 source =
     pyomo