Merge pull request Pyomo#3 from Pyomo/master

Update the IDAES branch of Pyomo
kaklise · Jun 10, 2020 · f36f307 · f36f307
2 parents 267db4c + e021c09
commit f36f307
Show file tree

Hide file tree

Showing 241 changed files with 20,632 additions and 9,328 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.codecov.yml b/.codecov.yml
@@ -12,3 +12,8 @@ coverage:
         threshold: 0%
 #  ci:
 #    - !ci.appveyor.com
+codecov:
+  notify:
+    # GHA: 18, Travis: 13, Jenkins: 6
+    after_n_builds: 33
+    wait_for_ci: yes
diff --git a/.coveragerc b/.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/*