Merge pull request #341 from scipp/drop-py39

Drop Python 3.9 and make Ruff happy

.copier-answers.yml

@@ -1,9 +1,9 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: d91bf92
+_commit: 78693de
 _src_path: https://github.com/scipp/copier_template.git
 description: Visualization library for Scipp
 max_python: '3.12'
-min_python: '3.9'
+min_python: '3.10'
 namespace_package: ''
 nightly_deps: scipp
 orgname: scipp

.github/workflows/docs.yml

@@ -65,7 +65,7 @@ jobs:
           name: docs_html
           path: html/
 
-      - uses: JamesIves/github-pages-deploy-action@v4.5.0
+      - uses: JamesIves/github-pages-deploy-action@v4.6.0
         if: ${{ inputs.publish }}
         with:
           branch: gh-pages

.github/workflows/python-version-ci

@@ -1 +1 @@
-3.9
+3.10

.pre-commit-config.yaml

@@ -13,34 +13,21 @@ repos:
       - id: trailing-whitespace
         args: [ --markdown-linebreak-ext=md ]
         exclude: '\.svg'
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: isort (python)
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.11.0
-    hooks:
-      - id: black
   - repo: https://github.com/kynan/nbstripout
     rev: 0.6.0
     hooks:
       - id: nbstripout
         types: [ "jupyter" ]
         args: [ "--drop-empty-cells",
                 "--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'" ]
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
-    hooks:
-      - id: flake8
-        types: ["python"]
-        additional_dependencies: ["flake8-bugbear==23.9.16"]
-  - repo: https://github.com/pycqa/bandit
-    rev: 1.7.5
-    hooks:
-      - id: bandit
-        additional_dependencies: ["bandit[toml]"]
-        args: ["-c", "pyproject.toml"]
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.4.3
+    hooks:
+      - id: ruff
+        args: [ --fix ]
+        types_or: [ python, pyi, jupyter ]
+      - id: ruff-format
+        types_or: [ python, pyi ]
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.6
     hooks:

conda/meta.yaml

@@ -19,7 +19,8 @@ requirements:
     - setuptools
     - setuptools_scm
   run:
-    - python>=3.9
+    - python>=3.10
+
   {% for package in dependencies %}
     - {% if package == "graphviz" %}python-graphviz{% else %}{{ package }}{% endif %}
   {% endfor %}

docs/conf.py

@@ -9,9 +9,9 @@
 sys.path.insert(0, os.path.abspath('.'))
 
 # General information about the project.
-project = u'Plopp'
-copyright = u'2024 Scipp contributors'
-author = u'Scipp contributors'
+project = 'Plopp'
+copyright = '2024 Scipp contributors'
+author = 'Scipp contributors'
 
 html_show_sourcelink = True
 

docs/developer/coding-conventions.md

@@ -2,7 +2,7 @@
 
 ## Code formatting
 
-There are no explicit code formatting conventions since we use `black` to enforce a format.
+There are no explicit code formatting conventions since we use `ruff` to enforce a format.
 
 ## Docstring format
 

docs/developer/getting-started.md

@@ -40,7 +40,7 @@ Alternatively, if you want a different workflow, take a look at ``tox.ini`` or `
 Run the tests using
 
 ```sh
