Merge branch 'main' into functions

.pre-commit-config.yaml

@@ -5,6 +5,13 @@ repos:
     hooks:
       - id: ruff
         args: ["--fix"]
+      # Run the formatter.
+      - id: ruff-format
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.13.2
+    hooks:
+      - id: isort
+        exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|extern.*)$"
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:

.ruff.toml

@@ -20,20 +20,20 @@ extend-ignore = [
   "PT023", # Always use () on pytest decorators
 ]
 
-[flake8-tidy-imports]
-[flake8-tidy-imports.banned-api]
+[lint.flake8-tidy-imports]
+[lint.flake8-tidy-imports.banned-api]
 "warnings.warn".msg = "Use sunpy specific warning helpers warn_* from sunpy.utils.exceptions"
 
-[per-file-ignores]
+[lint.per-file-ignores]
 # Part of configuration, not a package.
 "setup.py" = ["INP001"]
 "conftest.py" = ["INP001"]
 # Implicit-namespace-package. The examples are not a package.
-"docs/*.py" = ["INP001"]
+"docs/*.py" = ["INP001", "E402"]
 "__init__.py" = ["E402", "F401", "F403"]
 "test_*.py" = ["B011", "D", "E402", "PGH001", "S101"]
 # Need to import clients to register them, but don't use them in file
 "CHIMERApy/net/__init__.py" = ["F811"]
 
-[pydocstyle]
+[lint.pydocstyle]
 convention = "numpy"