Skip to content

Commit 85d9837

Browse files
domdfcodingdomdfcoding
committed
Lint
1 parent d9059f6 commit 85d9837

20 files changed

+19
-45
lines changed

‎tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
pytest.param("3.10", marks=only_version("3.10", "Output differs on each version.")),
1717
]
1818
)
19-
def version(request):
19+
def version(request) -> str:
2020
return request.param
2121

2222

@@ -34,5 +34,5 @@ def version(request):
3434
),
3535
]
3636
)
37-
def os_sep(request):
37+
def os_sep(request) -> str:
3838
return request.param

‎tests/test_tox_raspi_ci.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@ def toxinidir(tmp_pathplus: PathPlus) -> PathPlus:
3030
pytest.param(["--raspi-ci", "-e", "mypy"], id="invalid_combo"),
3131
]
3232
)
33+
@pytest.mark.usefixtures("version", "os_sep")
3334
def test_tox_raspi_ci(
3435
capsys,
3536
command: List[str],
3637
toxinidir: PathPlus,
37-
version: str,
38-
os_sep,
3938
advanced_file_regression: AdvancedFileRegressionFixture,
4039
):
4140

@@ -48,7 +47,8 @@ def test_tox_raspi_ci(
4847
advanced_file_regression.check(prepare_stdout(capout.out, toxinidir))
4948

5049

51-
def test_tox_raspi_ci_no_command(capsys, toxinidir: PathPlus, os_sep, monkeypatch):
50+
@pytest.mark.usefixtures("os_sep")
51+
def test_tox_raspi_ci_no_command(capsys, toxinidir: PathPlus, monkeypatch):
5252
# The output varies depending on the versions of python installed on the host
5353
monkeypatch.setenv("RASPI_CI", '0')
5454

@@ -61,7 +61,8 @@ def test_tox_raspi_ci_no_command(capsys, toxinidir: PathPlus, os_sep, monkeypatc
6161
assert capout.out
6262

6363

64-
def test_tox_raspi_ci_envvar(capsys, toxinidir: PathPlus, os_sep, monkeypatch):
64+
@pytest.mark.usefixtures("os_sep")
65+
def test_tox_raspi_ci_envvar(capsys, toxinidir: PathPlus, monkeypatch):
6566
# The output varies depending on the versions of python installed on the host
6667

6768
monkeypatch.setenv("RASPI_CI", '1')

‎tests/test_tox_raspi_ci_/test_tox_raspi_ci_3_10_forward_invalid_combo_.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
WARNING: Ignoring '--raspi-ci' option as '-e / --envlist' option given.
22
mypy create: .../.tox/mypy
3-
mypy installed: .../.tox/mypy/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
43
mypy run-test-pre: PYTHONHASHSEED='2468'
54
mypy run-test: commands[0] | python -c 'print('"'"'This is the mypy testenv'"'"')'
65
___________________________________ summary ____________________________________

‎tests/test_tox_raspi_ci_/test_tox_raspi_ci_3_10_forward_manual_envs_.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
py310 create: .../.tox/py310
2-
py310 installed: .../.tox/py310/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
32
py310 run-test-pre: PYTHONHASHSEED='1234'
43
py310 run-test: commands[0] | python --version
54
mypy create: .../.tox/mypy
6-
mypy installed: .../.tox/mypy/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
75
mypy run-test-pre: PYTHONHASHSEED='2468'
86
mypy run-test: commands[0] | python -c 'print('"'"'This is the mypy testenv'"'"')'
97
___________________________________ summary ____________________________________

‎tests/test_tox_raspi_ci_/test_tox_raspi_ci_3_10_forward_manual_envs_posargs_.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
py310 create: .../.tox/py310
2-
py310 installed: .../.tox/py310/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
32
py310 run-test-pre: PYTHONHASHSEED='1234'
43
py310 run-test: commands[0] | python --version
54
mypy create: .../.tox/mypy
6-
mypy installed: .../.tox/mypy/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
75
mypy run-test-pre: PYTHONHASHSEED='2468'
86
mypy run-test: commands[0] | python -c 'print('"'"'This is the mypy testenv'"'"')'
97
___________________________________ summary ____________________________________

‎tests/test_tox_raspi_ci_/test_tox_raspi_ci_3_10_forward_raspi_.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ py39 create: .../.tox/py39
88
py39 run-test-pre: PYTHONHASHSEED='1234'
99
py39 run-test: commands[0] | python --version
1010
py310-dev create: .../.tox/py310-dev
11-
py310-dev installed: .../.tox/py310-dev/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
1211
py310-dev run-test-pre: PYTHONHASHSEED='1234'
1312
py310-dev run-test: commands[0] | python --version
1413
mypy create: .../.tox/mypy
15-
mypy installed: .../.tox/mypy/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
1614
mypy run-test-pre: PYTHONHASHSEED='2468'
1715
mypy run-test: commands[0] | python -c 'print('"'"'This is the mypy testenv'"'"')'
1816
build create: .../.tox/build
19-
build installed: .../.tox/build/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
2017
build run-test-pre: PYTHONHASHSEED='5678'
2118
build run-test: commands[0] | python -c 'print('"'"'This is the build testenv'"'"')'
2219
___________________________________ summary ____________________________________

‎tests/test_tox_raspi_ci_/test_tox_raspi_ci_3_10_forward_raspi_posargs_.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ py39 create: .../.tox/py39
88
py39 run-test-pre: PYTHONHASHSEED='1234'
99
py39 run-test: commands[0] | python --version
1010
py310-dev create: .../.tox/py310-dev
11-
py310-dev installed: .../.tox/py310-dev/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
1211
py310-dev run-test-pre: PYTHONHASHSEED='1234'
1312
py310-dev run-test: commands[0] | python --version
1413
mypy create: .../.tox/mypy
15-
mypy installed: .../.tox/mypy/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
1614
mypy run-test-pre: PYTHONHASHSEED='2468'
1715
mypy run-test: commands[0] | python -c 'print('"'"'This is the mypy testenv'"'"')'
1816
build create: .../.tox/build
19-
build installed: .../.tox/build/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
2017
build run-test-pre: PYTHONHASHSEED='5678'
2118
build run-test: commands[0] | python -c 'print('"'"'This is the build testenv'"'"')'
2219
___________________________________ summary ____________________________________

‎tests/test_tox_raspi_ci_/test_tox_raspi_ci_3_7_forward_raspi_.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ py39 create: .../.tox/py39
88
py39 run-test-pre: PYTHONHASHSEED='1234'
99
py39 run-test: commands[0] | python --version
1010
py310-dev create: .../.tox/py310-dev
11-
py310-dev installed: .../.tox/py310-dev/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
1211
py310-dev run-test-pre: PYTHONHASHSEED='1234'
1312
py310-dev run-test: commands[0] | python --version
1413
mypy create: .../.tox/mypy

‎tests/test_tox_raspi_ci_/test_tox_raspi_ci_3_7_forward_raspi_posargs_.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ py39 create: .../.tox/py39
88
py39 run-test-pre: PYTHONHASHSEED='1234'
99
py39 run-test: commands[0] | python --version
1010
py310-dev create: .../.tox/py310-dev
11-
py310-dev installed: .../.tox/py310-dev/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
1211
py310-dev run-test-pre: PYTHONHASHSEED='1234'
1312
py310-dev run-test: commands[0] | python --version
1413
mypy create: .../.tox/mypy

‎tests/test_tox_raspi_ci_/test_tox_raspi_ci_3_8_forward_raspi_.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ py39 create: .../.tox/py39
88
py39 run-test-pre: PYTHONHASHSEED='1234'
99
py39 run-test: commands[0] | python --version
1010
py310-dev create: .../.tox/py310-dev
11-
py310-dev installed: .../.tox/py310-dev/lib/python3.10/site-packages/pip/_internal/locations/_distutils.py:9: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives, from distutils.cmd import Command as DistutilsCommand,/usr/lib/python3.10/distutils/command/install.py:13: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead, from distutils.sysconfig import get_config_vars
1211
py310-dev run-test-pre: PYTHONHASHSEED='1234'
1312
py310-dev run-test: commands[0] | python --version
1413
mypy create: .../.tox/mypy

0 commit comments

Comments
 (0)