Ruff linter

.pre-commit-config.yaml

@@ -19,40 +19,13 @@ repos:
               pytensor/tensor/variable\.py|
           )$
       - id: check-merge-conflict
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.11
     hooks:
-      - id: pyupgrade
-        args: [--py39-plus]
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
-    hooks:
-      - id: black
-        language_version: python3
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - flake8-comprehensions
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-  - repo: https://github.com/humitos/mirrors-autoflake.git
-    rev: v1.1
-    hooks:
-      - id: autoflake
-        exclude: |
-          (?x)^(
-              .*/?__init__\.py|
-              pytensor/graph/toolbox\.py|
-              pytensor/link/jax/jax_dispatch\.py|
-              pytensor/link/jax/jax_linker\.py|
-              pytensor/scalar/basic_scipy\.py|
-              pytensor/tensor/linalg\.py
-          )$
-        args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
+      - id: ruff
+        args: ["--fix", "--show-source"]
+      - id: ruff-format
+        args: ["--line-length=88"]
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.0.0
     hooks:

bin/__init__.py

@@ -1,5 +1,6 @@
 import warnings
 
+
 warnings.warn(
     message= "Importing 'bin.pytensor_cache' is deprecated. Import from "
     "'pytensor.bin.pytensor_cache' instead.",

environment.yml

@@ -39,12 +39,7 @@ dependencies:
   - pydot
   - ipython
   # code style
-  - black
-  - isort
-  # For linting
-  - flake8
-  - pep8
-  - pyflakes
+  - ruff
   # developer tools
   - pre-commit
   - packaging

pyproject.toml

@@ -1,24 +1,20 @@
 [build-system]
 requires = [
-  "setuptools>=48.0.0",
-  "cython",
-  "numpy>=1.17.0",
-  "versioneer[toml]==0.28",
+    "setuptools>=48.0.0",
+    "cython",
+    "numpy>=1.17.0",
+    "versioneer[toml]==0.28",
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytensor"
-dynamic = [
-  'version'
-]
+dynamic = ['version']
 requires-python = ">=3.9,<3.12"
-authors = [
-    {name = "pymc-devs", email = "[email protected]"}
-]
+authors = [{ name = "pymc-devs", email = "[email protected]" }]
 description = "Optimizing compiler for evaluating mathematical expressions on CPUs and GPUs."
 readme = "README.rst"
-license = {file = "LICENSE.txt"}
+license = { file = "LICENSE.txt" }
 classifiers = [
     "Development Status :: 6 - Mature",
     "Intended Audience :: Education",
@@ -71,15 +67,8 @@ documentation = "https://pytensor.readthedocs.io/en/latest/"
 pytensor-cache = "pytensor.bin.pytensor_cache:main"
 
 [project.optional-dependencies]
-complete = [
-    "pytensor[jax]",
-    "pytensor[numba]",
-]
-development = [
-    "pytensor[complete]",
-    "pytensor[tests]",
-    "pytensor[rtd]"
-]
+complete = ["pytensor[jax]", "pytensor[numba]"]
+development = ["pytensor[complete]", "pytensor[tests]", "pytensor[rtd]"]
 tests = [
     "pytest",
     "pre-commit",
@@ -88,34 +77,16 @@ tests = [
     "pytest-benchmark",
     "pytest-mock",
 ]
-rtd = [
-    "sphinx>=5.1.0,<6",
-    "pygments",
-    "pydot",
-    "pydot2",
-    "pydot-ng",
-]
-jax = [
-    "jax",
-    "jaxlib",
-]
-numba = [
-    "numba>=0.55",
-    "numba-scipy>=0.3.0"
-]
+rtd = ["sphinx>=5.1.0,<6", "pygments", "pydot", "pydot2", "pydot-ng"]
+jax = ["jax", "jaxlib"]
+numba = ["numba>=0.55", "numba-scipy>=0.3.0"]
 
 [tool.setuptools.packages.find]
 include = ["pytensor*", "bin"]
 
 [tool.setuptools.package-data]
-pytensor = [
-    "py.typed"
-]
-"pytensor.d3viz" = [
-    "html/*",
-    "css/*",
-    "js/*",
-]
+pytensor = ["py.typed"]
+"pytensor.d3viz" = ["html/*", "css/*", "js/*"]
 
 [tool.coverage.run]
 omit = [
@@ -136,14 +107,8 @@ branch = true
 relative_files = true
 
 [tool.coverage.report]
-omit = [
-    "pytensor/_version.py",
-    "tests/",
-]
-exclude_lines = [
-    "pragma: no cover",
-    "if TYPE_CHECKING:",
-]
+omit = ["pytensor/_version.py", "tests/"]
+exclude_lines = ["pragma: no cover", "if TYPE_CHECKING:"]
 show_missing = true
 
 [tool.versioneer]
@@ -163,41 +128,36 @@ max-line-length = 88
 [tool.pylint.messages_control]
 disable = ["C0330", "C0326"]
 
-[tool.isort]
-profile = "black"
-lines_after_imports = 2
-lines_between_sections = 1
-honor_noqa = true
-skip_gitignore = true
-skip = "pytensor/version.py"
-skip_glob = "**/*.pyx"
 
 [tool.ruff]
-select=["C","E","F","W"]
-ignore=["E501","E741","C408","C901"]
-exclude = [
-    "doc/",
-    "pytensor/_version.py",
-    "bin/pytensor_cache.py",
-]
+select = ["C", "E", "F", "I", "W"]
+ignore = ["E501", "E741", "C408", "C901"]
+exclude = ["doc/", "pytensor/_version.py", "bin/pytensor_cache.py"]
+
+
+[tool.ruff.isort]
+lines-after-imports = 2
 
 [tool.ruff.per-file-ignores]
 # TODO: Get rid of these:
-    "**/__init__.py"=["F401","E402","F403"]
-    "pytensor/tensor/linalg.py"=["F401","F403"]
-    "pytensor/scalar/basic_scipy.py"=["E402","F403","F401"]
-    "pytensor/graph/toolbox.py"=["E402","F403","F401"]
-    "pytensor/link/jax/jax_dispatch.py"=["E402","F403","F401"]
-    "pytensor/link/jax/jax_linker.py"=["E402","F403","F401"]
-    "pytensor/sparse/sandbox/sp2.py"=["F401"]
-    "tests/tensor/test_math_scipy.py"=["E402"]
-    "tests/sparse/test_basic.py"=["E402"]
-    "tests/sparse/test_opt.py"=["E402"]
-    "tests/sparse/test_sp2.py"=["E402"]
-    "tests/sparse/test_utils.py"=["E402","F401"]
-    "tests/sparse/sandbox/test_sp.py"=["E402","F401"]
-    "tests/scalar/test_basic_sympy.py"=["E402"]
-    "pytensor/graph/rewriting/unify.py"=["F811"]
+"**/__init__.py" = ["F401", "E402", "F403"]
+"pytensor/tensor/linalg.py" = ["F401", "F403"]
+"pytensor/scalar/basic_scipy.py" = ["E402"]
+"pytensor/graph/toolbox.py" = ["E402"]
+# For the tests we skip because `pytest.importorskip` is used:
+"tests/link/jax/test_scalar.py" = ["E402"]
+"tests/link/jax/test_tensor_basic.py" = ["E402"]
+"tests/link/numba/test_basic.py" = ["E402"]
+"tests/link/numba/test_cython_support.py" = ["E402"]
+"tests/link/numba/test_performance.py" = ["E402"]
+"tests/link/numba/test_sparse.py" = ["E402"]
+"tests/link/numba/test_tensor_basic.py" = ["E402"]
+"tests/tensor/test_math_scipy.py" = ["E402"]
+"tests/sparse/test_basic.py" = ["E402"]
+"tests/sparse/test_sp2.py" = ["E402"]
+"tests/sparse/test_utils.py" = ["E402"]
+"tests/sparse/sandbox/test_sp.py" = ["E402", "F401"]
+"versioneer.py" = ["I"]
 
 
 [tool.mypy]

pytensor/compile/debugmode.py

@@ -1866,7 +1866,7 @@ def thunk():
                 # Nothing should be in storage map after evaluating
                 # each the thunk (specifically the last one)
                 for r, s in storage_map.items():
-                    assert type(s) is list
+                    assert isinstance(s, list)
                     assert s[0] is None
 
                 # store our output variables to their respective storage lists

pytensor/graph/basic.py

@@ -62,6 +62,7 @@ class Node(MetaObject):
     keeps track of its parents via `Variable.owner` / `Apply.inputs`.
 
     """
+
     name: Optional[str]
 
     def get_parents(self):

pytensor/graph/destroyhandler.py

@@ -366,9 +366,7 @@ def on_attach(self, fgraph):
             OrderedSet()
         )  # set of Apply instances with non-null destroy_map
         self.view_i = {}  # variable -> variable used in calculation
-        self.view_o = (
-            {}
-        )  # variable -> set of variables that use this one as a direct input
+        self.view_o = {}  # variable -> set of variables that use this one as a direct input
         # clients: how many times does an apply use a given variable
         self.clients = OrderedDict()  # variable -> apply -> ninputs
         self.stale_droot = True

pytensor/graph/fg.py

@@ -6,14 +6,17 @@
 
 import pytensor
 from pytensor.configdefaults import config
-from pytensor.graph.basic import Apply, AtomicVariable, Variable, applys_between
-from pytensor.graph.basic import as_string as graph_as_string
 from pytensor.graph.basic import (
+    Apply,
+    AtomicVariable,
+    Variable,
+    applys_between,
     clone_get_equiv,
     graph_inputs,
     io_toposort,
     vars_between,
 )
+from pytensor.graph.basic import as_string as graph_as_string
 from pytensor.graph.features import AlreadyThere, Feature, ReplaceValidate
 from pytensor.graph.utils import MetaObject, MissingInputError, TestValueError
 from pytensor.misc.ordered_set import OrderedSet

pytensor/graph/rewriting/basic.py

@@ -10,9 +10,8 @@
 import traceback
 import warnings
 from collections import UserList, defaultdict, deque
-from collections.abc import Iterable
+from collections.abc import Iterable, Sequence
 from collections.abc import Iterable as IterableType
-from collections.abc import Sequence
 from functools import _compose_mro, partial, reduce  # type: ignore
 from itertools import chain
 from typing import TYPE_CHECKING, Callable, Literal, Optional, Union, cast

pytensor/link/c/basic.py

@@ -120,9 +120,7 @@ def failure_code(sub, use_goto=True):
                 "Unexpected error in an Op's C code. "
                 "No Python exception was set.");
         }
-        %(goto_statement)s}""" % dict(
-        sub, goto_statement=goto_statement
-    )
+        %(goto_statement)s}""" % dict(sub, goto_statement=goto_statement)
 
 
 def failure_code_init(sub):
@@ -384,8 +382,7 @@ def get_c_init(fgraph, r, name, sub):
         """
     py_%(name)s = Py_None;
     {Py_XINCREF(py_%(name)s);}
-    """
-        % locals()
+    """ % locals()
     )
     return pre + r.type.c_init(name, sub)
 
@@ -420,13 +417,10 @@ def get_c_extract(fgraph, r, name, sub):
     else:
         c_extract = r.type.c_extract(name, sub, False)
 
-    pre = (
-        """
+    pre = """
     py_%(name)s = PyList_GET_ITEM(storage_%(name)s, 0);
     {Py_XINCREF(py_%(name)s);}
-    """
-        % locals()
-    )
+    """ % locals()
     return pre + c_extract
 
 
@@ -452,13 +446,10 @@ def get_c_extract_out(fgraph, r, name, sub):
     else:
         c_extract = r.type.c_extract_out(name, sub, check_input, check_broadcast=False)
 
-    pre = (
-        """
+    pre = """
     py_%(name)s = PyList_GET_ITEM(storage_%(name)s, 0);
     {Py_XINCREF(py_%(name)s);}
-    """
-        % locals()
-    )
+    """ % locals()
     return pre + c_extract
 
 
@@ -467,12 +458,9 @@ def get_c_cleanup(fgraph, r, name, sub):
     Wrapper around c_cleanup that decrefs py_name.
 
     """
-    post = (
-        """
+    post = """
     {Py_XDECREF(py_%(name)s);}
-    """
-        % locals()
-    )
+    """ % locals()
     return r.type.c_cleanup(name, sub) + post
 
 
@@ -489,9 +477,7 @@ def get_c_sync(fgraph, r, name, sub):
       PyList_SET_ITEM(storage_%(name)s, 0, py_%(name)s);
       {Py_XDECREF(old);}
     }
-    """ % dict(
-        sync=r.type.c_sync(name, sub), name=name, **sub
-    )
+    """ % dict(sync=r.type.c_sync(name, sub), name=name, **sub)
 
 
 def apply_policy(fgraph, policy, r, name, sub):
@@ -1595,9 +1581,7 @@ def get_dynamic_module(self):
             {struct_name} *self = ({struct_name} *)PyCapsule_GetContext(capsule);
             delete self;
         }}
-    """.format(
-                struct_name=self.struct_name
-            )
+    """.format(struct_name=self.struct_name)
 
             # We add all the support code, compile args, headers and libs we need.
             for support_code in self.support_code() + self.c_support_code_apply:

pytensor/link/c/cmodule.py

@@ -56,7 +56,7 @@ class StdLibDirsAndLibsType(Protocol):
 
 
 def is_StdLibDirsAndLibsType(
-    fn: Callable[[], Optional[tuple[list[str], ...]]]
+    fn: Callable[[], Optional[tuple[list[str], ...]]],
 ) -> StdLibDirsAndLibsType:
     return cast(StdLibDirsAndLibsType, fn)