Skip to content

Commit

Permalink
Test run black on self (#3114)
Browse files Browse the repository at this point in the history
* Add run_self environment in tox

* Add run_self task as part of the lint CI flow

* Remove hard coded sources list

* Remove black from pre-commit

Co-authored-by: Cooper Lees <me@cooperlees.com>
  • Loading branch information
saroad2 and cooperlees committed Jun 14, 2022
1 parent 799adb5 commit 6c1bd08
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 56 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/lint.yml
Expand Up @@ -25,6 +25,11 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install -e '.[d]'
python -m pip install tox
- name: Lint
uses: pre-commit/action@v3.0.0

- name: Run On Self
run: |
tox -e run_self
8 changes: 0 additions & 8 deletions .pre-commit-config.yaml
Expand Up @@ -4,14 +4,6 @@ exclude: ^(src/blib2to3/|profiling/|tests/data/)
repos:
- repo: local
hooks:
- id: black
name: black
language: system
entry: black
minimum_pre_commit_version: 2.9.2
require_serial: true
types_or: [python, pyi]

- id: check-pre-commit-rev-in-example
name: Check pre-commit rev in example
language: python
Expand Down
48 changes: 1 addition & 47 deletions tests/test_format.py
@@ -1,5 +1,5 @@
from dataclasses import replace
from typing import Any, Iterator, List
from typing import Any, Iterator
from unittest.mock import patch

import pytest
Expand All @@ -14,47 +14,6 @@
all_data_cases,
)

SOURCES: List[str] = [
"src/black/__init__.py",
"src/black/__main__.py",
"src/black/brackets.py",
"src/black/cache.py",
"src/black/comments.py",
"src/black/concurrency.py",
"src/black/const.py",
"src/black/debug.py",
"src/black/files.py",
"src/black/linegen.py",
"src/black/lines.py",
"src/black/mode.py",
"src/black/nodes.py",
"src/black/numerics.py",
"src/black/output.py",
"src/black/parsing.py",
"src/black/report.py",
"src/black/rusty.py",
"src/black/strings.py",
"src/black/trans.py",
"src/blackd/__init__.py",
"src/blib2to3/pygram.py",
"src/blib2to3/pytree.py",
"src/blib2to3/pgen2/conv.py",
"src/blib2to3/pgen2/driver.py",
"src/blib2to3/pgen2/grammar.py",
"src/blib2to3/pgen2/literals.py",
"src/blib2to3/pgen2/parse.py",
"src/blib2to3/pgen2/pgen.py",
"src/blib2to3/pgen2/tokenize.py",
"src/blib2to3/pgen2/token.py",
"setup.py",
"tests/test_black.py",
"tests/test_blackd.py",
"tests/test_format.py",
"tests/optional.py",
"tests/util.py",
"tests/conftest.py",
]


@pytest.fixture(autouse=True)
def patch_dump_to_file(request: Any) -> Iterator[None]:
Expand Down Expand Up @@ -93,11 +52,6 @@ def test_preview_minimum_python_310_format(filename: str) -> None:
assert_format(source, expected, mode, minimum_version=(3, 10))


@pytest.mark.parametrize("filename", SOURCES)
def test_source_is_formatted(filename: str) -> None:
check_file("", filename, DEFAULT_MODE, data=False)


# =============== #
# Complex cases
# ============= #
Expand Down
9 changes: 8 additions & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = {,ci-}py{36,37,38,39,310,py3},fuzz
envlist = {,ci-}py{36,37,38,39,310,py3},fuzz,run_self

[testenv]
setenv = PYTHONPATH = {toxinidir}/src
Expand Down Expand Up @@ -61,3 +61,10 @@ commands =
coverage erase
coverage run fuzz.py
coverage report

[testenv:run_self]
setenv = PYTHONPATH = {toxinidir}/src
skip_install = True
commands =
pip install -e .[d]
black --check {toxinidir}/src {toxinidir}/tests {toxinidir}/setup.py

0 comments on commit 6c1bd08

Please sign in to comment.