Merge https://github.com/jaraco/skeleton

# Conflicts: # .coveragerc
jherland · Feb 23, 2023 · 8772261 · 8772261
2 parents c8df3d7 + 56cdf46
commit 8772261
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -8,6 +8,8 @@ omit =
 	*/_itertools.py
 	exercises.py
 	*/pip-run-*
+disable_warnings =
+	couldnt-parse
 
 [report]
 show_missing = True
diff --git a/pytest.ini b/pytest.ini
@@ -1,8 +1,9 @@
 [pytest]
 norecursedirs=dist build .tox .eggs
 addopts=--doctest-modules
-doctest_optionflags=ALLOW_UNICODE ELLIPSIS
 filterwarnings=
+	## upstream
+
 	# Ensure ResourceWarnings are emitted
 	default::ResourceWarning
 
@@ -18,3 +19,14 @@ filterwarnings=
 	ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
 	ignore:The \(fspath. py.path.local\) argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning
 	ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning
+
+	# shopkeep/pytest-black#67
+	ignore:'encoding' argument not specified::pytest_black
+
+	# realpython/pytest-mypy#152
+	ignore:'encoding' argument not specified::pytest_mypy
+
+	# python/cpython#100750
+	ignore:'encoding' argument not specified::platform
+
+	## end upstream
diff --git a/tox.ini b/tox.ini
@@ -8,12 +8,15 @@ toxworkdir={env:TOX_WORK_DIR:.tox}
 
 [testenv]
 deps =
+setenv =
+	PYTHONWARNDEFAULTENCODING = 1
 commands =
 	pytest {posargs}
 passenv =
 	HOME
 usedevelop = True
-extras = testing
+extras =
+	testing
 
 
 [testenv:docs]