Skip to content

Commit d303f28

Browse files
authored
Run pyroma in tox -e lint instead of pytest (#9670)
2 parents 13d6c5e + 9344159 commit d303f28

8 files changed

Lines changed: 10 additions & 62 deletions

File tree

.ci/install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ python3 -m pip install olefile
3131
python3 -m pip install -U pytest
3232
python3 -m pip install -U pytest-cov
3333
python3 -m pip install -U pytest-timeout
34-
python3 -m pip install pyroma
3534
# optional test dependencies, only install if there's a binary package.
3635
python3 -m pip install --only-binary=:all: numpy || true
3736
python3 -m pip install --only-binary=:all: pyarrow || true

.github/workflows/macos-install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ python3 -m pip install olefile
1212
python3 -m pip install -U pytest
1313
python3 -m pip install -U pytest-cov
1414
python3 -m pip install -U pytest-timeout
15-
python3 -m pip install pyroma
1615
# optional test dependencies, only install if there's a binary package.
1716
python3 -m pip install --only-binary=:all: numpy || true
1817
python3 -m pip install --only-binary=:all: pyarrow || true

.pre-commit-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ repos:
8686
hooks:
8787
- id: tox-ini-fmt
8888

89+
- repo: https://github.com/regebro/pyroma
90+
rev: 5.0.1
91+
hooks:
92+
- id: pyroma
93+
additional_dependencies: [check-manifest]
94+
stages: [manual]
95+
8996
- repo: meta
9097
hooks:
9198
- id: check-hooks-apply

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ release-test:
8181
python3 -m pytest Tests
8282
python3 -m pip install .
8383
python3 -m pytest -qq
84-
python3 -m check_manifest
85-
python3 -m pyroma .
8684
$(MAKE) readme
8785

8886
.PHONY: sdist

Tests/test_image_access.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ class TestEmbeddable:
260260
@pytest.mark.xfail(not (sys.version_info >= (3, 13)), reason="failing test")
261261
@pytest.mark.skipif(not is_win32(), reason="requires Windows")
262262
def test_embeddable(self) -> None:
263+
pytest.importorskip("setuptools", reason="setuptools not installed")
263264
import ctypes
264265

265266
from setuptools.command import build_ext

Tests/test_pyroma.py

Lines changed: 0 additions & 55 deletions
This file was deleted.

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,16 @@ optional-dependencies.test-arrow = [
6363
"pyarrow",
6464
]
6565
optional-dependencies.tests = [
66-
"check-manifest",
6766
"coverage>=7.4.2",
6867
"defusedxml",
6968
"markdown2",
7069
"olefile",
7170
"packaging",
72-
"pyroma>=5",
7371
"pytest",
7472
"pytest-cov",
7573
"pytest-timeout",
7674
"pytest-xdist",
75+
"setuptools",
7776
"trove-classifiers>=2024.10.12",
7877
]
7978
optional-dependencies.xmp = [

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pass_env =
2929
PREK_COLOR
3030
commands =
3131
prek run --all-files --show-diff-on-failure
32-
check-manifest
32+
prek run --all-files --show-diff-on-failure pyroma
3333

3434
[testenv:mypy]
3535
skip_install = true

0 commit comments

Comments
 (0)