Fix pytest settings

jacebrowning · Mar 7, 2022 · 886c1c4 · 886c1c4
1 parent 5b5e317
commit 886c1c4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -76,6 +76,9 @@ PYTEST_OPTIONS := --random --random-seed=$(RANDOM_SEED)
 ifndef DISABLE_COVERAGE
 PYTEST_OPTIONS += --cov=$(PACKAGE)
 endif
+ifdef CI
+PYTEST_OPTIONS += --cov-report=xml
+endif
 PYTEST_RERUN_OPTIONS := --last-failed --exitfirst
 
 .PHONY: test

diff --git a/bin/update b/bin/update
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import os
+from contextlib import suppress
 import importlib
 import tempfile
 import shutil
@@ -48,6 +49,7 @@ def run():
 
 def copy():
     for filename in [
+        '.appveyor.yml',
         '.coveragerc',
         '.gitattributes',
         '.gitignore',
@@ -66,7 +68,8 @@ def copy():
         src = os.path.join(TMP, CONFIG['project_name'], filename)
         dst = os.path.join(CWD, filename)
         print("Updating " + filename)
-        shutil.copy(src, dst)
+        with suppress(FileNotFoundError):
+            shutil.copy(src, dst)
 
 
 if __name__ == '__main__':

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -88,15 +88,14 @@ check_untyped_defs = true
 
 cache_dir = ".cache/mypy/"
 
-[tool.pytest]
+[tool.pytest.ini_options]
 
 addopts = """
 --strict-markers
 
 -r sxX
 --show-capture=log
 
---cov-report=xml
 --cov-report=html
 --cov-report=term-missing:skip-covered
 --no-cov-on-fail