chore: cleanup and harden pytest config (#1011)
* chore: cleanup and harden pytest config * fix: try alternate terminate strategy * Update cibuildwheel/docker_container.py Co-authored-by: Joe Rickerby <joerick@mac.com> Co-authored-by: Joe Rickerby <joerick@mac.com>
This commit is contained in:
co-authored by
Joe Rickerby
parent
2d1fee2b35
commit
45a211eb1c
@@ -100,9 +100,11 @@ class DockerContainer:
|
|||||||
exc_tb: Optional[TracebackType],
|
exc_tb: Optional[TracebackType],
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|
||||||
|
self.bash_stdin.write(b"exit 0\n")
|
||||||
|
self.bash_stdin.flush()
|
||||||
|
self.process.wait(timeout=30)
|
||||||
self.bash_stdin.close()
|
self.bash_stdin.close()
|
||||||
self.process.terminate()
|
self.bash_stdout.close()
|
||||||
self.process.wait()
|
|
||||||
|
|
||||||
assert isinstance(self.name, str)
|
assert isinstance(self.name, str)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ import nox
|
|||||||
|
|
||||||
nox.options.sessions = ["lint", "check_manifest", "tests"]
|
nox.options.sessions = ["lint", "check_manifest", "tests"]
|
||||||
|
|
||||||
PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
|
PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
|
||||||
|
|
||||||
DIR = Path(__file__).parent.resolve()
|
DIR = Path(__file__).parent.resolve()
|
||||||
|
|
||||||
|
|||||||
+6
-3
@@ -9,21 +9,24 @@ build-backend = "setuptools.build_meta"
|
|||||||
|
|
||||||
[tool.black]
|
[tool.black]
|
||||||
line-length = 100
|
line-length = 100
|
||||||
target-version = ['py36', 'py37', 'py38', 'py39']
|
target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
|
||||||
|
|
||||||
|
|
||||||
[tool.isort]
|
[tool.isort]
|
||||||
profile = "black"
|
profile = "black"
|
||||||
multi_line_output = 3
|
|
||||||
|
|
||||||
|
|
||||||
[tool.pytest.ini_options]
|
[tool.pytest.ini_options]
|
||||||
minversion = 6.0
|
minversion = "6.0"
|
||||||
|
addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
|
||||||
junit_family = "xunit2"
|
junit_family = "xunit2"
|
||||||
testpaths = [
|
testpaths = [
|
||||||
"test",
|
"test",
|
||||||
"unit_test",
|
"unit_test",
|
||||||
]
|
]
|
||||||
|
xfail_strict = true
|
||||||
|
filterwarnings = ["error"]
|
||||||
|
log_cli_level = "info"
|
||||||
|
|
||||||
|
|
||||||
[tool.mypy]
|
[tool.mypy]
|
||||||
|
|||||||
Reference in New Issue
Block a user