Skip to content

Commit 1c384bf

Browse files
fppf-botdependabot[bot]je-cook
authored
Dependency update after v2.10.0 (#4141)
* Bump ruff from 0.13.1 to 0.13.2 (#4096) * Bump ruff from 0.13.1 to 0.13.2 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.13.1 to 0.13.2. - [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.13.1...0.13.2) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.13.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Updated dependencies in requirements files * Updated pre-commit * 🚨 Fix errors --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: james <[email protected]> * Updated transient dependencies (#4097) * Bump numba from 0.62.0 to 0.62.1 (#4103) * Bump numba from 0.62.0 to 0.62.1 Bumps [numba](https://github.com/numba/numba) from 0.62.0 to 0.62.1. - [Release notes](https://github.com/numba/numba/releases) - [Commits](numba/numba@0.62.0...0.62.1) --- updated-dependencies: - dependency-name: numba dependency-version: 0.62.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Updated dependencies in requirements files --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pytools from 2025.2.4 to 2025.2.5 (#4110) Bumps [pytools](https://github.com/inducer/pytools) from 2025.2.4 to 2025.2.5. - [Release notes](https://github.com/inducer/pytools/releases) - [Commits](inducer/pytools@v2025.2.4...v2025.2.5) --- updated-dependencies: - dependency-name: pytools dependency-version: 2025.2.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump matplotlib from 3.10.6 to 3.10.7 (#4111) * Bump matplotlib from 3.10.6 to 3.10.7 Bumps [matplotlib](https://github.com/matplotlib/matplotlib) from 3.10.6 to 3.10.7. - [Release notes](https://github.com/matplotlib/matplotlib/releases) - [Commits](matplotlib/matplotlib@v3.10.6...v3.10.7) --- updated-dependencies: - dependency-name: matplotlib dependency-version: 3.10.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Updated dependencies in requirements files [skip dependency] --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ruff from 0.13.2 to 0.14.0 (#4112) * Bump ruff from 0.13.2 to 0.14.0 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.13.2 to 0.14.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.13.2...0.14.0) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.14.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Updated dependencies in requirements files [skip dependency] * Updated pre-commit [skip dependency] * Linter fixes [skip dependency] --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ruff from 0.14.0 to 0.14.1 (#4117) * Bump ruff from 0.14.0 to 0.14.1 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.14.0 to 0.14.1. - [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.14.0...0.14.1) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.14.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Updated dependencies in requirements files [skip dependency] * Updated pre-commit [skip dependency] * 📝 Docs fixes --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: james <[email protected]> * Sub-dependency update (#4119) * Updated transient dependencies * 🐛 Sphinx-autoapi fix --------- Co-authored-by: james <[email protected]> * Bump ruff from 0.14.0 to 0.14.2 (#4125) * Bump ruff from 0.14.0 to 0.14.2 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.14.0 to 0.14.2. - [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.14.0...0.14.2) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.14.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Updated dependencies in requirements files [skip dependency] Signed-off-by: james <[email protected]> * Updated pre-commit [skip dependency] Signed-off-by: james <[email protected]> * Apply suggestion from @je-cook --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: james <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: je-cook <[email protected]> * Bump ruff from 0.14.2 to 0.14.3 (#4134) * Bump ruff from 0.14.2 to 0.14.3 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.14.2 to 0.14.3. - [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.14.2...0.14.3) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.14.3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Updated dependencies in requirements files [skip dependency] * Updated pre-commit [skip dependency] * Update requirements/uv/all.txt * 📝 Fix missing raises in docs * ✅ Bad filetype test --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: je-cook <[email protected]> * Bump openmc-data from 2.3.1 to 2.3.2 (#4136) * Bump openmc-data from 2.3.1 to 2.3.2 Bumps [openmc-data](https://github.com/fusion-energy/openmc_data) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/fusion-energy/openmc_data/releases) - [Commits](openmc-data-storage/openmc_data@2.3.1...2.3.2) --- updated-dependencies: - dependency-name: openmc-data dependency-version: 2.3.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Updated dependencies in requirements files [skip dependency] * Apply suggestion from @je-cook --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: je-cook <[email protected]> * Update eqdsk requirement from <0.6.0,>=0.5.0 to >=0.7.0,<0.8.0 (#4135) * Update eqdsk requirement from <0.6.0,>=0.5.0 to >=0.7.0,<0.8.0 Updates the requirements on [eqdsk](https://github.com/Fusion-Power-Plant-Framework/eqdsk) to permit the latest version. - [Release notes](https://github.com/Fusion-Power-Plant-Framework/eqdsk/releases) - [Commits](Fusion-Power-Plant-Framework/eqdsk@v0.5.0...v0.7.0) --- updated-dependencies: - dependency-name: eqdsk dependency-version: 0.6.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Updated dependencies in requirements files [skip dependency] * Change versions * ⬆️ Update versions --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: je-cook <[email protected]> * Sub-dependency update (#4139) * Updated transient dependencies * Update requirements/uv/all.txt --------- Co-authored-by: je-cook <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: james <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: james <[email protected]>
1 parent 9c7c40c commit 1c384bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+270
-325
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ repos:
1212
exclude: test_data
1313

1414
- repo: https://github.com/astral-sh/ruff-pre-commit
15-
rev: v0.13.1
15+
rev: v0.14.3
1616
hooks:
1717
- id: ruff-check
1818
args: [--fix]
1919
- id: ruff-format
2020

2121
- repo: https://github.com/biomejs/pre-commit
22-
rev: v2.2.4
22+
rev: v2.3.2
2323
hooks:
2424
- id: biome-format
2525
types: [json]

bluemira/balance_of_plant/plotting.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,6 @@ def plot(self, flow_dict: dict[str, list[float]], title: str = "") -> Axes:
260260
261261
Parameters
262262
----------
263-
inputs: dict
264-
The inputs to BalanceOfPlant (used here to format the title)
265-
op_mode: str
266-
The operation mode of the reactor
267263
flow_dict: dict
268264
The dictionary of flows for each of the Sankey diagrams.
269265

bluemira/base/parameter_frame/_frame.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,6 @@ def tabulation_data(
459459
----------
460460
keys:
461461
table column keys
462-
tablefmt:
463-
The format of the table (default="fancy_grid") - see
464-
https://github.com/astanin/python-tabulate#table-format
465462
floatfmt:
466463
Format floats to this precision
467464
value_label:

bluemira/base/tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,8 @@ def build_comp_manager_show_cad_tree(
601601
Component manager
602602
dim:
603603
Dimension to build the CAD in
604-
component_filter:
605-
Filter to apply to the components
604+
construction_params:
605+
Parameters for the construction of CAD.
606606
607607
Returns
608608
-------

bluemira/codes/_freecadapi.py

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,8 @@
2323
from unittest import mock
2424

2525
import FreeCAD
26-
import BOPTools
27-
import BOPTools.GeneralFuseResult
2826
import BOPTools.JoinAPI
29-
import BOPTools.JoinFeatures
30-
import BOPTools.ShapeMerge
3127
import BOPTools.SplitAPI
32-
import BOPTools.SplitFeatures
33-
import BOPTools.Utils
3428
import DraftGeomUtils
3529
import FreeCADGui
3630
import Part
@@ -1564,10 +1558,10 @@ def _missing_(cls, value: str) -> CADFileType:
15641558
if value.upper() in cls.__members__:
15651559
return cls[value.upper()]
15661560
for mixed_c in (cls.STEP_ZIP, cls.IFC_BIM_JSON, cls.FREECAD):
1567-
if value in mixed_c.value:
1561+
if value in mixed_c.value.file_extensions:
15681562
return mixed_c
15691563
for cl in cls.__members__.values():
1570-
if value in cl.value:
1564+
if value in cl.value.file_extensions:
15711565
return cl
15721566
return super()._missing_(value)
15731567

@@ -1849,13 +1843,7 @@ def save_cad(
18491843
Part builds in millimetres therefore we need to scale to metres to be
18501844
consistent with our units
18511845
"""
1852-
try:
1853-
cad_format = CADFileType(cad_format)
1854-
except ValueError as ve:
1855-
try:
1856-
cad_format = CADFileType[cad_format.upper()]
1857-
except (KeyError, AttributeError):
1858-
raise ve from None
1846+
cad_format = CADFileType(cad_format)
18591847

18601848
filename = force_file_extension(filename, f".{cad_format.ext}")
18611849

@@ -2813,7 +2801,7 @@ def collect_verts_faces(
28132801
----------
28142802
solid:
28152803
FreeCAD Part
2816-
tessellation:
2804+
tesselation:
28172805
amount of tessellation for the mesh
28182806
28192807
Returns

bluemira/codes/interface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ def modify_mappings(self, send_recv: dict[str, dict[str, bool]]):
356356
357357
Parameters
358358
----------
359-
mappings:
359+
send_recv:
360360
A dictionary where keys are variables to change the mappings
361361
of, and values specify 'send', and or, 'recv' booleans.
362362

bluemira/codes/openmc/make_csg.py

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -720,13 +720,6 @@ def make_cell_arrays(
720720
721721
Parameters
722722
----------
723-
materials:
724-
library containing information about the materials
725-
tokamak_dimensions:
726-
A parameter
727-
:class:`bluemira.radiation_transport.neutronics.params.TokamakDimensions`,
728-
Specifying the dimensions of various layers in the blanket, divertor, and
729-
central solenoid.
730723
control_id: bool
731724
Whether to set the blanket Cells and surface IDs by force or not.
732725
With this set to True, it will be easier to understand where each cell came
@@ -1402,25 +1395,27 @@ def from_pre_cell(
14021395
14031396
Parameters
14041397
----------
1405-
pre_cell
1398+
pre_cell:
14061399
An instance of :class:`~PreCell`
1407-
ccw_surf
1400+
ccw_surface:
14081401
An instance of :class:`openmc.surface.Surface`
1409-
cw_surf
1402+
cw_surface:
14101403
An instance of :class:`openmc.surface.Surface`
1411-
depth_series
1404+
depth_series:
14121405
a series of floats corresponding to the N-2 interfaces between the N-1
14131406
layers, whereas the N-th layer is the vacuum vessel (and the pre-cell has
14141407
already stored the thickness for that).
14151408
Each float represents how deep into the blanket (i.e. how many [cm] into the
14161409
first wall we need to drill, from the plasma facing surface) to hit that
14171410
interface layer.
1418-
fill_lib
1411+
csg:
1412+
CSG reactor CAD
1413+
fill_lib:
14191414
:class:`~MaterialsLibrary` so that it separates into .inboard, .outboard,
14201415
.divertor, .tf_coil_windings, etc.
1421-
inboard
1416+
inboard:
14221417
boolean denoting whether this cell is inboard or outboard
1423-
blanket_stack_num
1418+
blanket_stack_num:
14241419
An optional number indexing the current stack. Used for labelling.
14251420
If None: we will not be controlling the cell and surfaces id.
14261421
@@ -1639,8 +1634,8 @@ def interior_vertices(self) -> npt.NDArray:
16391634
Returns all of the tokamak's poloidal cross-section's inside corners'
16401635
coordinates, in 3D.
16411636
1642-
Parameters
1643-
----------
1637+
Returns
1638+
-------
16441639
interior_vertices:
16451640
array of shape (N+1, 3) arranged clockwise (inboard to outboard).
16461641
"""
@@ -2229,8 +2224,8 @@ def interior_vertices(self) -> npt.NDArray:
22292224
Returns all of the tokamak's poloidal cross-section's inside corners'
22302225
coordinates, in 3D.
22312226
2232-
Parameters
2233-
----------
2227+
Returns
2228+
-------
22342229
interior_vertices: npt.NDArray of shape (N+1, 3)
22352230
Arranged counter-clockwise (inboard to outboard).
22362231
"""

bluemira/codes/openmc/output.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ def _load_volume_calculation_from_file(
151151
152152
Parameters
153153
----------
154-
volume_file_path
155-
156-
Cell_names
154+
volume_file_path:
155+
filepath to volume
156+
cell_names:
157157
indicative names to print.
158158
"""
159159
if volume_file_path.is_file():

bluemira/display/plotter.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,8 +1253,6 @@ def plot_dolfinx_2d_mesh_plt(
12531253
Mapping from group ID to color.
12541254
cmap : str
12551255
Colormap for automatic coloring of groups.
1256-
show_nodes : bool
1257-
If True, plot red dots at node positions.
12581256
figsize : tuple
12591257
Size of the figure if ax is None.
12601258
title : str

bluemira/display/tools.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ def __getattribute__(self, attr: str):
4040
-------
4141
:
4242
the attributes or from "_options" dict
43+
44+
Raises
45+
------
46+
AttributeError
47+
Attribute not found
4348
"""
4449
try:
4550
return super().__getattribute__(attr)

0 commit comments

Comments
 (0)