Skip to content

Commit

Permalink
chore: switch formatting to Ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
scop committed Dec 23, 2023
1 parent 1e253d1 commit e21c4b2
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 22 deletions.
5 changes: 0 additions & 5 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@
"commitMessageTopic": "{{depName}}",
"semanticCommitScope": "pre-commit"
},
{
"matchPackagePatterns": ["(^|/)black(-pre-commit-mirror)?$"],
"groupName": "black",
"versioning": "pep440"
},
{
"matchPackagePatterns": ["(^|/)ruff(-pre-commit)?$"],
"groupName": "ruff",
Expand Down
6 changes: 1 addition & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ repos:
rev: v0.1.9
hooks:
- id: ruff

- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.7.0
hooks:
- id: black
- id: ruff-format

- repo: local
hooks:
Expand Down
18 changes: 16 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,22 @@
target-version = "py37"
select = ["E", "F", "I"]
ignore = [
"E50", # black
"E70", # black
# https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
"W191",
"E111",
"E114",
"E117",
"D206",
"D300",
"Q000",
"Q001",
"Q002",
"Q003",
"COM812",
"COM819",
"ISC001",
"ISC002",
"E501",
]
src = ["src", "tests"]

Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
},
extras_require={
"dev": [
"black==23.7.0",
"mypy==1.5.1",
"nox",
"types-setuptools",
Expand Down
12 changes: 3 additions & 9 deletions tests/test_venvrun.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ def tearDown(self) -> None:
os.chdir(self.oldcwd)

def testGuess(self) -> None:
def mock_run(
*args: Any, **kwargs: Any
) -> CompletedProcess: # type: ignore[type-arg] # generic in 3.9+
def mock_run(*args: Any, **kwargs: Any) -> CompletedProcess: # type: ignore[type-arg] # generic in 3.9+
if args[0] == ("pyenv", "prefix", "venv-run-testsuite"):
return real_subprocess_run(("echo", "pyenv/path/somewhere"), **kwargs)
if args[0] == ("asdf", "where", "python", "3.10.4"):
Expand Down Expand Up @@ -53,9 +51,7 @@ def mock_run(
)

def testGuessDedupe(self) -> None:
def mock_run(
*args: Any, **kwargs: Any
) -> CompletedProcess: # type: ignore[type-arg] # generic in 3.9+
def mock_run(*args: Any, **kwargs: Any) -> CompletedProcess: # type: ignore[type-arg] # generic in 3.9+
if args[0] == ("pyenv", "prefix", "venv-run-testsuite"):
return real_subprocess_run(("echo", "venv"), **kwargs)
return real_subprocess_run(*args, **kwargs)
Expand Down Expand Up @@ -84,9 +80,7 @@ def testGuessDedupeSymlink(self) -> None:
symlink = os.path.join(tempdir, "venv")
os.symlink(os.path.join(os.getcwd(), "venv"), symlink)

def mock_run(
*args: Any, **kwargs: Any
) -> CompletedProcess: # type: ignore[type-arg] # generic in 3.9+
def mock_run(*args: Any, **kwargs: Any) -> CompletedProcess: # type: ignore[type-arg] # generic in 3.9+
if args[0] == ("pyenv", "prefix", "venv-run-testsuite"):
return real_subprocess_run(("echo", symlink), **kwargs)
return real_subprocess_run(*args, **kwargs)
Expand Down

0 comments on commit e21c4b2

Please sign in to comment.