diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 42a98600aa..1c10090960 100644 --- 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 index 0f4237b2d7..60b9b22345 100644 --- 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 index 813c501e8c..66ef95cd3c 100644 --- 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 index ef782e7adc..967b95053e 100644 --- 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 index 35e3613ebd..ea969b8230 100644 --- 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 index 2ffed21ea4..8447c16343 100644 --- 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 index e04f263643..c04de3b303 100644 --- 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 index b4d2820bf5..8f3de840be 100644 --- 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 index ee3078662a..190eeff05d 100644 --- 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 index 5284af828f..2b86d7508f 100644 --- 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 diff --git a/requirements/uv/all.txt b/requirements/uv/all.txt index d1741d44f5..84f357fc58 100644 --- a/requirements/uv/all.txt +++ b/requirements/uv/all.txt @@ -1,8 +1,8 @@ # This file was autogenerated by uv via the following command: # uv pip compile pyproject.toml --python-version=3.10 --extra pinned -o requirements/uv/all.txt --extra dev --extra polyscope --extra radiation --extra examples -alabaster==0.7.16 +alabaster==1.0.0 # via sphinx -anyio==4.4.0 +anyio==4.6.2.post1 # via # httpx # jupyter-server @@ -16,11 +16,11 @@ argon2-cffi-bindings==21.2.0 # via argon2-cffi arrow==1.3.0 # via isoduration -asteval==1.0.2 +asteval==1.0.5 # via # bluemira (pyproject.toml) # neutronics-material-maker -astroid==3.3.2 +astroid==3.3.5 # via sphinx-autoapi asttokens==2.4.1 # via stack-data @@ -51,7 +51,7 @@ cffi==1.17.1 # via argon2-cffi-bindings cfgv==3.4.0 # via pre-commit -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests cherab==1.5.0 # via bluemira (pyproject.toml) @@ -67,19 +67,19 @@ contourpy==1.3.0 # matplotlib coolprop==6.6.0 # via bluemira (pyproject.toml) -coverage==7.6.1 +coverage==7.6.4 # via pytest-cov cycler==0.12.1 # via matplotlib -debugpy==1.8.5 +debugpy==1.8.7 # via ipykernel decorator==5.1.1 # via ipython defusedxml==0.7.1 # via nbconvert -distlib==0.3.8 +distlib==0.3.9 # via virtualenv -docutils==0.20.1 +docutils==0.21.2 # via # myst-parser # sphinx @@ -95,13 +95,13 @@ executing==2.1.0 # via stack-data fastjsonschema==2.20.0 # via nbformat -filelock==3.16.0 +filelock==3.16.1 # via virtualenv flexcache==0.3 # via pint flexparser==0.3.1 # via pint -fonttools==4.53.1 +fonttools==4.54.1 # via matplotlib fortranformat==2.0.0 # via @@ -111,27 +111,27 @@ fqdn==1.5.1 # via jsonschema gmsh==4.13.1 # via bluemira (pyproject.toml) -greenlet==3.0.3 +greenlet==3.1.1 # via sqlalchemy h11==0.14.0 # via httpcore -httpcore==1.0.5 +httpcore==1.0.6 # via httpx httpx==0.27.2 # via jupyterlab -identify==2.6.0 +identify==2.6.1 # via pre-commit -idna==3.8 +idna==3.10 # via # anyio # httpx # jsonschema # requests -imageio==2.35.1 +imageio==2.36.0 # via bluemira (pyproject.toml) imagesize==1.4.1 # via sphinx -importlib-metadata==8.4.0 +importlib-metadata==8.5.0 # via # jupyter-cache # myst-nb @@ -141,7 +141,7 @@ ipykernel==6.29.5 # via # jupyterlab # myst-nb -ipython==8.27.0 +ipython==8.28.0 # via # ipykernel # myst-nb @@ -170,11 +170,11 @@ jsonschema==4.23.0 # jupyter-events # jupyterlab-server # nbformat -jsonschema-specifications==2023.12.1 +jsonschema-specifications==2024.10.1 # via jsonschema jupyter-cache==1.0.0 # via myst-nb -jupyter-client==8.6.2 +jupyter-client==8.6.3 # via # ipykernel # jupyter-server @@ -221,7 +221,7 @@ markdown-it-py==3.0.0 # mdit-py-plugins # myst-parser # rich -markupsafe==2.1.5 +markupsafe==3.0.2 # via # jinja2 # nbconvert @@ -237,7 +237,7 @@ matplotlib-inline==0.1.7 # via # ipykernel # ipython -mdit-py-plugins==0.4.1 +mdit-py-plugins==0.4.2 # via # jupytext # myst-parser @@ -247,9 +247,9 @@ meshio==5.3.5 # via bluemira (pyproject.toml) mistune==3.0.2 # via nbconvert -msgpack==1.0.8 +msgpack==1.1.0 # via blosc2 -mypy==1.11.2 +mypy==1.12.1 # via bluemira (pyproject.toml) mypy-extensions==1.0.0 # via mypy @@ -272,11 +272,11 @@ nbformat==5.10.4 # myst-nb # nbclient # nbconvert -ndindex==1.8 +ndindex==1.9.2 # via blosc2 nest-asyncio==1.6.0 # via ipykernel -neutronics-material-maker==1.2.0 +neutronics-material-maker==1.2.1 # via bluemira (pyproject.toml) nlopt==2.7.1 # via bluemira (pyproject.toml) @@ -336,7 +336,7 @@ packaging==24.1 # pytest # sphinx # tables -pandas==2.2.2 +pandas==2.2.3 # via # pypet # seaborn @@ -348,14 +348,14 @@ periodictable==1.7.1 # via bluemira (pyproject.toml) pexpect==4.9.0 # via ipython -pillow==10.4.0 +pillow==11.0.0 # via # imageio # matplotlib # pyvista pint==0.24.3 # via bluemira (pyproject.toml) -platformdirs==4.3.2 +platformdirs==4.3.6 # via # jupyter-core # pooch @@ -366,13 +366,13 @@ polyscope==2.3.0 # via bluemira (pyproject.toml) pooch==1.8.2 # via pyvista -pre-commit==3.8.0 +pre-commit==4.0.1 # via bluemira (pyproject.toml) -prometheus-client==0.20.0 +prometheus-client==0.21.0 # via jupyter-server -prompt-toolkit==3.0.47 +prompt-toolkit==3.0.48 # via ipython -psutil==6.0.0 +psutil==6.1.0 # via ipykernel ptyprocess==0.7.0 # via @@ -384,7 +384,7 @@ py-cpuinfo==9.0.0 # via # blosc2 # tables -pyclipper==1.3.0.post5 +pyclipper==1.3.0.post6 # via bluemira (pyproject.toml) pycparser==2.22 # via cffi @@ -394,13 +394,13 @@ pygments==2.18.0 # nbconvert # rich # sphinx -pyparsing==3.1.4 +pyparsing==3.2.0 # via # matplotlib # periodictable pypet==0.6.1 # via bluemira (pyproject.toml) -pytest==8.3.2 +pytest==8.3.3 # via # bluemira (pyproject.toml) # pytest-cov @@ -426,7 +426,7 @@ python-dateutil==2.9.0.post0 # pandas python-json-logger==2.0.7 # via jupyter-events -pytz==2024.1 +pytz==2024.2 # via pandas pyvista==0.44.1 # via bluemira (pyproject.toml) @@ -464,7 +464,7 @@ rfc3986-validator==0.1.1 # via # jsonschema # jupyter-events -rich==13.8.0 +rich==13.9.2 # via # bluemira (pyproject.toml) # meshio @@ -472,9 +472,9 @@ rpds-py==0.20.0 # via # jsonschema # referencing -ruff==0.6.4 +ruff==0.7.0 # via bluemira (pyproject.toml) -scikit-learn==1.5.1 +scikit-learn==1.5.2 # via bluemira (pyproject.toml) scipy==1.10.1 # via @@ -489,7 +489,7 @@ seaborn==0.13.2 # via bluemira (pyproject.toml) send2trash==1.8.3 # via jupyter-server -setuptools==74.1.2 +setuptools==75.2.0 # via jupyterlab six==1.16.0 # via @@ -506,7 +506,7 @@ snowballstemmer==2.2.0 # via sphinx soupsieve==2.6 # via beautifulsoup4 -sphinx==7.4.7 +sphinx==8.1.3 # via # bluemira (pyproject.toml) # myst-nb @@ -515,11 +515,11 @@ sphinx==7.4.7 # sphinx-copybutton # sphinx-rtd-theme # sphinxcontrib-jquery -sphinx-autoapi==3.3.1 +sphinx-autoapi==3.3.2 # via bluemira (pyproject.toml) sphinx-copybutton==0.5.2 # via bluemira (pyproject.toml) -sphinx-rtd-theme==2.0.0 +sphinx-rtd-theme==3.0.1 # via bluemira (pyproject.toml) sphinxcontrib-applehelp==2.0.0 # via sphinx @@ -535,11 +535,11 @@ sphinxcontrib-qthelp==2.0.0 # via sphinx sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlalchemy==2.0.34 +sqlalchemy==2.0.36 # via jupyter-cache stack-data==0.6.3 # via ipython -sybil==6.1.1 +sybil==8.0.0 # via bluemira (pyproject.toml) tables==3.10.1 # via @@ -557,7 +557,7 @@ threadpoolctl==3.5.0 # via scikit-learn tinycss2==1.3.0 # via nbconvert -tomli==2.0.1 +tomli==2.0.2 # via # coverage # jupyterlab @@ -589,7 +589,7 @@ traitlets==5.14.3 # nbformat typeguard==4.3.0 # via bluemira (pyproject.toml) -types-python-dateutil==2.9.0.20240906 +types-python-dateutil==2.9.0.20241003 # via arrow typing-extensions==4.12.2 # via @@ -603,16 +603,17 @@ typing-extensions==4.12.2 # myst-nb # pint # pyvista + # rich # sqlalchemy # tables # typeguard -tzdata==2024.1 +tzdata==2024.2 # via pandas uri-template==1.3.0 # via jsonschema -urllib3==2.2.2 +urllib3==2.2.3 # via requests -virtualenv==20.26.4 +virtualenv==20.27.0 # via pre-commit vtk==9.2.6 # via @@ -628,5 +629,5 @@ webencodings==0.5.1 # tinycss2 websocket-client==1.8.0 # via jupyter-server -zipp==3.20.1 +zipp==3.20.2 # via importlib-metadata diff --git a/requirements/uv/base.txt b/requirements/uv/base.txt index 85a8150127..6e66b6e281 100644 --- a/requirements/uv/base.txt +++ b/requirements/uv/base.txt @@ -4,7 +4,7 @@ anytree==2.12.1 # via bluemira (pyproject.toml) appdirs==1.4.4 # via pint -asteval==1.0.2 +asteval==1.0.5 # via # bluemira (pyproject.toml) # neutronics-material-maker @@ -14,7 +14,7 @@ blosc2==2.7.1 # via tables certifi==2024.8.30 # via requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via bluemira (pyproject.toml) @@ -32,7 +32,7 @@ flexcache==0.3 # via pint flexparser==0.3.1 # via pint -fonttools==4.53.1 +fonttools==4.54.1 # via matplotlib fortranformat==2.0.0 # via @@ -40,9 +40,9 @@ fortranformat==2.0.0 # eqdsk gmsh==4.13.1 # via bluemira (pyproject.toml) -idna==3.8 +idna==3.10 # via requests -imageio==2.35.1 +imageio==2.36.0 # via bluemira (pyproject.toml) joblib==1.4.2 # via scikit-learn @@ -62,11 +62,11 @@ mdurl==0.1.2 # via markdown-it-py meshio==5.3.5 # via bluemira (pyproject.toml) -msgpack==1.0.8 +msgpack==1.1.0 # via blosc2 -ndindex==1.8 +ndindex==1.9.2 # via blosc2 -neutronics-material-maker==1.2.0 +neutronics-material-maker==1.2.1 # via bluemira (pyproject.toml) nlopt==2.7.1 # via bluemira (pyproject.toml) @@ -105,20 +105,20 @@ packaging==24.1 # matplotlib # pooch # tables -pandas==2.2.2 +pandas==2.2.3 # via # pypet # seaborn periodictable==1.7.1 # via bluemira (pyproject.toml) -pillow==10.4.0 +pillow==11.0.0 # via # imageio # matplotlib # pyvista pint==0.24.3 # via bluemira (pyproject.toml) -platformdirs==4.3.2 +platformdirs==4.3.6 # via pooch pooch==1.8.2 # via pyvista @@ -126,11 +126,11 @@ py-cpuinfo==9.0.0 # via # blosc2 # tables -pyclipper==1.3.0.post5 +pyclipper==1.3.0.post6 # via bluemira (pyproject.toml) pygments==2.18.0 # via rich -pyparsing==3.1.4 +pyparsing==3.2.0 # via # matplotlib # periodictable @@ -140,17 +140,17 @@ python-dateutil==2.9.0.post0 # via # matplotlib # pandas -pytz==2024.1 +pytz==2024.2 # via pandas pyvista==0.44.1 # via bluemira (pyproject.toml) requests==2.32.3 # via pooch -rich==13.8.0 +rich==13.9.2 # via # bluemira (pyproject.toml) # meshio -scikit-learn==1.5.1 +scikit-learn==1.5.2 # via bluemira (pyproject.toml) scipy==1.10.1 # via @@ -182,11 +182,12 @@ typing-extensions==4.12.2 # flexparser # pint # pyvista + # rich # tables # typeguard -tzdata==2024.1 +tzdata==2024.2 # via pandas -urllib3==2.2.2 +urllib3==2.2.3 # via requests vtk==9.2.6 # via diff --git a/requirements/uv/develop.txt b/requirements/uv/develop.txt index 8512164b7b..066c50e9eb 100644 --- a/requirements/uv/develop.txt +++ b/requirements/uv/develop.txt @@ -1,16 +1,16 @@ # This file was autogenerated by uv via the following command: # uv pip compile pyproject.toml --python-version=3.10 --extra pinned -o requirements/uv/develop.txt --extra dev -alabaster==0.7.16 +alabaster==1.0.0 # via sphinx anytree==2.12.1 # via bluemira (pyproject.toml) appdirs==1.4.4 # via pint -asteval==1.0.2 +asteval==1.0.5 # via # bluemira (pyproject.toml) # neutronics-material-maker -astroid==3.3.2 +astroid==3.3.5 # via sphinx-autoapi asttokens==2.4.1 # via stack-data @@ -29,7 +29,7 @@ certifi==2024.8.30 # via requests cfgv==3.4.0 # via pre-commit -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via @@ -43,17 +43,17 @@ contourpy==1.3.0 # matplotlib coolprop==6.6.0 # via bluemira (pyproject.toml) -coverage==7.6.1 +coverage==7.6.4 # via pytest-cov cycler==0.12.1 # via matplotlib -debugpy==1.8.5 +debugpy==1.8.7 # via ipykernel decorator==5.1.1 # via ipython -distlib==0.3.8 +distlib==0.3.9 # via virtualenv -docutils==0.20.1 +docutils==0.21.2 # via # myst-parser # sphinx @@ -68,13 +68,13 @@ executing==2.1.0 # via stack-data fastjsonschema==2.20.0 # via nbformat -filelock==3.16.0 +filelock==3.16.1 # via virtualenv flexcache==0.3 # via pint flexparser==0.3.1 # via pint -fonttools==4.53.1 +fonttools==4.54.1 # via matplotlib fortranformat==2.0.0 # via @@ -82,17 +82,17 @@ fortranformat==2.0.0 # eqdsk gmsh==4.13.1 # via bluemira (pyproject.toml) -greenlet==3.0.3 +greenlet==3.1.1 # via sqlalchemy -identify==2.6.0 +identify==2.6.1 # via pre-commit -idna==3.8 +idna==3.10 # via requests -imageio==2.35.1 +imageio==2.36.0 # via bluemira (pyproject.toml) imagesize==1.4.1 # via sphinx -importlib-metadata==8.4.0 +importlib-metadata==8.5.0 # via # jupyter-cache # myst-nb @@ -100,7 +100,7 @@ iniconfig==2.0.0 # via pytest ipykernel==6.29.5 # via myst-nb -ipython==8.27.0 +ipython==8.28.0 # via # ipykernel # myst-nb @@ -116,11 +116,11 @@ joblib==1.4.2 # via scikit-learn jsonschema==4.23.0 # via nbformat -jsonschema-specifications==2023.12.1 +jsonschema-specifications==2024.10.1 # via jsonschema jupyter-cache==1.0.0 # via myst-nb -jupyter-client==8.6.2 +jupyter-client==8.6.3 # via # ipykernel # nbclient @@ -142,7 +142,7 @@ markdown-it-py==3.0.0 # mdit-py-plugins # myst-parser # rich -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 matplotlib==3.9.2 # via @@ -154,7 +154,7 @@ matplotlib-inline==0.1.7 # via # ipykernel # ipython -mdit-py-plugins==0.4.1 +mdit-py-plugins==0.4.2 # via # jupytext # myst-parser @@ -162,9 +162,9 @@ mdurl==0.1.2 # via markdown-it-py meshio==5.3.5 # via bluemira (pyproject.toml) -msgpack==1.0.8 +msgpack==1.1.0 # via blosc2 -mypy==1.11.2 +mypy==1.12.1 # via bluemira (pyproject.toml) mypy-extensions==1.0.0 # via mypy @@ -182,11 +182,11 @@ nbformat==5.10.4 # jupytext # myst-nb # nbclient -ndindex==1.8 +ndindex==1.9.2 # via blosc2 nest-asyncio==1.6.0 # via ipykernel -neutronics-material-maker==1.2.0 +neutronics-material-maker==1.2.1 # via bluemira (pyproject.toml) nlopt==2.7.1 # via bluemira (pyproject.toml) @@ -231,7 +231,7 @@ packaging==24.1 # pytest # sphinx # tables -pandas==2.2.2 +pandas==2.2.3 # via # pypet # seaborn @@ -241,14 +241,14 @@ periodictable==1.7.1 # via bluemira (pyproject.toml) pexpect==4.9.0 # via ipython -pillow==10.4.0 +pillow==11.0.0 # via # imageio # matplotlib # pyvista pint==0.24.3 # via bluemira (pyproject.toml) -platformdirs==4.3.2 +platformdirs==4.3.6 # via # jupyter-core # pooch @@ -257,11 +257,11 @@ pluggy==1.5.0 # via pytest pooch==1.8.2 # via pyvista -pre-commit==3.8.0 +pre-commit==4.0.1 # via bluemira (pyproject.toml) -prompt-toolkit==3.0.47 +prompt-toolkit==3.0.48 # via ipython -psutil==6.0.0 +psutil==6.1.0 # via ipykernel ptyprocess==0.7.0 # via pexpect @@ -271,20 +271,20 @@ py-cpuinfo==9.0.0 # via # blosc2 # tables -pyclipper==1.3.0.post5 +pyclipper==1.3.0.post6 # via bluemira (pyproject.toml) pygments==2.18.0 # via # ipython # rich # sphinx -pyparsing==3.1.4 +pyparsing==3.2.0 # via # matplotlib # periodictable pypet==0.6.1 # via bluemira (pyproject.toml) -pytest==8.3.2 +pytest==8.3.3 # via # bluemira (pyproject.toml) # pytest-cov @@ -307,7 +307,7 @@ python-dateutil==2.9.0.post0 # jupyter-client # matplotlib # pandas -pytz==2024.1 +pytz==2024.2 # via pandas pyvista==0.44.1 # via bluemira (pyproject.toml) @@ -331,7 +331,7 @@ requests==2.32.3 # via # pooch # sphinx -rich==13.8.0 +rich==13.9.2 # via # bluemira (pyproject.toml) # meshio @@ -339,9 +339,9 @@ rpds-py==0.20.0 # via # jsonschema # referencing -ruff==0.6.4 +ruff==0.7.0 # via bluemira (pyproject.toml) -scikit-learn==1.5.1 +scikit-learn==1.5.2 # via bluemira (pyproject.toml) scipy==1.10.1 # via @@ -360,7 +360,7 @@ six==1.16.0 # python-dateutil snowballstemmer==2.2.0 # via sphinx -sphinx==7.4.7 +sphinx==8.1.3 # via # bluemira (pyproject.toml) # myst-nb @@ -369,11 +369,11 @@ sphinx==7.4.7 # sphinx-copybutton # sphinx-rtd-theme # sphinxcontrib-jquery -sphinx-autoapi==3.3.1 +sphinx-autoapi==3.3.2 # via bluemira (pyproject.toml) sphinx-copybutton==0.5.2 # via bluemira (pyproject.toml) -sphinx-rtd-theme==2.0.0 +sphinx-rtd-theme==3.0.1 # via bluemira (pyproject.toml) sphinxcontrib-applehelp==2.0.0 # via sphinx @@ -389,11 +389,11 @@ sphinxcontrib-qthelp==2.0.0 # via sphinx sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlalchemy==2.0.34 +sqlalchemy==2.0.36 # via jupyter-cache stack-data==0.6.3 # via ipython -sybil==6.1.1 +sybil==8.0.0 # via bluemira (pyproject.toml) tables==3.10.1 # via @@ -405,7 +405,7 @@ tabulate==0.9.0 # jupyter-cache threadpoolctl==3.5.0 # via scikit-learn -tomli==2.0.1 +tomli==2.0.2 # via # coverage # jupytext @@ -438,14 +438,15 @@ typing-extensions==4.12.2 # myst-nb # pint # pyvista + # rich # sqlalchemy # tables # typeguard -tzdata==2024.1 +tzdata==2024.2 # via pandas -urllib3==2.2.2 +urllib3==2.2.3 # via requests -virtualenv==20.26.4 +virtualenv==20.27.0 # via pre-commit vtk==9.2.6 # via @@ -453,5 +454,5 @@ vtk==9.2.6 # pyvista wcwidth==0.2.13 # via prompt-toolkit -zipp==3.20.1 +zipp==3.20.2 # via importlib-metadata diff --git a/requirements/uv/examples.txt b/requirements/uv/examples.txt index dabdacaf15..b4fb6ea3d2 100644 --- a/requirements/uv/examples.txt +++ b/requirements/uv/examples.txt @@ -1,6 +1,6 @@ # This file was autogenerated by uv via the following command: # uv pip compile pyproject.toml --python-version=3.10 --extra pinned -o requirements/uv/examples.txt --extra examples -anyio==4.4.0 +anyio==4.6.2.post1 # via # httpx # jupyter-server @@ -14,7 +14,7 @@ argon2-cffi-bindings==21.2.0 # via argon2-cffi arrow==1.3.0 # via isoduration -asteval==1.0.2 +asteval==1.0.5 # via # bluemira (pyproject.toml) # neutronics-material-maker @@ -43,7 +43,7 @@ certifi==2024.8.30 # requests cffi==1.17.1 # via argon2-cffi-bindings -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via bluemira (pyproject.toml) @@ -57,7 +57,7 @@ coolprop==6.6.0 # via bluemira (pyproject.toml) cycler==0.12.1 # via matplotlib -debugpy==1.8.5 +debugpy==1.8.7 # via ipykernel decorator==5.1.1 # via ipython @@ -77,7 +77,7 @@ flexcache==0.3 # via pint flexparser==0.3.1 # via pint -fonttools==4.53.1 +fonttools==4.54.1 # via matplotlib fortranformat==2.0.0 # via @@ -89,21 +89,21 @@ gmsh==4.13.1 # via bluemira (pyproject.toml) h11==0.14.0 # via httpcore -httpcore==1.0.5 +httpcore==1.0.6 # via httpx httpx==0.27.2 # via jupyterlab -idna==3.8 +idna==3.10 # via # anyio # httpx # jsonschema # requests -imageio==2.35.1 +imageio==2.36.0 # via bluemira (pyproject.toml) ipykernel==6.29.5 # via jupyterlab -ipython==8.27.0 +ipython==8.28.0 # via ipykernel isoduration==20.11.0 # via jsonschema @@ -126,9 +126,9 @@ jsonschema==4.23.0 # jupyter-events # jupyterlab-server # nbformat -jsonschema-specifications==2023.12.1 +jsonschema-specifications==2024.10.1 # via jsonschema -jupyter-client==8.6.2 +jupyter-client==8.6.3 # via # ipykernel # jupyter-server @@ -174,7 +174,7 @@ markdown-it-py==3.0.0 # jupytext # mdit-py-plugins # rich -markupsafe==2.1.5 +markupsafe==3.0.2 # via # jinja2 # nbconvert @@ -188,7 +188,7 @@ matplotlib-inline==0.1.7 # via # ipykernel # ipython -mdit-py-plugins==0.4.1 +mdit-py-plugins==0.4.2 # via jupytext mdurl==0.1.2 # via markdown-it-py @@ -196,7 +196,7 @@ meshio==5.3.5 # via bluemira (pyproject.toml) mistune==3.0.2 # via nbconvert -msgpack==1.0.8 +msgpack==1.1.0 # via blosc2 nbclient==0.10.0 # via nbconvert @@ -208,11 +208,11 @@ nbformat==5.10.4 # jupytext # nbclient # nbconvert -ndindex==1.8 +ndindex==1.9.2 # via blosc2 nest-asyncio==1.6.0 # via ipykernel -neutronics-material-maker==1.2.0 +neutronics-material-maker==1.2.1 # via bluemira (pyproject.toml) nlopt==2.7.1 # via bluemira (pyproject.toml) @@ -265,7 +265,7 @@ packaging==24.1 # nbconvert # pooch # tables -pandas==2.2.2 +pandas==2.2.3 # via # pypet # seaborn @@ -277,24 +277,24 @@ periodictable==1.7.1 # via bluemira (pyproject.toml) pexpect==4.9.0 # via ipython -pillow==10.4.0 +pillow==11.0.0 # via # imageio # matplotlib # pyvista pint==0.24.3 # via bluemira (pyproject.toml) -platformdirs==4.3.2 +platformdirs==4.3.6 # via # jupyter-core # pooch pooch==1.8.2 # via pyvista -prometheus-client==0.20.0 +prometheus-client==0.21.0 # via jupyter-server -prompt-toolkit==3.0.47 +prompt-toolkit==3.0.48 # via ipython -psutil==6.0.0 +psutil==6.1.0 # via ipykernel ptyprocess==0.7.0 # via @@ -306,7 +306,7 @@ py-cpuinfo==9.0.0 # via # blosc2 # tables -pyclipper==1.3.0.post5 +pyclipper==1.3.0.post6 # via bluemira (pyproject.toml) pycparser==2.22 # via cffi @@ -315,7 +315,7 @@ pygments==2.18.0 # ipython # nbconvert # rich -pyparsing==3.1.4 +pyparsing==3.2.0 # via # matplotlib # periodictable @@ -329,7 +329,7 @@ python-dateutil==2.9.0.post0 # pandas python-json-logger==2.0.7 # via jupyter-events -pytz==2024.1 +pytz==2024.2 # via pandas pyvista==0.44.1 # via bluemira (pyproject.toml) @@ -359,7 +359,7 @@ rfc3986-validator==0.1.1 # via # jsonschema # jupyter-events -rich==13.8.0 +rich==13.9.2 # via # bluemira (pyproject.toml) # meshio @@ -367,7 +367,7 @@ rpds-py==0.20.0 # via # jsonschema # referencing -scikit-learn==1.5.1 +scikit-learn==1.5.2 # via bluemira (pyproject.toml) scipy==1.10.1 # via @@ -381,7 +381,7 @@ seaborn==0.13.2 # via bluemira (pyproject.toml) send2trash==1.8.3 # via jupyter-server -setuptools==74.1.2 +setuptools==75.2.0 # via jupyterlab six==1.16.0 # via @@ -412,7 +412,7 @@ threadpoolctl==3.5.0 # via scikit-learn tinycss2==1.3.0 # via nbconvert -tomli==2.0.1 +tomli==2.0.2 # via # jupyterlab # jupytext @@ -440,7 +440,7 @@ traitlets==5.14.3 # nbformat typeguard==4.3.0 # via bluemira (pyproject.toml) -types-python-dateutil==2.9.0.20240906 +types-python-dateutil==2.9.0.20241003 # via arrow typing-extensions==4.12.2 # via @@ -451,13 +451,14 @@ typing-extensions==4.12.2 # ipython # pint # pyvista + # rich # tables # typeguard -tzdata==2024.1 +tzdata==2024.2 # via pandas uri-template==1.3.0 # via jsonschema -urllib3==2.2.2 +urllib3==2.2.3 # via requests vtk==9.2.6 # via diff --git a/tests/base/parameterframe/test_parameterframe.py b/tests/base/parameterframe/test_parameterframe.py index 63dae01853..0316c24808 100644 --- a/tests/base/parameterframe/test_parameterframe.py +++ b/tests/base/parameterframe/test_parameterframe.py @@ -144,7 +144,8 @@ class BadFrame(ParameterFrame): def test_a_default_frame_is_empty(self): @dataclass - class GenericFrame(ParameterFrame): ... + class GenericFrame(ParameterFrame): + """Empty""" assert len(GenericFrame().to_dict()) == 0 diff --git a/tests/utilities/test_tools.py b/tests/utilities/test_tools.py index 2177111c50..04fe4f3801 100644 --- a/tests/utilities/test_tools.py +++ b/tests/utilities/test_tools.py @@ -7,6 +7,7 @@ import copy import filecmp import json +import string from pathlib import Path from unittest.mock import patch @@ -64,7 +65,7 @@ def test_is_num(): class TestAsciiStr: def test_asciistr(self): - alphabet = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + alphabet = string.ascii_letters for i in range(52): assert asciistr(i + 1) == alphabet[: i + 1]