Be careful with isort

examples/1-basic/density.ipynb

@@ -35,17 +35,19 @@
    "outputs": [],
    "source": [
     "# use the CAMB cosmology that generated the matter power spectra\n",
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
+    "from matplotlib.colors import LogNorm\n",
+    "\n",
     "import camb\n",
+    "from cosmology import Cosmology\n",
+    "\n",
     "import glass.fields\n",
     "import glass.galaxies\n",
     "import glass.points\n",
     "\n",
     "# GLASS imports: matter, random fields, random points, galaxies\n",
     "import glass.shells\n",
-    "import matplotlib.pyplot as plt\n",
-    "import numpy as np\n",
-    "from cosmology import Cosmology\n",
-    "from matplotlib.colors import LogNorm\n",
     "\n",
     "# cosmology for the simulation\n",
     "h = 0.7\n",

examples/1-basic/lensing.ipynb

@@ -39,17 +39,19 @@
    "outputs": [],
    "source": [
     "# use the CAMB cosmology that generated the matter power spectra\n",
+    "import healpy as hp\n",
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
+    "\n",
     "import camb\n",
+    "from cosmology import Cosmology\n",
+    "\n",
     "import glass.fields\n",
     "import glass.galaxies\n",
     "import glass.lensing\n",
     "\n",
     "# GLASS imports\n",
     "import glass.shells\n",
-    "import healpy as hp\n",
-    "import matplotlib.pyplot as plt\n",
-    "import numpy as np\n",
-    "from cosmology import Cosmology\n",
     "\n",
     "# cosmology for the simulation\n",
     "h = 0.7\n",

examples/1-basic/matter.ipynb

@@ -35,15 +35,17 @@
    "outputs": [],
    "source": [
     "# uses the CAMB cosmology which produced the cls\n",
+    "import healpy as hp\n",
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
+    "\n",
     "import camb\n",
+    "from cosmology import Cosmology\n",
+    "\n",
     "import glass.fields\n",
     "\n",
     "# these are the GLASS imports: matter and random fields\n",
     "import glass.shells\n",
-    "import healpy as hp\n",
-    "import matplotlib.pyplot as plt\n",
-    "import numpy as np\n",
-    "from cosmology import Cosmology\n",
     "\n",
     "# cosmology for the simulation\n",
     "h = 0.7\n",

examples/1-basic/photoz.ipynb

@@ -36,11 +36,12 @@
    "outputs": [],
    "source": [
     "# GLASS imports: matter shells, galaxies, random points, and observational\n",
-    "import glass.galaxies\n",
-    "import glass.observations\n",
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "\n",
+    "import glass.galaxies\n",
+    "import glass.observations\n",
+    "\n",
     "# how many arcmin2 over the entire sphere\n",
     "from glass.core.constants import ARCMIN2_SPHERE\n",
     "\n",

examples/1-basic/shells.ipynb

@@ -38,13 +38,15 @@
    },
    "outputs": [],
    "source": [
-    "import camb\n",
-    "import glass.ext.camb\n",
-    "import glass.shells\n",
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
+    "\n",
+    "import camb\n",
     "from cosmology import Cosmology\n",
     "\n",
+    "import glass.ext.camb\n",
+    "import glass.shells\n",
+    "\n",
     "# cosmology for the simulation\n",
     "h = 0.7\n",
     "Oc = 0.25\n",

examples/2-advanced/cosmic_shear.ipynb

@@ -34,7 +34,13 @@
    "outputs": [],
    "source": [
     "# use the CAMB cosmology that generated the matter power spectra\n",
+    "import healpy as hp\n",
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
+    "\n",
     "import camb\n",
+    "from cosmology import Cosmology\n",
+    "\n",
     "import glass.fields\n",
     "import glass.galaxies\n",
     "import glass.lensing\n",
@@ -43,10 +49,6 @@
     "\n",
     "# GLASS modules: cosmology and everything in the glass namespace\n",
     "import glass.shells\n",
-    "import healpy as hp\n",
-    "import matplotlib.pyplot as plt\n",
-    "import numpy as np\n",
-    "from cosmology import Cosmology\n",
     "from glass.core.constants import ARCMIN2_SPHERE\n",
     "\n",
     "# cosmology for the simulation\n",

examples/2-advanced/stage_4_galaxies.ipynb

@@ -37,7 +37,13 @@
    "outputs": [],
    "source": [
     "# use the CAMB cosmology that generated the matter power spectra\n",
+    "import healpy as hp\n",
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
+    "\n",
     "import camb\n",
+    "from cosmology import Cosmology\n",
+    "\n",
     "import glass.ext.camb\n",
     "import glass.fields\n",
     "import glass.galaxies\n",
@@ -48,10 +54,6 @@
     "\n",
     "# GLASS modules: cosmology and everything in the glass namespace\n",
     "import glass.shells\n",
-    "import healpy as hp\n",
-    "import matplotlib.pyplot as plt\n",
-    "import numpy as np\n",
-    "from cosmology import Cosmology\n",
     "\n",
     "# cosmology for the simulation\n",
     "h = 0.7\n",

pyproject.toml

@@ -101,6 +101,19 @@ lint.ignore = [
     "ISC001", # clashes with formatter
     "NPY201", # TODO: remove after NumPy v2 support
 ]
+lint.isort = {known-first-party = [
+    "glass",
+], section-order = [
+    "future",
+    "standard-library",
+    "third-party",
+    "cosmo",
+    "first-party",
+    "local-folder",
+], sections = {"cosmo" = [
+    "camb",
+    "cosmology",
+]}}
 lint.per-file-ignores = {"tests*" = [
     "ANN001", # missing-type-function-argument
     "ANN201", # missing-return-type-undocumented-public-function
@@ -114,3 +127,4 @@ lint.mccabe.max-complexity = 18
 
 [tool.tomlsort]
 overrides."project.classifiers".inline_arrays = false
+overrides."tool.ruff.lint.isort.section-order".inline_arrays = false

tests/core/test_algorithm.py

@@ -13,9 +13,10 @@
 @pytest.mark.skipif(not HAVE_SCIPY, reason="test requires SciPy")
 def test_nnls():
     import numpy as np
-    from glass.core.algorithm import nnls as nnls_glass
     from scipy.optimize import nnls as nnls_scipy
 
+    from glass.core.algorithm import nnls as nnls_glass
+
     a = np.random.randn(100, 20)
     b = np.random.randn(100)
 

tests/test_fits.py

@@ -9,6 +9,7 @@
     HAVE_FITSIO = False
 
 import numpy as np
+
 from glass import user
 
 

tests/test_galaxies.py

@@ -5,6 +5,7 @@ def test_redshifts():
     from unittest.mock import Mock
 
     import numpy as np
+
     from glass.galaxies import redshifts
 
     # create a mock radial window function
@@ -24,6 +25,7 @@ def test_redshifts():
 
 def test_redshifts_from_nz():
     import numpy as np
+
     from glass.galaxies import redshifts_from_nz
 
     # test sampling
@@ -95,6 +97,7 @@ def test_redshifts_from_nz():
 
 def test_gaussian_phz():
     import numpy as np
+
     from glass.galaxies import gaussian_phz
 
     # test sampling

tests/test_lensing.py

@@ -71,6 +71,7 @@ def alpha(re, im):
 
 def test_deflect_many():
     import healpix
+
     from glass.lensing import deflect
 
     n = 1000

tests/test_shells.py

@@ -53,6 +53,7 @@ def test_restrict():
 @pytest.mark.parametrize("method", ["lstsq", "nnls", "restrict"])
 def test_partition(method):
     import numpy as np
+
     from glass.shells import RadialWindow, partition
 
     shells = [