Skip to content

Commit

Permalink
Ruff: enable all pyflakes and perf rules
Browse files Browse the repository at this point in the history
  • Loading branch information
Avasam committed Aug 28, 2024
1 parent 2fca902 commit 5aed410
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 17 deletions.
8 changes: 5 additions & 3 deletions ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,22 @@ exclude = [
[lint]
extend-select = [
"C901",
"PERF401",
"W",

# local
"ANN2", # missing-return-type-*
"FA", # flake8-future-annotations
"F", # Pyflakes
"F404", # late-future-import
"FA", # flake8-future-annotations
"I", # isort
"PERF", # Perflint
"PYI", # flake8-pyi
"TRY", # tryceratops
"UP", # pyupgrade
"TRY",
"YTT", # flake8-2020
]
ignore = [
"PERF203", # try-except-in-loop, micro-optimisation with many false-positive. Worth checking but don't block CI
"TRY003", # raise-vanilla-args, avoid multitude of exception classes
"TRY301", # raise-within-try, it's handy
"UP015", # redundant-open-modes, explicit is preferred
Expand Down
2 changes: 1 addition & 1 deletion setuptools/command/easy_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -2187,7 +2187,7 @@ def get_args(cls, dist, header=None):
spec = str(dist.as_requirement())
for type_ in 'console', 'gui':
group = type_ + '_scripts'
for name, ep in dist.get_entry_map(group).items():
for name in dist.get_entry_map(group).keys():
cls._ensure_safe_name(name)
script_text = cls.template % locals()
args = cls._get_script_args(type_, name, header, script_text)
Expand Down
9 changes: 3 additions & 6 deletions setuptools/tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import os
import sys
import urllib.request
from importlib.util import find_spec

import pytest

Expand All @@ -23,12 +24,8 @@
def setup_module(module):
packages = 'stevedore', 'virtualenvwrapper', 'pbr', 'novaclient'
for pkg in packages:
try:
__import__(pkg)
tmpl = "Integration tests cannot run when {pkg} is installed"
pytest.skip(tmpl.format(**locals()))
except ImportError:
pass
if find_spec(pkg) is not None:
pytest.skip(f"Integration tests cannot run when {pkg} is installed")

try:
urllib.request.urlopen('https://pypi.python.org/pypi')
Expand Down
8 changes: 1 addition & 7 deletions setuptools/tests/test_manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -485,14 +485,8 @@ def test_process_template_line_invalid(self):
'prune',
'blarg',
):
try:
with pytest.raises(DistutilsTemplateError):
file_list.process_template_line(action)
except DistutilsTemplateError:
pass
except Exception:
assert False, "Incorrect error thrown"
else:
assert False, "Should have thrown an error"

def test_include(self, caplog):
caplog.set_level(logging.DEBUG)
Expand Down

0 comments on commit 5aed410

Please sign in to comment.