Replace flake8+isort with ruff

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip wheel 'setuptools!=58.5.*,<60'
-        pip install flake8 black isort>=5.0 mypy nbstripout nbformat
+        pip install ruff black mypy nbstripout nbformat
     - name: Lint
       run: |
         make lint

Makefile

@@ -18,18 +18,17 @@ tutorial: FORCE
 	$(MAKE) -C tutorial html
 
 lint: FORCE
-	flake8
+	ruff check .
 	black --check *.py pyro examples tests scripts profiler
-	isort --check .
 	python scripts/update_headers.py --check
 	mypy --install-types --non-interactive pyro scripts
 
 license: FORCE
 	python scripts/update_headers.py
 
 format: license FORCE
+	ruff check --fix .
 	black *.py pyro examples tests scripts profiler
-	isort .
 
 version: FORCE
 	python scripts/update_version.py

pyproject.toml

@@ -0,0 +1,4 @@
+[tool.ruff]
+line-length = 120
+ignore = ["E741", "E721"]
+select = ["E", "F", "I"]

pyro/contrib/funsor/__init__.py

@@ -3,9 +3,8 @@
 
 import pyroapi
 
-from pyro.contrib.funsor.handlers import condition, do, markov
+from pyro.contrib.funsor.handlers import condition, do, markov, vectorized_markov
 from pyro.contrib.funsor.handlers import plate as _plate
-from pyro.contrib.funsor.handlers import vectorized_markov
 from pyro.contrib.funsor.handlers.primitives import to_data, to_funsor
 from pyro.primitives import (
     clear_param_store,

pyro/distributions/constraints.py

@@ -6,14 +6,14 @@
 # isort: split
 
 import torch
-from torch.distributions.constraints import Constraint
-from torch.distributions.constraints import __all__ as torch_constraints
 from torch.distributions.constraints import (
+    Constraint,
     independent,
     lower_cholesky,
     positive,
     positive_definite,
 )
+from torch.distributions.constraints import __all__ as torch_constraints
 
 
 # TODO move this upstream to torch.distributions

pyro/poutine/messenger.py

@@ -85,7 +85,7 @@ def __enter__(self):
         Derived versions cannot be overridden to take arguments
         and must always return self.
         """
-        if not (self in _PYRO_STACK):
+        if self not in _PYRO_STACK:
             # if this poutine is not already installed,
             # put it on the bottom of the stack.
             _PYRO_STACK.append(self)

setup.py

@@ -110,27 +110,26 @@
         "test": EXTRAS_REQUIRE
         + [
             "black>=21.4b0",
-            "flake8",
             "nbval",
-            "pytest>=5.0",
             "pytest-cov",
+            "pytest>=5.0",
+            "ruff",
             "scipy>=1.1",
         ],
         "profile": ["prettytable", "pytest-benchmark", "snakeviz"],
         "dev": EXTRAS_REQUIRE
         + [
             "black>=21.4b0",
-            "flake8",
-            "isort>=5.0",
             "mypy>=0.812",
             "nbformat",
             "nbsphinx>=0.3.2",
             "nbstripout",
             "nbval",
             "ninja",
             "pypandoc",
-            "pytest>=5.0",
             "pytest-xdist",
+            "pytest>=5.0",
+            "ruff",
             "scipy>=1.1",
             "sphinx",
             "sphinx_rtd_theme",