Skip to content

Ruff 0.17.5 lint fixes - #1908

Open
cmdupuis3 wants to merge 12 commits into
pre-commit-ci-update-configfrom
ruff-0.17-lint-fixes
Open

cmdupuis3 wants to merge 12 commits into
pre-commit-ci-update-configfrom
ruff-0.17-lint-fixes

Conversation

@cmdupuis3

@cmdupuis3 cmdupuis3 commented Nov 18, 2026 •

Copy link
Copy Markdown
Collaborator

Closes #1858

Overview

PR Checklist

General

  • An issue is created and linked
  • Added appropriate labels (if your uxarray repo permissions allow it)
  • Filled out Overview and Expected Usage (if applicable) sections

Testing & Benchmarking

  • There is adequate test coverage of changes from this PR (add new tests if needed)

Documentation and Examples

  • Docstrings updated with any function changes, and included in all new functions
  • User (public) functions added to docs/api.rst; internal (private) function names start with an underscore (_)

AI Disclosure

AI Usage: Claude Opus 5.5 for edits and merges

  • I have tested and take responsibility for all AI-generated content in my PR.

@cmdupuis3
cmdupuis3 added this pull request to stack #1909 November 18, 2026 19:52
@review-notebook-app

Copy link
Copy Markdown

Review Notebooks

Notebooks changed:

Review visual diffs and comment on any notebook cell. All comments sync back to this PR.


Powered by ReviewNB

@cmdupuis3 cmdupuis3 added the github_actions Pull requests that update GitHub Actions code label Nov 18, 2026
@cmdupuis3
cmdupuis3 marked this pull request as draft November 18, 2026 20:33
cmdupuis3 and others added 12 commits November 18, 2026 16:52
Use PEP 585/604 builtins and unions (UP006, UP045), make implicit
Optional defaults explicit (RUF013, plus UxDataset.from_xarray's uxgrid,
which ruff does not flag), import ABCs from collections.abc (UP035),
drop quoted annotations (UP037), use the PEP 695 `type` statement for
aliases (UP040), drop redundant `int | float` (PYI041, and likewise
inside the tolerance Iterable, which ruff does not flag), mark the
mutable class default as ClassVar (RUF012), and remove the typing
imports these leave unused (F401).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Rewrite set(<genexpr>)/set([...])/list([...])/dict() as comprehensions or
literals (C401, C403, C405, C408, C411) and use next(iter(...)) instead
of building a list to take its first element (RUF015).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Convert str.format calls to f-strings (UP032) and use !r instead of
repr() inside f-strings (RUF010).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Drop extraneous parentheses (UP034), round() on values that are
already integers (RUF057), and int() around round(), which already
returns an int under numpy>=2 (RUF046).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Collapse nested ifs that have no else branch (SIM102), return boolean
conditions directly (SIM103), iterate dicts instead of .keys() (SIM118),
use min()/max() instead of compare-and-assign (PLR1730), drop a no-op
pass and range(0, n) starts (PIE790, PIE808), and remove a try/except
that only re-raised (TRY203).

The min()/max() rewrites in the numba kernels (bounds, face radii,
node-edge connectivity, _widest) keep the original semantics exactly:
numba lowers min(a, b) to select(b < a, b, a) and max(a, b) to
select(b > a, b, a), the same comparison as the if-statements they
replace, so NaN, signed-zero and inf inputs give bit-identical results.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Replace tuple-unpacking targets that are never read with a bare _
(RUF059), the convention the package already uses for discarded values,
and keep the unpack itself so the shape of each return value stays
visible. The unused n_max_face_nodes in angles.py predates ruff 0.17 but
gets the same treatment, so no _name-style discards are left.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Use `from package import module` instead of import-as aliases (PLR0402),
import MagicMock from unittest.mock unconditionally (UP026; the `mock`
backport is never needed on Python 3.12), use functools.cache (UP033),
and remove F401 noqa markers that docs/* already ignores (RUF100) while
keeping their explanatory comments.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Sort __all__ and __slots__ entries (RUF022, RUF023). docs/conf.py set
__all__ to a tuple of modules to mark imports as used (PLE0604); F401
is already ignored for docs/*, so the line is removed.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
- callable(x) instead of hasattr(x, "__call__") (B004)
- plain attribute assignment instead of setattr with a constant (B010)
- don't shadow the face_nodes argument with the loop variable (B020, PLR1704)
- pass *args before keyword arguments; Python already bound them
  positionally first, so behavior is unchanged (B026)
- np.isnan instead of x != x self-comparisons in the SCRIP dedup (PLR0124)
- don't rebind `self` to the result of the exact-join xr.align check in
  weighted_mean (PLW0642); the call is only there to raise on mismatched
  grid-dimension coordinates, so only the aligned weights is kept. The
  aligned copy of self differs only when weights carries a grid-dimension
  index that self lacks; that index is summed away, and self * weights
  aligns the same way, so the result is unchanged
- drop a useless bare expression in area_calc.ipynb (B018)

Co-Authored-By: Claude Opus 5.5 <[email protected]>
uxarray/__init__.py: importlib.metadata is always available on Python
3.12, so drop the importlib_metadata fallback and catch only
PackageNotFoundError when the package isn't installed.

The remaining `except Exception` blocks are deliberate catch-all
fallbacks (axes extent auto-set, open_dataset engine retry, the IPython
matplotlib backend switch, numba FMA toolchain probes), so they get
`# noqa: BLE001` (and S110 for the try/except/pass) instead of a guessed
narrower exception type.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
The notebook has no shebang and is not meant to be executed directly
(EXE002).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Drop a stray `#` after a raise statement (PLR2044).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
@cmdupuis3
cmdupuis3 force-pushed the ruff-0.17-lint-fixes branch from 3f554d1 to 0bee6c8 Compare November 18, 2026 23:09
@cmdupuis3 cmdupuis3 self-assigned this Nov 18, 2026
@cmdupuis3
cmdupuis3 marked this pull request as ready for review November 18, 2026 23:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

github_actions Pull requests that update GitHub Actions code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Pre-commit bot update requires substantial code updates

1 participant