From b62b04ba8c617718785d72537a1bc59e000ba381 Mon Sep 17 00:00:00 2001 From: snowman2 Date: Fri, 16 Oct 2026 09:43:18 -0500 Subject: [PATCH] LNT: Update pre-commit pins and reformat --- .flake8 | 15 +++------------ .pre-commit-config.yaml | 10 +++++----- rioxarray/__init__.py | 1 + rioxarray/_convention/cf.py | 1 + rioxarray/_convention/zarr.py | 1 + rioxarray/_io.py | 1 + rioxarray/_options.py | 1 + rioxarray/_show_versions.py | 1 + rioxarray/_spatial_utils.py | 1 + rioxarray/crs.py | 1 + rioxarray/enum.py | 1 + rioxarray/raster_array.py | 6 +++--- rioxarray/raster_writer.py | 1 + rioxarray/xarray_plugin.py | 1 + .../test_integration__io_uri_manager.py | 2 +- test/integration/test_integration_rioxarray.py | 14 ++++++++------ .../test_integration_zarr_conventions.py | 1 + test/unit/test_convention_cf.py | 1 + test/unit/test_convention_zarr.py | 1 + 19 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.flake8 b/.flake8 index 3d989018..638515c5 100644 --- a/.flake8 +++ b/.flake8 @@ -1,15 +1,6 @@ [flake8] max_line_length = 88 ignore = - # line too long - let black handle that - E501 - # Unnecessary dict/list/tuple call - rewrite as a literal - C408 - # whitespace before ':' - doesn't work well with black - E203 - # missing whitespace around operator - let black worry about that - E225 - # line break occurred before a binary operator - let black worry about that - W503 - # line break occurred adter a binary operator - let black worry about that - W504 + # code formatting - let black handle that + E + W diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 40431962..337e3090 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,26 +3,26 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v6.0.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/psf/black-pre-commit-mirror - rev: 23.12.1 + rev: 26.10.1 hooks: - id: black - repo: https://github.com/pycqa/isort - rev: 5.13.2 + rev: 9.0.2 hooks: - id: isort args: [rioxarray/, test/, docs/] - repo: https://github.com/asottile/blacken-docs - rev: 1.16.0 + rev: 1.20.0 hooks: - id: blacken-docs args: [--skip-errors] - repo: https://github.com/pycqa/flake8 - rev: 6.1.0 + rev: 7.4.1 hooks: - id: flake8 diff --git a/rioxarray/__init__.py b/rioxarray/__init__.py index 603030aa..e4064649 100644 --- a/rioxarray/__init__.py +++ b/rioxarray/__init__.py @@ -1,4 +1,5 @@ """Top-level package for rioxarray.""" + __author__ = """rioxarray Contributors""" import importlib.metadata diff --git a/rioxarray/_convention/cf.py b/rioxarray/_convention/cf.py index 390e9b81..66621e79 100644 --- a/rioxarray/_convention/cf.py +++ b/rioxarray/_convention/cf.py @@ -4,6 +4,7 @@ This module provides functions for reading and writing geospatial metadata according to the CF conventions: https://github.com/cf-convention/cf-conventions """ + from typing import Optional, Tuple, Union import numpy diff --git a/rioxarray/_convention/zarr.py b/rioxarray/_convention/zarr.py index 91d28e11..4fa0650e 100644 --- a/rioxarray/_convention/zarr.py +++ b/rioxarray/_convention/zarr.py @@ -5,6 +5,7 @@ - Zarr spatial convention: https://github.com/zarr-conventions/spatial - Zarr geo-proj convention: https://github.com/zarr-conventions/geo-proj """ + from typing import Optional, Union import rasterio.crs diff --git a/rioxarray/_io.py b/rioxarray/_io.py index 2ac62f07..14d2bf0c 100644 --- a/rioxarray/_io.py +++ b/rioxarray/_io.py @@ -5,6 +5,7 @@ This file was adopted from: https://github.com/pydata/xarray # noqa Source file: https://github.com/pydata/xarray/blob/1d7bcbdc75b6d556c04e2c7d7a042e4379e15303/xarray/backends/rasterio_.py # noqa """ + # pylint: disable=too-many-lines import contextlib import importlib.metadata diff --git a/rioxarray/_options.py b/rioxarray/_options.py index 95fdb57d..a68b6ad3 100644 --- a/rioxarray/_options.py +++ b/rioxarray/_options.py @@ -6,6 +6,7 @@ This file was adopted from: https://github.com/pydata/xarray # noqa Source file: https://github.com/pydata/xarray/blob/2ab0666c1fcc493b1e0ebc7db14500c427f8804e/xarray/core/options.py # noqa """ + from typing import Any, Optional from rioxarray.enum import Convention diff --git a/rioxarray/_show_versions.py b/rioxarray/_show_versions.py index 5a131648..887454e9 100644 --- a/rioxarray/_show_versions.py +++ b/rioxarray/_show_versions.py @@ -4,6 +4,7 @@ adapted from :func:`sklearn.utils._show_versions` which was adapted from :func:`pandas.show_versions` """ + # pylint: disable=import-outside-toplevel import importlib.metadata import os diff --git a/rioxarray/_spatial_utils.py b/rioxarray/_spatial_utils.py index 197bbb7d..7fb6ceff 100644 --- a/rioxarray/_spatial_utils.py +++ b/rioxarray/_spatial_utils.py @@ -1,6 +1,7 @@ """ Helper functions for determining spatial attributes. """ + import copy import math import warnings diff --git a/rioxarray/crs.py b/rioxarray/crs.py index cb3ba8c9..063b6d74 100644 --- a/rioxarray/crs.py +++ b/rioxarray/crs.py @@ -1,6 +1,7 @@ """ This module contains helper methods for rasterio.crs.CRS. """ + from typing import Any import rasterio diff --git a/rioxarray/enum.py b/rioxarray/enum.py index 3248ab28..ae03626d 100644 --- a/rioxarray/enum.py +++ b/rioxarray/enum.py @@ -1,4 +1,5 @@ """Enums for rioxarray.""" + from enum import Enum diff --git a/rioxarray/raster_array.py b/rioxarray/raster_array.py index 95a4b1c4..966d4510 100644 --- a/rioxarray/raster_array.py +++ b/rioxarray/raster_array.py @@ -60,9 +60,9 @@ def __init__(self, xarray_obj: xarray.DataArray): self._obj: xarray.DataArray # properties self._nodata: Optional[float] = None - self._manager: Optional[ - FileManager - ] = None # https://github.com/vylor/rioxarray/issues/254 + self._manager: Optional[FileManager] = ( + None # https://github.com/vylor/rioxarray/issues/254 + ) def set_nodata( self, input_nodata: Optional[float], *, inplace: bool = True diff --git a/rioxarray/raster_writer.py b/rioxarray/raster_writer.py index bea306c9..ffaf47ab 100644 --- a/rioxarray/raster_writer.py +++ b/rioxarray/raster_writer.py @@ -8,6 +8,7 @@ - https://github.com/dymaxionlabs/dask-rasterio/blob/8dd7fdece7ad094a41908c0ae6b4fe6ca49cf5e1/dask_rasterio/write.py # noqa: E501 """ + import numpy import rasterio import xarray diff --git a/rioxarray/xarray_plugin.py b/rioxarray/xarray_plugin.py index aedb9fef..a817ae0f 100644 --- a/rioxarray/xarray_plugin.py +++ b/rioxarray/xarray_plugin.py @@ -2,6 +2,7 @@ This module allows for open_rasterio to be used with the xarray open methods through a backend entrypoint. """ + # pylint: disable=arguments-differ import os.path diff --git a/test/integration/test_integration__io_uri_manager.py b/test/integration/test_integration__io_uri_manager.py index e3251ae7..fca46323 100644 --- a/test/integration/test_integration__io_uri_manager.py +++ b/test/integration/test_integration__io_uri_manager.py @@ -1,6 +1,7 @@ """ Tests based on: https://github.com/pydata/xarray/blob/071da2a900702d65c47d265192bc7e424bb57932/xarray/tests/test_backends_file_manager.py """ + import concurrent.futures import gc import pickle @@ -32,7 +33,6 @@ def test_uri_manager_mock_write__threaded(): manager = URIManager(opener, "filename") def write(iter): - nonlocal manager fh = manager.acquire() fh.write("contents") manager._local.thread_manager = None diff --git a/test/integration/test_integration_rioxarray.py b/test/integration/test_integration_rioxarray.py index c3d54ac4..a065f1eb 100644 --- a/test/integration/test_integration_rioxarray.py +++ b/test/integration/test_integration_rioxarray.py @@ -3367,9 +3367,10 @@ def test_non_rectilinear__reproject(rename, open_rasterio): def test_to_rasterio_dataset(): in_rpc_path = os.path.join(TEST_INPUT_DATA_DIR, "cog.tif") in_rpc = rioxarray.open_rasterio(in_rpc_path) - with in_rpc.rio.to_rasterio_dataset() as riox_ds, rasterio.open( - in_rpc_path - ) as rio_ds: + with ( + in_rpc.rio.to_rasterio_dataset() as riox_ds, + rasterio.open(in_rpc_path) as rio_ds, + ): # object type assert isinstance(riox_ds, DatasetReader), "Error in object type" @@ -3395,9 +3396,10 @@ def test_to_rasterio_dataset(): def test_to_rasterio_dataset_rpcs(): in_rpc_path = os.path.join(TEST_INPUT_DATA_DIR, "test_rpcs.tif") in_rpc = rioxarray.open_rasterio(in_rpc_path) - with in_rpc.rio.to_rasterio_dataset() as riox_ds, rasterio.open( - in_rpc_path - ) as rio_ds: + with ( + in_rpc.rio.to_rasterio_dataset() as riox_ds, + rasterio.open(in_rpc_path) as rio_ds, + ): # object type assert isinstance(riox_ds, DatasetReader), "Error in object type" diff --git a/test/integration/test_integration_zarr_conventions.py b/test/integration/test_integration_zarr_conventions.py index 292d34b0..d1fc67ac 100644 --- a/test/integration/test_integration_zarr_conventions.py +++ b/test/integration/test_integration_zarr_conventions.py @@ -1,4 +1,5 @@ """Integration tests for reading Zarr conventions.""" + import numpy as np import pyproj import xarray as xr diff --git a/test/unit/test_convention_cf.py b/test/unit/test_convention_cf.py index 18f32818..f1fc1092 100644 --- a/test/unit/test_convention_cf.py +++ b/test/unit/test_convention_cf.py @@ -1,4 +1,5 @@ """Unit tests for the CF convention module.""" + import numpy import xarray from affine import Affine diff --git a/test/unit/test_convention_zarr.py b/test/unit/test_convention_zarr.py index ba938c4b..148ef672 100644 --- a/test/unit/test_convention_zarr.py +++ b/test/unit/test_convention_zarr.py @@ -1,4 +1,5 @@ """Unit tests for the Zarr convention module.""" + import numpy as np import xarray as xr from affine import Affine