Merge branch 'master' into devel-2.0

usnistgov · Mar 27, 2023 · c9cb179 · c9cb179
2 parents 9389f63 + 1d21312
commit c9cb179
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,7 @@ before_install:
   -  pip3 install -U pip
 
 install:
-  - travis_wait travis_retry pip3 install -r requirements.txt --upgrade
+  - travis_wait travis_retry pip3 install -U -r requirements.txt
 
 script: 
   - pytest

diff --git a/pytest.ini b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
 testpaths = tests mosaic mosaicweb
 norecursedirs = .git _build _docs bin dist deps
-addopts = --cov=mosaic --cov-report term --cov-config=.coveragerc
+addopts = --cov=mosaic --cov=mosaicweb --cov-report term --cov-config=.coveragerc