🎨 Update isort config

docs/conf.py

@@ -6,6 +6,7 @@
 import pathlib
 import re
 import subprocess
+
 import zuko
 
 ## Project

docs/tutorials/basics.ipynb

@@ -23,6 +23,7 @@
    "outputs": [],
    "source": [
     "import torch\n",
+    "\n",
     "import zuko\n",
     "\n",
     "_ = torch.random.manual_seed(0)"

docs/tutorials/forward_kl.ipynb

@@ -18,6 +18,7 @@
     "import matplotlib.pyplot as plt\n",
     "import torch\n",
     "import torch.utils.data as data\n",
+    "\n",
     "import zuko\n",
     "\n",
     "_ = torch.random.manual_seed(0)"

docs/tutorials/reverse_kl.ipynb

@@ -17,6 +17,7 @@
    "source": [
     "import matplotlib.pyplot as plt\n",
     "import torch\n",
+    "\n",
     "import zuko\n",
     "\n",
     "_ = torch.random.manual_seed(0)"

docs/tutorials/vae.ipynb

@@ -18,14 +18,15 @@
     "import torch\n",
     "import torch.nn as nn\n",
     "import torch.utils.data as data\n",
-    "import zuko\n",
     "\n",
     "from torch import Tensor\n",
     "from torch.distributions import Bernoulli, Distribution, Independent, Normal\n",
     "from torchvision.datasets import MNIST\n",
     "from torchvision.transforms.functional import to_pil_image, to_tensor\n",
     "from tqdm import tqdm\n",
     "\n",
+    "import zuko\n",
+    "\n",
     "_ = torch.random.manual_seed(0)"
    ]
   },

pyproject.toml

@@ -56,8 +56,8 @@ preview = true
 
 [tool.ruff.lint.isort]
 lines-between-types = 1
-no-sections = true
 relative-imports-order = "closest-to-furthest"
+section-order = ["future", "third-party", "first-party", "local-folder"]
 
 [tool.ruff.format]
 preview = true

tests/test_distributions.py

@@ -3,6 +3,7 @@
 import torch
 
 from torch.distributions import *
+
 from zuko.distributions import *
 
 

tests/test_flows.py

@@ -6,6 +6,7 @@
 from functools import partial
 from pathlib import Path
 from torch import randn
+
 from zuko.flows import *
 
 

tests/test_mixtures.py

@@ -5,6 +5,7 @@
 
 from pathlib import Path
 from torch import randn
+
 from zuko.mixtures import *
 
 

tests/test_nn.py

@@ -5,6 +5,7 @@
 import torch.nn as nn
 
 from torch import randn
+
 from zuko.nn import *
 
 

tests/test_transforms.py

@@ -5,6 +5,7 @@
 
 from torch import randn
 from torch.distributions import *
+
 from zuko.transforms import *
 
 

tests/test_utils.py

@@ -4,6 +4,7 @@
 import torch
 
 from torch import randn
+
 from zuko.utils import *
 
 

zuko/conftest.py

@@ -2,6 +2,7 @@
 
 import pytest
 import torch
+
 import zuko
 
 

zuko/flows/autoregressive.py

@@ -13,7 +13,6 @@
 from torch.distributions import Transform
 from typing import Callable, Sequence
 
-# isort: split
 from .gaussianization import ElementWiseTransform
 from ..distributions import DiagNormal
 from ..lazy import Flow, LazyTransform, UnconditionalDistribution

zuko/flows/continuous.py

@@ -13,7 +13,6 @@
 from torch import Tensor
 from torch.distributions import Transform
 
-# isort: split
 from ..distributions import DiagNormal
 from ..lazy import Flow, LazyTransform, UnconditionalDistribution
 from ..nn import MLP

zuko/flows/core.py

@@ -9,7 +9,6 @@
     "Flow",
 ]
 
-# isort: split
 from ..lazy import (  # noqa: F401
     Flow,
     LazyComposedTransform,

zuko/flows/coupling.py

@@ -13,7 +13,6 @@
 from torch.distributions import Transform
 from typing import Callable, Sequence
 
-# isort: split
 from .gaussianization import ElementWiseTransform
 from ..distributions import DiagNormal
 from ..lazy import Flow, LazyTransform, UnconditionalDistribution

zuko/flows/gaussianization.py

@@ -13,7 +13,6 @@
 from torch.distributions import Transform
 from typing import Callable, Sequence
 
-# isort: split
 from ..distributions import DiagNormal
 from ..lazy import Flow, LazyTransform, UnconditionalDistribution, UnconditionalTransform
 from ..nn import MLP

zuko/flows/mixture.py

@@ -9,5 +9,4 @@
     "GMM",
 ]
 
-# isort: split
 from ..mixtures import GMM

zuko/flows/neural.py

@@ -15,7 +15,6 @@
 from torch.distributions import Transform
 from typing import Any, Dict
 
-# isort: split
 from .autoregressive import MaskedAutoregressiveTransform
 from ..distributions import DiagNormal
 from ..lazy import Flow, UnconditionalDistribution, UnconditionalTransform

zuko/flows/polynomial.py

@@ -5,8 +5,6 @@
     "SOSPF",
 ]
 
-
-# isort: split
 from .autoregressive import MAF
 from ..lazy import UnconditionalTransform
 from ..transforms import BoundedBernsteinTransform, SoftclipTransform, SOSPolynomialTransform

zuko/flows/spline.py

@@ -10,7 +10,6 @@
 from math import pi
 from torch.distributions import Transform
 
-# isort: split
 from .autoregressive import MAF
 from ..distributions import BoxUniform
 from ..lazy import UnconditionalDistribution

zuko/lazy.py

@@ -20,7 +20,6 @@
 from torch.distributions import Distribution, Transform
 from typing import Any, Callable, Sequence, Union
 
-# isort: split
 from .distributions import NormalizingFlow
 from .transforms import ComposedTransform
 from .utils import Partial

zuko/mixtures.py

@@ -11,7 +11,6 @@
 from torch import Tensor
 from torch.distributions import Distribution, MultivariateNormal
 
-# isort: split
 from .distributions import Mixture
 from .lazy import LazyDistribution
 from .nn import MLP

zuko/transforms.py

@@ -36,7 +36,6 @@
 from torch.distributions.utils import _sum_rightmost
 from typing import Any, Callable, Iterable, Tuple, Union
 
-# isort: split
 from .utils import bisection, broadcast, gauss_legendre, odeint
 
 torch.distributions.transforms._InverseTransform.__name__ = "Inverse"