-tox -e py39
+tox -e py310
 ```
 
 (or just `tox` if you want to run all environments).

docs/gallery/interactive-masking.ipynb

@@ -26,8 +26,7 @@
    "source": [
     "%matplotlib widget\n",
     "import plopp as pp\n",
-    "import scipp as sc\n",
-    "import numpy as np"
+    "import scipp as sc"
    ]
   },
   {
@@ -170,8 +169,6 @@
    },
    "outputs": [],
    "source": [
-    "from plopp.widgets import Box\n",
-    "\n",
     "data_node = pp.Node(da)\n",
     "\n",
     "\n",
@@ -195,7 +192,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "fcf38064-eafe-407e-818c-e3516bd33195",
+   "id": "c3c1343d-845b-4a1f-9f28-978837169aa1",
    "metadata": {
     "editable": true,
     "nbsphinx": "hidden",
@@ -206,15 +203,15 @@
    },
    "outputs": [],
    "source": [
+    "from ipywidgets import HBox\n",
+    "\n",
     "r.value = True\n",
     "\n",
     "r._tool.click(50, 200)\n",
     "r._tool.click(200, 250)\n",
     "r._tool.click(30, 50)\n",
     "r._tool.click(250, 170)\n",
     "\n",
-    "from ipywidgets import HBox\n",
-    "\n",
     "fig.children = [\n",
     "    fig.top_bar,\n",
     "    HBox([fig.left_bar, fig.canvas.to_image(), fig.right_bar]),\n",
@@ -320,7 +317,8 @@
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3"
+   "pygments_lexer": "ipython3",
+   "version": "3.10.14"
   }
  },
  "nbformat": 4,

docs/gallery/masking-a-range.ipynb

@@ -34,7 +34,6 @@
     "%matplotlib widget\n",
     "import plopp as pp\n",
     "import scipp as sc\n",
-    "import numpy as np\n",
     "import ipywidgets as ipw"
    ]
   },
@@ -180,7 +179,8 @@
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3"
+   "pygments_lexer": "ipython3",
+   "version": "3.10.14"
   }
  },
  "nbformat": 4,

docs/gallery/peeling-layers.ipynb

@@ -32,8 +32,7 @@
    "outputs": [],
    "source": [
     "import plopp as pp\n",
-    "import scipp as sc\n",
-    "import numpy as np"
+    "import scipp as sc"
    ]
   },
   {
@@ -129,7 +128,8 @@
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3"
+   "pygments_lexer": "ipython3",
+   "version": "3.10.14"
   }
  },
  "nbformat": 4,

docs/gallery/polar-plots.ipynb

@@ -48,7 +48,7 @@
     "\n",
     "# Make the plot and tweak the axes\n",
     "p = pp.plot(da, ax=ax)\n",
-    "ax.set_xlim(0, 2*np.pi)\n",
+    "ax.set_xlim(0, 2 * np.pi)\n",
     "ax.grid(True)\n",
     "p"
    ]
@@ -147,8 +147,10 @@
     "phi = np.radians(np.linspace(0, 90, N))\n",
     "da = sc.DataArray(\n",
     "    data=sc.array(dims=['phi', 'theta'], values=r, unit='m'),\n",
-    "    coords={'theta': sc.array(dims=['theta'], values=theta, unit='rad'),\n",
-    "            'phi': sc.array(dims=['phi'], values=phi, unit='rad')},\n",
+    "    coords={\n",
+    "        'theta': sc.array(dims=['theta'], values=theta, unit='rad'),\n",
+    "        'phi': sc.array(dims=['phi'], values=phi, unit='rad'),\n",
+    "    },\n",
     ")\n",
     "\n",
     "# Make axes\n",

docs/gallery/rectangle-selection.ipynb

@@ -3,7 +3,13 @@
   {
    "cell_type": "markdown",
    "id": "da024b16-3a9d-4761-983b-ecb94ef192ad",
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "source": [
     "# Rectangle selection\n",
     "\n",
@@ -27,8 +33,7 @@
    "source": [
     "%matplotlib widget\n",
     "import plopp as pp\n",
-    "import scipp as sc\n",
-    "import numpy as np"
+    "import scipp as sc"
    ]
   },
   {
@@ -161,21 +166,26 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "4b0f4619-6d13-4acf-867e-36ae9f234040",
+   "id": "8a372fcb-ffdf-47af-84b3-588926391e8d",
    "metadata": {
-    "nbsphinx": "hidden"
+    "editable": true,
+    "nbsphinx": "hidden",
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
    },
    "outputs": [],
    "source": [
+    "from ipywidgets import HBox\n",
+    "\n",
     "r.value = True\n",
     "\n",
     "r._tool.click(50, 200)\n",
     "r._tool.click(200, 250)\n",
     "r._tool.click(30, 50)\n",
     "r._tool.click(250, 170)\n",
     "\n",
-    "from ipywidgets import HBox\n",
-    "\n",
     "f1 = box[0]\n",
     "f1.children = [\n",
     "    f1.top_bar,\n",
@@ -245,7 +255,8 @@
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3"
+   "pygments_lexer": "ipython3",
+   "version": "3.10.14"
   }
  },
  "nbformat": 4,

docs/gallery/tiled-random-samples.ipynb

@@ -18,7 +18,7 @@
     "import numpy as np\n",
     "import scipp as sc\n",
     "import plopp as pp\n",
-    "from typing import Callable, Generator"
+    "from collections.abc import Callable, Generator"
    ]
   },
   {
@@ -49,21 +49,26 @@
     "    np.random.wald: {'mean': [1], 'scale': [16, 32, 64]},\n",
     "    np.random.weibull: {'a': [2, 4, 8, 16]},\n",
     "    np.random.f: {'dfnum': [100], 'dfden': [100]},\n",
-    "    np.random.rayleigh: {'scale': [2, 3, 4]}\n",
+    "    np.random.rayleigh: {'scale': [2, 3, 4]},\n",
     "}\n",
     "\n",
+    "\n",
     "def generate_kwargs(arguments_map: dict[str, list]) -> Generator[dict, None, None]:\n",
     "    from itertools import product\n",
     "\n",
-    "    key_arg_pairs = [[(key, val) for val in values] for key, values in arguments_map.items()]\n",
+    "    key_arg_pairs = [\n",
+    "        [(key, val) for val in values] for key, values in arguments_map.items()\n",
+    "    ]\n",
     "    for arguments in product(*key_arg_pairs):\n",
     "        yield {str(args[0]): args[1] for args in arguments}\n",
     "\n",
+    "\n",
     "def key_arg_name(key: str, arg) -> str:\n",
     "    return \": \".join([key, str(arg)])\n",
     "\n",
+    "\n",
     "def keys_args_name(**kwargs) -> str:\n",
-    "    return \",\".join([key_arg_name(key, arg) for key, arg in kwargs.items()])\n"
+    "    return \",\".join([key_arg_name(key, arg) for key, arg in kwargs.items()])"
    ]
   },
   {
@@ -75,18 +80,19 @@
     "# Collect samples\n",
     "def sample_and_hist(pdf: Callable, size: int, **kwargs):\n",
     "    samples = sc.array(dims=['event'], values=pdf(size=size, **kwargs), unit='1')\n",
-    "    \n",
-    "    return samples.hist(event=10)/len(samples)\n",
     "\n",
-    "plots = dict()\n",
+    "    return samples.hist(event=10) / len(samples)\n",
+    "\n",
+    "\n",
+    "plots = {}\n",
     "\n",
     "for pdf, arguments_map in pdf_maps.items():\n",
     "    hists = {\n",
     "        keys_args_name(**kwargs): sample_and_hist(pdf, size=10_000, **kwargs)\n",
-    "        for kwargs in generate_kwargs(arguments_map)    \n",
+    "        for kwargs in generate_kwargs(arguments_map)\n",
     "    }\n",
     "    plot = pp.plot(hists, title=f\"{pdf.__name__} distribution\", alpha=0.8, linewidth=4)\n",
-    "    plots[pdf.__name__] = plot\n"
+    "    plots[pdf.__name__] = plot"
    ]
   },
   {