Dependency update after v2.4.0 (#3649)

* Bump pybind11-global from 2.13.5 to 2.13.6 (#3611) Bumps [pybind11-global](https://github.com/pybind/pybind11) from 2.13.5 to 2.13.6. - [Release notes](https://github.com/pybind/pybind11/releases) - [Changelog](https://github.com/pybind/pybind11/blob/master/docs/changelog.rst) - [Commits](pybind/pybind11@v2.13.5...v2.13.6) --- updated-dependencies: - dependency-name: pybind11-global dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pybind11 from 2.13.5 to 2.13.6 (#3610) Bumps [pybind11](https://github.com/pybind/pybind11) from 2.13.5 to 2.13.6. - [Release notes](https://github.com/pybind/pybind11/releases) - [Changelog](https://github.com/pybind/pybind11/blob/master/docs/changelog.rst) - [Commits](pybind/pybind11@v2.13.5...v2.13.6) --- updated-dependencies: - dependency-name: pybind11 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ruff from 0.6.4 to 0.6.5 (#3609) * Bump ruff from 0.6.4 to 0.6.5 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.6.4 to 0.6.5. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.6.4...0.6.5) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Updated dependencies in requirements files * 🚨 Ruff 0.6.5 fixes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: james <james.cook1@ukaea.uk> * Sub-dependency update (#3612) * Updated transient dependencies * 👽️ Sidestep sybil bug --------- Co-authored-by: james <james.cook1@ukaea.uk> * Bump ruff from 0.6.5 to 0.6.7 (#3618) * Bump ruff from 0.6.5 to 0.6.7 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.6.5 to 0.6.7. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.6.5...0.6.7) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Updated dependencies in requirements files --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Updated transient dependencies (#3619) * Bump ruff from 0.6.7 to 0.6.8 (#3622) * Bump ruff from 0.6.7 to 0.6.8 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.6.7 to 0.6.8. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.6.7...0.6.8) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Updated dependencies in requirements files * 🚨 Ruff 0.6.8 fixes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: james <81617086+je-cook@users.noreply.github.com> * Sub-dependency update (#3623) * Updated transient dependencies * ⬇️ Myst-nb upgrade fails with docutils node error --------- Co-authored-by: james <81617086+je-cook@users.noreply.github.com> * Bump ruff from 0.6.8 to 0.6.9 (#3628) * Bump ruff from 0.6.8 to 0.6.9 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.6.8 to 0.6.9. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.6.8...0.6.9) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Updated dependencies in requirements files * 🎨 Ruff 0.6.9 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: james <81617086+je-cook@users.noreply.github.com> * Sub-dependency update (#3629) * Updated transient dependencies * ⬆️ Sphinx-rtd-theme updates * ⬇️ Myst-nb upgrade fails with docutils node error * 👽️ Display_version -> version_selector --------- Co-authored-by: james <81617086+je-cook@users.noreply.github.com> * Sub-dependency update (#3637) * Updated transient dependencies * ⬇️ Myst-nb upgrade fails with docutils node error --------- Co-authored-by: james <81617086+je-cook@users.noreply.github.com> * Bump ruff from 0.6.9 to 0.7.0 (#3647) * Bump ruff from 0.6.9 to 0.7.0 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.6.9 to 0.7.0. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.6.9...0.7.0) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Updated dependencies in requirements files * 🚨 Ruff 0.7.0 fixes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: james <81617086+je-cook@users.noreply.github.com> * Updated transient dependencies (#3648) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: james <james.cook1@ukaea.uk> Co-authored-by: james <81617086+je-cook@users.noreply.github.com>
Fusion-Power-Plant-Framework · Oct 21, 2024 · 0af0165 · 0af0165
1 parent bbcb084
commit 0af0165
Show file tree

Hide file tree

Showing 16 changed files with 173 additions and 166 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
         exclude: test_data
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.4
+    rev: v0.7.0
     hooks:
       - id: ruff
         args: [--fix]

diff --git a/bluemira/balance_of_plant/plotting.py b/bluemira/balance_of_plant/plotting.py
@@ -134,7 +134,7 @@ def _double_connect(
             trunklength=trunklength,
             pathlengths=pathlengths,
             rotation=rotation,
-            facecolor=kwargs.get("facecolor", None),
+            facecolor=kwargs.get("facecolor"),
         )
 
     def _opt_connect(

diff --git a/bluemira/base/logs.py b/bluemira/base/logs.py
@@ -198,7 +198,7 @@ def _bm_print(string: str, width: int = 73, *, single_flush: bool = False) -> st
         return _bm_print_singleflush(string, width)
 
     strings = [
-        " " if s == "\n" and i != 0 else s[:-1] if s.endswith("\n") else s
+        " " if s == "\n" and i != 0 else s.removesuffix("\n")
         for i, s in enumerate(string.splitlines(keepends=True))
     ]
     t = [

diff --git a/bluemira/equilibria/equilibrium.py b/bluemira/equilibria/equilibrium.py
@@ -621,7 +621,7 @@ def __init__(
         self.set_grid(grid)
         self._set_init_plasma(grid, psi)
         self.plasma = NoPlasmaCoil(grid)
-        self.limiter = kwargs.get("limiter", None)
+        self.limiter = kwargs.get("limiter")
 
         # Set default breakdown point to grid centre
         x_mid = grid.x_min + 0.5 * (grid.x_max + grid.x_min)

diff --git a/bluemira/materials/material.py b/bluemira/materials/material.py
@@ -584,7 +584,8 @@ def plot(
         ax.view_init(30, 45)
 
     @abc.abstractmethod
-    def Jc(self):  # noqa: N802, D102
+    def Jc(self):  # noqa: N802
+        """Jc"""
         ...
 
 

diff --git a/bluemira/mesh/meshing.py b/bluemira/mesh/meshing.py
@@ -125,9 +125,9 @@ def modify(self, **kwargs):
         """
         Function to override meshing options.
         """
-        for k in kwargs:
+        for k, v in kwargs.items():
             if hasattr(self._options, k):
-                setattr(self._options, k, kwargs[k])
+                setattr(self._options, k, v)
 
     def __repr__(self) -> str:
         """

diff --git a/bluemira/radiation_transport/neutronics/neutronics_axisymmetric.py b/bluemira/radiation_transport/neutronics/neutronics_axisymmetric.py
@@ -282,6 +282,6 @@ def _get_wires_from_components(
         divertor: ComponentManager,
         blanket: ComponentManager,
         vacuum_vessel: ComponentManager,
-    ) -> tuple[
-        TokamakDimensions, BluemiraWire, npt.NDArray, BluemiraWire, BluemiraWire
-    ]: ...
+    ) -> tuple[TokamakDimensions, BluemiraWire, npt.NDArray, BluemiraWire, BluemiraWire]:
+        """Get wires from components"""
+        ...
diff --git a/documentation/source/conf.py b/documentation/source/conf.py
@@ -85,7 +85,7 @@ def setup(app):
 html_theme_options = {
     "canonical_url": "",
     "logo_only": False,
-    "display_version": True,
+    "version_selector": True,
     "prev_next_buttons_location": "bottom",
     "style_external_links": False,
     # Toc options

diff --git a/pyproject.toml b/pyproject.toml
@@ -58,14 +58,14 @@ repository = "https://github.com/Fusion-Power-Plant-Framework/bluemira"
 dev = [
     "jupytext",
     "mypy",
-    "myst-nb",
+    "myst-nb != 1.1.2",
     "pre-commit",
     "pytest",
     "pytest-cov",
     "pytest-html",
     "pytest-metadata",
     "pytest-json-report",
-    "ruff==0.6.4",
+    "ruff==0.7.0",
     "sphinx",
     "sphinx-autoapi",
     "sphinx_copybutton",

diff --git a/requirements/conda.txt b/requirements/conda.txt
@@ -1,7 +1,7 @@
 gmsh-interop==2024.1
 h5py==3.11.0
-pybind11==2.13.5
-pybind11-global==2.13.5
+pybind11==2.13.6
+pybind11-global==2.13.6
 PySide2==5.15.8
 pytools==2024.1.14
 shiboken2==5.15.8