chore: Self & _compat (#479)

* chore: use Self Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * chore: move sys.version_info things to _compat Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * chore: ignore redefined-builtin Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> --------- Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
scikit-hep · Feb 28, 2023 · cdfc4c3 · cdfc4c3
1 parent 1126536
commit cdfc4c3
Showing 25 changed files with 220 additions and 227 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
   rev: v0.0.253
   hooks:
   - id: ruff
-    args: ["--fix"]
+    args: ["--fix", "--show-fixes"]
 
 - repo: https://github.com/asottile/setup-cfg-fmt
   rev: v2.2.0
@@ -37,9 +37,9 @@ repos:
 - repo: https://github.com/nbQA-dev/nbQA
   rev: 1.6.3
   hooks:
-  - id: nbqa-pyupgrade
-    additional_dependencies: [pyupgrade==3.3.1]
-    args: ["--py37-plus"]
+  - id: nbqa-ruff
+    additional_dependencies: [ruff==0.0.253]
+    args: ["--extend-ignore=B008,T20,I002,E402", "--fix", "--show-fixes"]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
   rev: v1.0.1

diff --git a/docs/examples/HistDemo.ipynb b/docs/examples/HistDemo.ipynb
@@ -36,8 +36,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from hist import Hist\n",
-    "import numpy as np"
+    "import numpy as np\n",
+    "\n",
+    "from hist import Hist"
    ]
   },
   {

diff --git a/docs/user-guide/notebooks/Histogram.ipynb b/docs/user-guide/notebooks/Histogram.ipynb
@@ -42,8 +42,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from hist import Hist\n",
-    "import hist"
+    "import hist\n",
+    "from hist import Hist"
    ]
   },
   {
@@ -510,8 +510,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import hist.dask as dah\n",
-    "import dask.array as da"
+    "import dask.array as da\n",
+    "\n",
+    "import hist.dask as dah"
    ]
   },
   {

diff --git a/docs/user-guide/notebooks/Interpolation.ipynb b/docs/user-guide/notebooks/Interpolation.ipynb
@@ -20,10 +20,11 @@
    "outputs": [],
    "source": [
     "# Make the necessary imports.\n",
-    "from scipy import interpolate\n",
-    "from hist import Hist, axis\n",
     "import matplotlib.pyplot as plt\n",
-    "import numpy as np"
+    "import numpy as np\n",
+    "from scipy import interpolate\n",
+    "\n",
+    "from hist import Hist"
    ]
   },
   {

diff --git a/docs/user-guide/notebooks/Plots.ipynb b/docs/user-guide/notebooks/Plots.ipynb
@@ -20,8 +20,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from hist import Hist\n",
-    "import hist"
+    "import hist\n",
+    "from hist import Hist"
    ]
   },
   {

diff --git a/docs/user-guide/notebooks/Reprs.ipynb b/docs/user-guide/notebooks/Reprs.ipynb
@@ -15,8 +15,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from hist import Hist\n",
-    "import numpy as np"
+    "import numpy as np\n",
+    "\n",
+    "from hist import Hist"
    ]
   },
   {