chore: update Ruff config, lint notebooks (#901)

Signed-off-by: Henry Schreiner <[email protected]>
scikit-hep · Nov 29, 2023 · a6efa1c · a6efa1c
1 parent 316c917
commit a6efa1c
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 38 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -51,6 +51,7 @@ repos:
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
+        types_or: [python, pyi, jupyter]
       - id: ruff-format
         types_or: [python, pyi, jupyter]
 

diff --git a/notebooks/BoostHistogramHandsOn.ipynb b/notebooks/BoostHistogramHandsOn.ipynb
@@ -13,11 +13,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import boost_histogram as bh\n",
-    "import numpy as np\n",
-    "import matplotlib.pyplot as plt\n",
     "import functools\n",
-    "import operator"
+    "import operator\n",
+    "\n",
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
+    "\n",
+    "import boost_histogram as bh"
    ]
   },
   {

diff --git a/notebooks/PerformanceComparison.ipynb b/notebooks/PerformanceComparison.ipynb
@@ -15,9 +15,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import boost_histogram as bh\n",
     "import numpy as np\n",
-    "from numpy.testing import assert_allclose"
+    "from numpy.testing import assert_allclose\n",
+    "\n",
+    "import boost_histogram as bh"
    ]
   },
   {

diff --git a/notebooks/SimpleExample.ipynb b/notebooks/SimpleExample.ipynb
@@ -15,8 +15,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import boost_histogram as bh\n",
-    "import numpy as np"
+    "import numpy as np\n",
+    "\n",
+    "import boost_histogram as bh"
    ]
   },
   {

diff --git a/notebooks/ThreadedFills.ipynb b/notebooks/ThreadedFills.ipynb
@@ -13,12 +13,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import numpy as np\n",
-    "import boost_histogram as bh\n",
     "from concurrent.futures import ThreadPoolExecutor\n",
     "from functools import reduce\n",
     "from operator import add\n",
-    "from numpy.testing import assert_array_equal"
+    "\n",
+    "import numpy as np\n",
+    "from numpy.testing import assert_array_equal\n",
+    "\n",
+    "import boost_histogram as bh"
    ]
   },
   {

diff --git a/notebooks/aghast.ipynb b/notebooks/aghast.ipynb
diff --git a/notebooks/xarray.ipynb b/notebooks/xarray.ipynb
diff --git a/pyproject.toml b/pyproject.toml
@@ -146,18 +146,13 @@ extend-select = [
   "YTT",         # flake8-2020
 ]
 ignore = [
-  "PLR",    # Design related pylint codes
-  "E501",   # Line too long
+  "PLR09",          # Too many X
+  "PLR2004",        # Magic value in comparison
+  "E501",           # Line too long
   "PT011", "PT013", # Incorrect pytest codes
-  "ISC001", # Conflicts with the formatter
+  "ISC001",         # Conflicts with the formatter
 ]
-unfixable = [
-  "T20",  # Removes print statements
-  "F841", # Removes unused variables
-]
-exclude = []
 typing-modules = ["boost_histogram._internal.typing"]
-flake8-unused-arguments.ignore-variadic-names = true
 isort.required-imports = ["from __future__ import annotations"]
 
 
@@ -174,3 +169,6 @@ max-complexity = 13
 "notebooks/*" = ["T20"]
 "*.pyi" = ["F401", "F811", "ARG001"]
 "docs/conf.py" = ["E402", "ARG001"]
+# Several of these will be fixed in the next Ruff release
+# F401 is needed since Ruff doesn't realise some magics are code
+"**.ipynb" = ["E703", "I002", "E731", "B015", "B018", "F401"]