diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 62df342..78f5083 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,25 +22,25 @@ repos: args: [--markdown-linebreak-ext=md] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.13.3" + rev: "v0.16.10" hooks: - id: ruff args: ["--fix-only", "--target-version=py38"] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 25.9.0 + rev: 26.10.0 hooks: - id: black args: ["--target-version=py38"] - repo: https://github.com/pycqa/isort - rev: 6.1.0 + rev: 9.0.2 hooks: - id: isort args: ["--profile", "black", "--filter-files"] - repo: https://github.com/asottile/pyupgrade - rev: v3.20.0 + rev: v3.21.2 hooks: - id: pyupgrade args: diff --git a/src/rok4/enums.py b/src/rok4/enums.py index 8ca58ba..cc4bd1e 100644 --- a/src/rok4/enums.py +++ b/src/rok4/enums.py @@ -1,4 +1,4 @@ -#! python3 # noqa: E265 +#! python3 # standard lib from enum import Enum diff --git a/src/rok4/raster.py b/src/rok4/raster.py index f6f71fe..d8b3386 100644 --- a/src/rok4/raster.py +++ b/src/rok4/raster.py @@ -253,14 +253,10 @@ def from_list(cls, path: str, srs: str) -> "RasterSet": if bbox == [None, None, None, None]: bbox = list(raster.bbox) else: - if bbox[0] > raster.bbox[0]: - bbox[0] = raster.bbox[0] - if bbox[1] > raster.bbox[1]: - bbox[1] = raster.bbox[1] - if bbox[2] < raster.bbox[2]: - bbox[2] = raster.bbox[2] - if bbox[3] < raster.bbox[3]: - bbox[3] = raster.bbox[3] + bbox[0] = min(bbox[0], raster.bbox[0]) + bbox[1] = min(bbox[1], raster.bbox[1]) + bbox[2] = max(bbox[2], raster.bbox[2]) + bbox[3] = max(bbox[3], raster.bbox[3]) # Inventaire des colors distinctes self.colors.add((raster.bands, raster.format)) diff --git a/src/rok4/storage.py b/src/rok4/storage.py index b00c31f..d2709a2 100644 --- a/src/rok4/storage.py +++ b/src/rok4/storage.py @@ -101,8 +101,7 @@ try: __LRU_TTL = int(os.environ["ROK4_READING_LRU_CACHE_TTL"]) - if __LRU_TTL < 0: - __LRU_TTL = 0 + __LRU_TTL = max(__LRU_TTL, 0) except ValueError: pass except KeyError: diff --git a/tests/test_raster.py b/tests/test_raster.py index af1543e..3c9d173 100644 --- a/tests/test_raster.py +++ b/tests/test_raster.py @@ -340,7 +340,7 @@ def test_ok_at_least_3_files(self, m_from_file, m_copy): assert math.isclose(serial_out["bbox"][i], serial_in["bbox"][i], rel_tol=1e-5) assert len(rasterset.colors) > 0 assert rasterset.colors == colors - for key in serial_in.keys(): + for key in serial_in: if key != "bbox": assert serial_out[key] == serial_in[key] assert isinstance(serial_out["bbox"], list) @@ -419,7 +419,7 @@ def test_simple_ok(self, m_from_parameters, m_get_data_str): for i in range(0, 4, 1): assert math.isclose(rasterset.bbox[i], serial_in["bbox"][i], rel_tol=1e-5) assert math.isclose(serial_out["bbox"][i], serial_in["bbox"][i], rel_tol=1e-5) - for key in serial_in.keys(): + for key in serial_in: if key != "bbox": assert serial_out[key] == serial_in[key]