mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-02-23 10:40:23 +00:00
Merge branch '4014-remove-pylint' into 4015-more-linting
This commit is contained in:
commit
b5dd8def15
2
.gitignore
vendored
2
.gitignore
vendored
@ -53,3 +53,5 @@ zope.interface-*.egg
|
||||
# This is the plaintext of the private environment needed for some CircleCI
|
||||
# operations. It's never supposed to be checked in.
|
||||
secret-env-plain
|
||||
|
||||
.ruff_cache
|
12
.ruff.toml
Normal file
12
.ruff.toml
Normal file
@ -0,0 +1,12 @@
|
||||
select = [
|
||||
# Pyflakes checks
|
||||
"F",
|
||||
# Prohibit tabs:
|
||||
"W191",
|
||||
# No trailing whitespace:
|
||||
"W291",
|
||||
"W293",
|
||||
# Make sure we bind closure variables in a loop (equivalent to pylint
|
||||
# cell-var-from-loop):
|
||||
"B023",
|
||||
]
|
@ -1,5 +1,3 @@
|
||||
from __future__ import print_function
|
||||
|
||||
"""
|
||||
this is a load-generating client program. It does all of its work through a
|
||||
given tahoe node (specified by URL), and performs random reads and writes
|
||||
|
@ -1,44 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os, sys
|
||||
|
||||
from twisted.python import usage
|
||||
|
||||
class Options(usage.Options):
|
||||
optFlags = [
|
||||
("recursive", "r", "Search for .py files recursively"),
|
||||
]
|
||||
def parseArgs(self, *starting_points):
|
||||
self.starting_points = starting_points
|
||||
|
||||
found = [False]
|
||||
|
||||
def check(fn):
|
||||
f = open(fn, "r")
|
||||
for i,line in enumerate(f.readlines()):
|
||||
if line == "\n":
|
||||
continue
|
||||
if line[-1] == "\n":
|
||||
line = line[:-1]
|
||||
if line.rstrip() != line:
|
||||
# the %s:%d:%d: lets emacs' compile-mode jump to those locations
|
||||
print("%s:%d:%d: trailing whitespace" % (fn, i+1, len(line)+1))
|
||||
found[0] = True
|
||||
f.close()
|
||||
|
||||
o = Options()
|
||||
o.parseOptions()
|
||||
if o['recursive']:
|
||||
for starting_point in o.starting_points:
|
||||
for root, dirs, files in os.walk(starting_point):
|
||||
for fn in [f for f in files if f.endswith(".py")]:
|
||||
fn = os.path.join(root, fn)
|
||||
check(fn)
|
||||
else:
|
||||
for fn in o.starting_points:
|
||||
check(fn)
|
||||
if found[0]:
|
||||
sys.exit(1)
|
||||
sys.exit(0)
|
0
newsfragments/4014.minor
Normal file
0
newsfragments/4014.minor
Normal file
@ -6,6 +6,9 @@ develop = update_version develop
|
||||
bdist_egg = update_version bdist_egg
|
||||
bdist_wheel = update_version bdist_wheel
|
||||
|
||||
# This has been replaced by ruff (see .ruff.toml), which has same checks as
|
||||
# flake8 plus many more, and is also faster. However, we're keeping this config
|
||||
# in case people still use flake8 in IDEs, etc..
|
||||
[flake8]
|
||||
# Enforce all pyflakes constraints, and also prohibit tabs for indentation.
|
||||
# Reference:
|
||||
|
3
setup.py
3
setup.py
@ -399,12 +399,11 @@ setup(name="tahoe-lafs", # also set in __init__.py
|
||||
"gpg",
|
||||
],
|
||||
"test": [
|
||||
"flake8",
|
||||
# Pin a specific pyflakes so we don't have different folks
|
||||
# disagreeing on what is or is not a lint issue. We can bump
|
||||
# this version from time to time, but we will do it
|
||||
# intentionally.
|
||||
"pyflakes == 3.0.1",
|
||||
"ruff==0.0.261",
|
||||
"coverage ~= 5.0",
|
||||
"mock",
|
||||
"tox ~= 3.0",
|
||||
|
12
tox.ini
12
tox.ini
@ -99,10 +99,10 @@ commands =
|
||||
|
||||
[testenv:codechecks]
|
||||
basepython = python3
|
||||
skip_install = true
|
||||
deps =
|
||||
# Make sure we get a version of PyLint that respects config, and isn't too
|
||||
# old.
|
||||
pylint < 2.18, >2.14
|
||||
ruff
|
||||
towncrier
|
||||
# On macOS, git inside of towncrier needs $HOME.
|
||||
passenv = HOME
|
||||
setenv =
|
||||
@ -110,13 +110,9 @@ setenv =
|
||||
# entire codebase, including various pieces of supporting code.
|
||||
DEFAULT_FILES=src integration static misc setup.py
|
||||
commands =
|
||||
flake8 {posargs:{env:DEFAULT_FILES}}
|
||||
ruff check {posargs:{env:DEFAULT_FILES}}
|
||||
python misc/coding_tools/check-umids.py {posargs:{env:DEFAULT_FILES}}
|
||||
python misc/coding_tools/check-debugging.py {posargs:{env:DEFAULT_FILES}}
|
||||
python misc/coding_tools/find-trailing-spaces.py -r {posargs:{env:DEFAULT_FILES}}
|
||||
# PyLint has other useful checks, might want to enable them:
|
||||
# http://pylint.pycqa.org/en/latest/technical_reference/features.html
|
||||
pylint --disable=all --enable=cell-var-from-loop {posargs:{env:DEFAULT_FILES}}
|
||||
|
||||
# If towncrier.check fails, you forgot to add a towncrier news
|
||||
# fragment explaining the change in this branch. Create one at
|
||||
|
Loading…
x
Reference in New Issue
Block a user