Skip to content

Commit bce5ce4

Browse files
Aplpy ruff rules (RUF) (#9731)
* Apply ruff rule RUF010 RUF010 Use explicit conversion flag * Apply ruff rule RUF013 RUF013 PEP 484 prohibits implicit `Optional` * Apply ruff rule RUF022 RUF022 `__all__` is not sorted * Apply ruff rule RUF023 RUF023 `__slots__` is not sorted * Apply ruff rule RUF100 RUF100 Unused blanket `noqa` directive
1 parent 55ec436 commit bce5ce4

37 files changed

+118
-115
lines changed

asv_bench/benchmarks/dataset_io.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ class PerformanceBackend(xr.backends.BackendEntrypoint):
722722
def open_dataset(
723723
self,
724724
filename_or_obj: str | os.PathLike | None,
725-
drop_variables: tuple[str, ...] = None,
725+
drop_variables: tuple[str, ...] | None = None,
726726
*,
727727
mask_and_scale=True,
728728
decode_times=True,

ci/min_deps_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def process_pkg(
186186
)
187187

188188

189-
def fmt_version(major: int, minor: int, patch: int = None) -> str:
189+
def fmt_version(major: int, minor: int, patch: int | None = None) -> str:
190190
if patch is None:
191191
return f"{major}.{minor}"
192192
else:

pyproject.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,12 @@ ignore = [
245245
"E501",
246246
"E731",
247247
"UP007",
248+
"RUF001",
249+
"RUF002",
250+
"RUF003",
251+
"RUF005",
252+
"RUF007",
253+
"RUF012",
248254
]
249255
extend-select = [
250256
"B", # flake8-bugbear
@@ -254,6 +260,7 @@ extend-select = [
254260
"TID", # flake8-tidy-imports (absolute imports)
255261
"I", # isort
256262
"PGH", # pygrep-hooks
263+
"RUF",
257264
"UP", # Pyupgrade
258265
]
259266

xarray/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@
7878
"combine_by_coords",
7979
"combine_nested",
8080
"concat",
81+
"corr",
82+
"cov",
83+
"cross",
8184
"date_range",
8285
"date_range_like",
8386
"decode_cf",
8487
"dot",
85-
"cov",
86-
"corr",
87-
"cross",
8888
"full_like",
8989
"get_options",
9090
"group_subtrees",
@@ -121,8 +121,8 @@
121121
"Index",
122122
"IndexSelResult",
123123
"IndexVariable",
124-
"Variable",
125124
"NamedArray",
125+
"Variable",
126126
# Exceptions
127127
"InvalidTreeError",
128128
"MergeError",

xarray/backends/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323
"AbstractDataStore",
2424
"BackendArray",
2525
"BackendEntrypoint",
26-
"FileManager",
2726
"CachingFileManager",
2827
"DummyFileManager",
29-
"InMemoryDataStore",
30-
"NetCDF4DataStore",
31-
"PydapDataStore",
32-
"ScipyDataStore",
28+
"FileManager",
3329
"H5NetCDFStore",
34-
"ZarrStore",
3530
"H5netcdfBackendEntrypoint",
31+
"InMemoryDataStore",
3632
"NetCDF4BackendEntrypoint",
33+
"NetCDF4DataStore",
3734
"PydapBackendEntrypoint",
35+
"PydapDataStore",
3836
"ScipyBackendEntrypoint",
37+
"ScipyDataStore",
3938
"StoreBackendEntrypoint",
4039
"ZarrBackendEntrypoint",
40+
"ZarrStore",
4141
"list_engines",
4242
"refresh_engines",
4343
]

xarray/backends/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def __exit__(self, exception_type, exception_value, traceback):
276276

277277

278278
class ArrayWriter:
279-
__slots__ = ("sources", "targets", "regions", "lock")
279+
__slots__ = ("lock", "regions", "sources", "targets")
280280

281281
def __init__(self, lock=None):
282282
self.sources = []

xarray/backends/h5netcdf_.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ class H5NetCDFStore(WritableCFDataStore):
100100
"""Store for reading and writing data via h5netcdf"""
101101

102102
__slots__ = (
103-
"autoclose",
104-
"format",
105-
"is_remote",
106-
"lock",
107103
"_filename",
108104
"_group",
109105
"_manager",
110106
"_mode",
107+
"autoclose",
108+
"format",
109+
"is_remote",
110+
"lock",
111111
)
112112

113113
def __init__(self, manager, group=None, mode=None, lock=HDF5_LOCK, autoclose=False):

xarray/backends/locks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def _get_scheduler(get=None, collection=None) -> str | None:
149149
# Fix for bug caused by dask installation that doesn't involve the toolz library
150150
# Issue: 4164
151151
import dask
152-
from dask.base import get_scheduler # noqa: F401
152+
from dask.base import get_scheduler
153153

154154
actual_get = get_scheduler(get, collection)
155155
except ImportError:

xarray/backends/netCDF4_.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,14 +361,14 @@ class NetCDF4DataStore(WritableCFDataStore):
361361
"""
362362

363363
__slots__ = (
364-
"autoclose",
365-
"format",
366-
"is_remote",
367-
"lock",
368364
"_filename",
369365
"_group",
370366
"_manager",
371367
"_mode",
368+
"autoclose",
369+
"format",
370+
"is_remote",
371+
"lock",
372372
)
373373

374374
def __init__(

xarray/backends/zarr.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def encode_zarr_attr_value(value):
182182

183183

184184
class ZarrArrayWrapper(BackendArray):
185-
__slots__ = ("dtype", "shape", "_array")
185+
__slots__ = ("_array", "dtype", "shape")
186186

187187
def __init__(self, zarr_array):
188188
# some callers attempt to evaluate an array if an `array` property exists on the object.
@@ -598,18 +598,18 @@ class ZarrStore(AbstractWritableDataStore):
598598
"""Store for reading and writing data via zarr"""
599599

600600
__slots__ = (
601-
"zarr_group",
602601
"_append_dim",
602+
"_close_store_on_close",
603603
"_consolidate_on_close",
604604
"_group",
605605
"_mode",
606606
"_read_only",
607-
"_synchronizer",
608-
"_write_region",
609607
"_safe_chunks",
610-
"_write_empty",
611-
"_close_store_on_close",
608+
"_synchronizer",
612609
"_use_zarr_fill_value_as_mask",
610+
"_write_empty",
611+
"_write_region",
612+
"zarr_group",
613613
)
614614

615615
@classmethod

0 commit comments

Comments
 (0)