Merge pull request #739 from jarrodmillman/ruff-format

Ruff format

Author: jarrodmillman

.git-blame-ignore-revs

@@ -1,3 +1,4 @@
+bb473f6ff4a23e4fd5205eacdef713db15decadf
 884e2507e482b1ffb471dfa52ee36be8be6f9e35
 87566f51031ddd54e2f3020bb62d7bf85289e408
 7cb7b365c51ab20d92745e5eefb95690e3ba2e14

.pre-commit-config.yaml

@@ -25,16 +25,6 @@ repos:
         files: \.(md|rst|yml|yaml)
         args: [--prose-wrap=preserve]
 
-  - repo: https://github.com/psf/black
-    rev: 552baf822992936134cbd31a38f69c8cfe7c0f05 # frozen: 24.3.0
-    hooks:
-      - id: black
-
-  - repo: https://github.com/adamchainz/blacken-docs
-    rev: 960ead214cd1184149d366c6d27ca6c369ce46b6 # frozen: 1.16.0
-    hooks:
-      - id: blacken-docs
-
   - repo: https://github.com/MarcoGorelli/cython-lint
     rev: 582556b052c898dc484a981bea48de3284a4b8ee # frozen: v0.16.0
     hooks:
@@ -46,6 +36,7 @@ repos:
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
 
   - repo: https://github.com/codespell-project/codespell
     rev: "6e41aba91fb32e9feb741a6258eefeb9c6e4a482" # frozen: v2.2.6

advanced/debugging/segfault.py

@@ -1,4 +1,4 @@
-""" Simple code that creates a segfault using numpy. Used to learn
+"""Simple code that creates a segfault using numpy. Used to learn
 debugging segfaults with GDB.
 """
 

advanced/debugging/wiener_filtering.py

@@ -1,5 +1,4 @@
-""" Wiener filtering a noisy raccoon face: this module is buggy
-"""
+"""Wiener filtering a noisy raccoon face: this module is buggy"""
 
 import numpy as np
 import scipy as sp

advanced/interfacing_with_c/ctypes/cos_module.py

@@ -1,4 +1,4 @@
-""" Example of wrapping cos function from math.h using ctypes. """
+"""Example of wrapping cos function from math.h using ctypes."""
 
 import ctypes
 

advanced/interfacing_with_c/ctypes_numpy/cos_doubles.py

@@ -1,5 +1,5 @@
-""" Example of wrapping a C library function that accepts a C double array as
-    input using the numpy.ctypeslib. """
+"""Example of wrapping a C library function that accepts a C double array as
+input using the numpy.ctypeslib."""
 
 import numpy as np
 import numpy.ctypeslib as npct

pyximages/numpy_fancy_indexing.py

@@ -1,7 +1,7 @@
 """source code for figure
-   numpy_fancy_indexing.(png/pdf) used in Sect. 1.3.1.7 Fancy indexing
+numpy_fancy_indexing.(png/pdf) used in Sect. 1.3.1.7 Fancy indexing
 
-   Requirement: PyX>=0.14  (pip installable)
+Requirement: PyX>=0.14  (pip installable)
 
 """
 

pyximages/numpy_indexing.py

@@ -1,7 +1,7 @@
 """source code for figure
-   numpy_indexing.(png/pdf) used in Sect. 1.3.1.5 Indexing and slicing
+numpy_indexing.(png/pdf) used in Sect. 1.3.1.5 Indexing and slicing
 
-   Requirement: PyX>=0.14  (pip installable)
+Requirement: PyX>=0.14  (pip installable)
 
 """
 

ruff.toml

@@ -1,7 +1,11 @@
+target-version = "py310"
+
+[lint]
 select = [
     "UP",      # pyupgrade
     "C4",      # flake8-comprehensions
     "E713",    # use 'key not in list'
+    "NPY201",  # NumPy 2 compatibility
     "PIE",     # flake8-pie
     "PGH003",  # forbid blanket 'type: ignore' comments
     "PLR0402", # useless import alias
@@ -12,4 +16,5 @@ select = [
     "SIM2",    # simplify boolean comparisons
 ]
 
-target-version = "py310"
+[format]
+docstring-code-format = true