Skip to content

Commit

Permalink
Enable way more rules and add fixes or noqas
Browse files Browse the repository at this point in the history
  • Loading branch information
Skylion007 committed Jan 15, 2024
1 parent 0a13d4a commit a0d0115
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 27 deletions.
4 changes: 0 additions & 4 deletions fsspec/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@ class BlocksizeMismatchError(ValueError):
written with
"""

...


class FSTimeoutError(asyncio.TimeoutError):
"""
Raised when a fsspec function timed out occurs
"""

...
5 changes: 3 additions & 2 deletions fsspec/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,9 @@ def _emit(self, sig, value=None):
break
except Exception as e:
logger.exception(
"Exception (%s) while executing callback for signal: %s"
"" % (e, sig)
"Exception (%s) while executing callback for signal: %s",
e,
sig,
)

def show(self, threads=False):
Expand Down
8 changes: 2 additions & 6 deletions fsspec/implementations/cache_mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@

import abc
import hashlib
from typing import TYPE_CHECKING

from fsspec.implementations.local import make_path_posix

if TYPE_CHECKING:
from typing import Any


class AbstractCacheMapper(abc.ABC):
"""Abstract super-class for mappers from remote URLs to local cached
Expand All @@ -19,7 +15,7 @@ class AbstractCacheMapper(abc.ABC):
def __call__(self, path: str) -> str:
...

def __eq__(self, other: Any) -> bool:
def __eq__(self, other: object) -> bool:
# Identity only depends on class. When derived classes have attributes
# they will need to be included.
return isinstance(other, type(self))
Expand Down Expand Up @@ -56,7 +52,7 @@ def __call__(self, path: str) -> str:
else:
return prefix # No separator found, simple filename

def __eq__(self, other: Any) -> bool:
def __eq__(self, other: object) -> bool:
return super().__eq__(other) and self.directory_levels == other.directory_levels

def __hash__(self) -> int:
Expand Down
6 changes: 3 additions & 3 deletions fsspec/implementations/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ async def _get_file(
if isfilelike(lpath):
outfile = lpath
else:
outfile = open(lpath, "wb")
outfile = open(lpath, "wb") # noqa: ASYNC101

try:
chunk = True
Expand Down Expand Up @@ -279,7 +279,7 @@ async def gen_chunks():
context = nullcontext(lpath)
use_seek = False # might not support seeking
else:
context = open(lpath, "rb")
context = open(lpath, "rb") # noqa: ASYNC101
use_seek = True

with context as f:
Expand Down Expand Up @@ -801,7 +801,7 @@ async def get_range(session, url, start, end, file=None, **kwargs):
async with r:
out = await r.read()
if file:
with open(file, "r+b") as f:
with open(file, "r+b") as f: # noqa: ASYNC101
f.seek(start)
f.write(out)
else:
Expand Down
2 changes: 1 addition & 1 deletion fsspec/implementations/tests/test_cached.py
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ def test_multi_cache(protocol):
def test_multi_cat(protocol, ftp_writable):
host, port, user, pw = ftp_writable
fs = FTPFileSystem(host, port, user, pw)
for fn in {"/file0", "/file1"}:
for fn in ("/file0", "/file1"):
with fs.open(fn, "wb") as f:
f.write(b"hello")

Expand Down
2 changes: 1 addition & 1 deletion fsspec/implementations/tests/test_dirfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ async def _walk(path, *args, **kwargs):

actual = []
async for entry in adirfs._walk("root", *ARGS, **KWARGS):
actual.append(entry)
actual.append(entry) # noqa: PERF402
assert actual == [("root", ["foo", "bar"], ["baz", "qux"])]
adirfs.fs._walk.assert_called_once_with(f"{PATH}/root", *ARGS, **KWARGS)

Expand Down
2 changes: 1 addition & 1 deletion fsspec/implementations/tests/test_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ async def test_async_walk(server):
# No maxdepth
res = []
async for a in fs._walk(server + "/index"):
res.append(a)
res.append(a) # noqa: PERF402
assert res == [(server + "/index", [], ["realfile"])]

# maxdepth=0
Expand Down
4 changes: 2 additions & 2 deletions fsspec/implementations/tests/test_reference.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ def test_nested_dirs_ls():
refs = {"a": "A", "B/C/b": "B", "B/C/d": "d", "B/_": "_"}
fs = fsspec.filesystem("reference", fo=refs)
assert len(fs.ls("")) == 2
assert set(e["name"] for e in fs.ls("")) == set(["a", "B"])
assert {e["name"] for e in fs.ls("")} == {"a", "B"}
assert len(fs.ls("B")) == 2
assert set(e["name"] for e in fs.ls("B")) == set(["B/C", "B/_"])
assert {e["name"] for e in fs.ls("B")} == {"B/C", "B/_"}


def test_info(server): # noqa: F811
Expand Down
2 changes: 1 addition & 1 deletion fsspec/implementations/tests/test_tar.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_info():
assert lhs == expected

# Iterate over all files.
for f, v in archive_data.items():
for f in archive_data.keys():
lhs = fs.info(f)

# Probe some specific fields of Tar archives.
Expand Down
2 changes: 1 addition & 1 deletion fsspec/implementations/tests/test_zip.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def test_info():
fs = fsspec.filesystem("zip", fo=z)

# Iterate over all files.
for f, v in archive_data.items():
for f in archive_data.keys():
lhs = fs.info(f)

# Probe some specific fields of Zip archives.
Expand Down
6 changes: 2 additions & 4 deletions fsspec/parquet.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,8 @@ def open_parquet_file(
cache_type="parts",
cache_options={
**options,
**{
"data": data.get(fn, {}),
"strict": strict,
},
"data": data.get(fn, {}),
"strict": strict,
},
**kwargs,
)
Expand Down
4 changes: 3 additions & 1 deletion fsspec/spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,9 @@ def to_json(self):
)
return json.dumps(
dict(
**{"cls": cls, "protocol": proto, "args": self.storage_args},
cls=cls,
protocol=proto,
args=self.storage_args,
**self.storage_options,
)
)
Expand Down
1 change: 1 addition & 0 deletions fsspec/tests/test_fuse.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ def test_chmod(mount_local):
["cp", str(mount_dir / "text"), str(mount_dir / "new")],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
check=False,
)

assert cp.stderr == b""
Expand Down
1 change: 1 addition & 0 deletions fsspec/tests/test_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,7 @@ def test_posix_tests_bash_stat(path, expected, glob_files_folder):
f"cd {glob_files_folder} && shopt -s globstar && stat -c %N {bash_path}",
],
capture_output=True,
check=False,
)
# Remove the last element always empty
bash_output = bash_output.stdout.decode("utf-8").replace("'", "").split("\n")[:-1]
Expand Down
30 changes: 30 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,32 @@ exclude = [
"versioneer.py",
"fsspec/_version",
]
select = [
# fix noqas in fsspec/implementations/http.py
"ASYNC",
# "B", enable in later PR
"C4",
"G",
"E4",
"E7",
"E9",
"F",
"PERF",
"PLC",
"PLE",
"PLR1722",
"PLW1510",
"PLW3301",
"PIE800",
"PIE804",
"PIE807",
"PIE810",
# "PT", enable in later PR
"PYI",
"RUF006",
"SLOT",
"SIM101",
]
line-length = 88
ignore = [
# Assigning lambda expression
Expand All @@ -43,6 +69,10 @@ ignore = [
"E203",
# redefs
"F811",
# Fix these codes later
"G004",
"PERF203",
"PERF401",
]

[tool.pytest.ini_options]
Expand Down

0 comments on commit a0d0115

Please sign in to comment.