Skip two more problematic tests on Windows/PyPy

Author: domdfcoding

tests/__init__.py

@@ -19,3 +19,17 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 #  MA 02110-1301, USA.
 #
+
+# stdlib
+import platform
+
+# 3rd party
+import pytest
+from domdf_python_tools.compat import PYPY
+
+_reason = "Dulwich causes 'TypeError: os.scandir() doesn't support bytes path on Windows, use Unicode instead'"
+
+pypy_windows_dulwich = pytest.mark.skipif(
+		PYPY and platform.system() == "Windows",
+		reason=_reason,
+		)

tests/requirements.txt

@@ -5,7 +5,6 @@ coverage-pyver-pragma>=0.2.1
 domdf-python-tools[testing]>=2.0.1
 iniconfig!=1.1.0,>=1.0.1
 lorem>=0.1.1
-pyreadline@ https://github.com/domdfcoding/3.10-Wheels/raw/936f0570b561f3cda0be94d93066a11c6fe782f1/pyreadline-2.0-py3-none-any.whl ; python_version == "3.10" and platform_system == "Windows"
 pytest>=6.0.0
 pytest-cov>=2.8.1
 pytest-randomly>=3.3.1

tests/test_build.py

@@ -1,24 +1,17 @@
-# stdlib
-import platform
-
 # 3rd party
 import pytest
 import southwark.repo
 from apeye import URL
-from domdf_python_tools.compat import PYPY
 from dulwich.config import StackedConfig
 
 # this package
 from repo_helper.testing import builder_smoke_test
+from tests import pypy_windows_dulwich
 
 GITHUB_COM = URL("https://github.com")
 
 
-@pytest.mark.skipif(
-		PYPY and platform.system() == "Windows",
-		reason=
-		"Dulwich causes 'TypeError: os.scandir() doesn't support bytes path on Windows, use Unicode instead'",
-		)
+@pypy_windows_dulwich
 @pytest.mark.parametrize(
 		"username, repository", [
 				("domdfcoding", "sphinx-toolbox"),

tests/test_cli/test_release.py

@@ -1,20 +1,18 @@
 # stdlib
-import platform
 import re
 from typing import TYPE_CHECKING, Callable, List, Optional
 
 # 3rd party
-import pytest
 from coincidence.regressions import check_file_regression
 from consolekit.testing import CliRunner, Result
-from domdf_python_tools.compat import PYPY
 from domdf_python_tools.paths import PathPlus, in_directory
 from pytest_regressions.file_regression import FileRegressionFixture
 from southwark import get_tags
 from southwark.repo import Repo
 
 # this package
 from repo_helper.cli.commands.release import major, minor, patch, release
+from tests import pypy_windows_dulwich
 
 if TYPE_CHECKING:
 	Command = Callable
@@ -112,13 +110,6 @@ def check_file(filename: PathPlus, extension: Optional[str] = None):
 		assert tags[m.group(1)] == f"v{expected_version}"
 
 
-pypy_windows_dulwich = pytest.mark.skipif(
-		PYPY and platform.system() == "Windows",
-		reason=
-		"Dulwich causes 'TypeError: os.scandir() doesn't support bytes path on Windows, use Unicode instead'",
-		)
-
-
 @pypy_windows_dulwich
 def test_release_minor(temp_repo, file_regression: FileRegressionFixture):
 	do_test_release(

tests/test_cli/test_show.py

@@ -1,18 +1,17 @@
-# stdlib
-import platform
-
 # 3rd party
 import pytest
-from coincidence import check_file_regression, min_version, not_pypy, only_version
+from coincidence.regressions import check_file_regression
+from coincidence.selectors import min_version, not_pypy, only_version
 from consolekit.testing import CliRunner, Result
-from domdf_python_tools.compat import PYPY36
 from domdf_python_tools.paths import PathPlus, in_directory
 from pytest_regressions.file_regression import FileRegressionFixture
 
 # this package
 from repo_helper.cli.commands import show
+from tests import pypy_windows_dulwich
 
 
+@pypy_windows_dulwich
 def test_version(tmp_repo, file_regression: FileRegressionFixture):
 
 	(tmp_repo / "repo_helper.yml").write_lines([
@@ -34,11 +33,7 @@ def test_version(tmp_repo, file_regression: FileRegressionFixture):
 	result.check_stdout(file_regression)
 
 
-@pytest.mark.skipif(
-		PYPY36 and platform.system() == "Windows",
-		reason=
-		"Dulwich causes 'TypeError: os.scandir() doesn't support bytes path on Windows, use Unicode instead'",
-		)
+@pypy_windows_dulwich
 def test_changelog(tmp_repo, file_regression: FileRegressionFixture):
 
 	# TODO: -n/--entries
@@ -150,6 +145,7 @@ def test_requirements_no_pager(
 			check_file_regression(result.stdout.rstrip(), file_regression, extension=".tree")
 
 
+@pypy_windows_dulwich
 def test_log(tmp_repo, file_regression: FileRegressionFixture):
 
 	# TODO: -n/--entries