Skip to content

Commit

Permalink
Dependency update after v2.0.0 (#3278)
Browse files Browse the repository at this point in the history
* Bump ipython from 8.22.2 to 8.23.0 (#3143)

Bumps [ipython](https://github.com/ipython/ipython) from 8.22.2 to 8.23.0.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](ipython/ipython@8.22.2...8.23.0)

---
updated-dependencies:
- dependency-name: ipython
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pybind11-global from 2.11.1 to 2.12.0 (#3145)

Bumps [pybind11-global](https://github.com/pybind/pybind11) from 2.11.1 to 2.12.0.
- [Release notes](https://github.com/pybind/pybind11/releases)
- [Changelog](https://github.com/pybind/pybind11/blob/master/docs/changelog.rst)
- [Commits](pybind/pybind11@v2.11.1...v2.12.0)

---
updated-dependencies:
- dependency-name: pybind11-global
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump polyscope from 2.1.0 to 2.2.1 (#3146)

Bumps [polyscope](https://github.com/nmwsharp/polyscope) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/nmwsharp/polyscope/releases)
- [Commits](nmwsharp/polyscope@v2.1.0...v2.2.1)

---
updated-dependencies:
- dependency-name: polyscope
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ipykernel from 6.29.3 to 6.29.4 (#3144)

Bumps [ipykernel](https://github.com/ipython/ipykernel) from 6.29.3 to 6.29.4.
- [Release notes](https://github.com/ipython/ipykernel/releases)
- [Changelog](https://github.com/ipython/ipykernel/blob/v6.29.4/CHANGELOG.md)
- [Commits](ipython/ipykernel@v6.29.3...v6.29.4)

---
updated-dependencies:
- dependency-name: ipykernel
  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.11.1 to 2.12.0 (#3147)

Bumps [pybind11](https://github.com/pybind/pybind11) from 2.11.1 to 2.12.0.
- [Release notes](https://github.com/pybind/pybind11/releases)
- [Changelog](https://github.com/pybind/pybind11/blob/master/docs/changelog.rst)
- [Commits](pybind/pybind11@v2.11.1...v2.12.0)

---
updated-dependencies:
- dependency-name: pybind11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pycparser from 2.21 to 2.22 (#3148)

Bumps [pycparser](https://github.com/eliben/pycparser) from 2.21 to 2.22.
- [Release notes](https://github.com/eliben/pycparser/releases)
- [Changelog](https://github.com/eliben/pycparser/blob/main/CHANGES)
- [Commits](eliben/pycparser@release_v2.21...release_v2.22)

---
updated-dependencies:
- dependency-name: pycparser
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ruff from 0.3.4 to 0.3.5 (#3149)

* Bump ruff from 0.3.4 to 0.3.5

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.3.4 to 0.3.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@v0.3.4...v0.3.5)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* 🚨 Ruff 0.3.5

---------

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>

* Bump contourpy from 1.2.0 to 1.2.1 (#3157)

Bumps [contourpy](https://github.com/contourpy/contourpy) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/contourpy/contourpy/releases)
- [Changelog](https://github.com/contourpy/contourpy/blob/v1.2.1/docs/changelog.rst)
- [Commits](contourpy/contourpy@v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: contourpy
  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 send2trash from 1.8.2 to 1.8.3 (#3158)

Bumps [send2trash](https://github.com/arsenetar/send2trash) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/arsenetar/send2trash/releases)
- [Changelog](https://github.com/arsenetar/send2trash/blob/master/CHANGES.rst)
- [Commits](https://github.com/arsenetar/send2trash/commits)

---
updated-dependencies:
- dependency-name: send2trash
  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 parso from 0.8.3 to 0.8.4 (#3156)

Bumps [parso](https://github.com/davidhalter/parso) from 0.8.3 to 0.8.4.
- [Changelog](https://github.com/davidhalter/parso/blob/v0.8.4/CHANGELOG.rst)
- [Commits](davidhalter/parso@v0.8.3...v0.8.4)

---
updated-dependencies:
- dependency-name: parso
  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 numexpr from 2.9.0 to 2.10.0 (#3155)

Bumps [numexpr](https://github.com/pydata/numexpr) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/pydata/numexpr/releases)
- [Changelog](https://github.com/pydata/numexpr/blob/master/RELEASE_NOTES.rst)
- [Commits](pydata/numexpr@v2.9.0...v2.10.0)

---
updated-dependencies:
- dependency-name: numexpr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump fonttools from 4.50.0 to 4.51.0 (#3160)

Bumps [fonttools](https://github.com/fonttools/fonttools) from 4.50.0 to 4.51.0.
- [Release notes](https://github.com/fonttools/fonttools/releases)
- [Changelog](https://github.com/fonttools/fonttools/blob/main/NEWS.rst)
- [Commits](fonttools/fonttools@4.50.0...4.51.0)

---
updated-dependencies:
- dependency-name: fonttools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump typing-extensions from 4.10.0 to 4.11.0 (#3164)

Bumps [typing-extensions](https://github.com/python/typing_extensions) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/python/typing_extensions/releases)
- [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md)
- [Commits](python/typing_extensions@4.10.0...4.11.0)

---
updated-dependencies:
- dependency-name: typing-extensions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump matplotlib from 3.8.3 to 3.8.4 (#3163)

Bumps [matplotlib](https://github.com/matplotlib/matplotlib) from 3.8.3 to 3.8.4.
- [Release notes](https://github.com/matplotlib/matplotlib/releases)
- [Commits](matplotlib/matplotlib@v3.8.3...v3.8.4)

---
updated-dependencies:
- dependency-name: matplotlib
  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 pyvista from 0.43.4 to 0.43.5 (#3162)

Bumps [pyvista](https://github.com/pyvista/pyvista) from 0.43.4 to 0.43.5.
- [Release notes](https://github.com/pyvista/pyvista/releases)
- [Commits](pyvista/pyvista@v0.43.4...v0.43.5)

---
updated-dependencies:
- dependency-name: pyvista
  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 nbformat from 5.10.3 to 5.10.4 (#3161)

Bumps [nbformat](https://github.com/jupyter/nbformat) from 5.10.3 to 5.10.4.
- [Release notes](https://github.com/jupyter/nbformat/releases)
- [Changelog](https://github.com/jupyter/nbformat/blob/main/CHANGELOG.md)
- [Commits](jupyter/nbformat@v5.10.3...v5.10.4)

---
updated-dependencies:
- dependency-name: nbformat
  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 myst-nb from 1.0.0 to 1.1.0 (#3177)

Bumps [myst-nb](https://github.com/executablebooks/myst-nb) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/executablebooks/myst-nb/releases)
- [Changelog](https://github.com/executablebooks/MyST-NB/blob/master/CHANGELOG.md)
- [Commits](executablebooks/MyST-NB@v1.0.0...v1.1.0)

---
updated-dependencies:
- dependency-name: myst-nb
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump scikit-learn from 1.4.1.post1 to 1.4.2 (#3178)

Bumps [scikit-learn](https://github.com/scikit-learn/scikit-learn) from 1.4.1.post1 to 1.4.2.
- [Release notes](https://github.com/scikit-learn/scikit-learn/releases)
- [Commits](scikit-learn/scikit-learn@1.4.1.post1...1.4.2)

---
updated-dependencies:
- dependency-name: scikit-learn
  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 h5py from 3.10.0 to 3.11.0 (#3179)

Bumps [h5py](https://github.com/h5py/h5py) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/h5py/h5py/releases)
- [Changelog](https://github.com/h5py/h5py/blob/master/docs/release_guide.rst)
- [Commits](h5py/h5py@3.10.0...3.11.0)

---
updated-dependencies:
- dependency-name: h5py
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump filelock from 3.13.3 to 3.13.4 (#3181)

Bumps [filelock](https://github.com/tox-dev/py-filelock) from 3.13.3 to 3.13.4.
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst)
- [Commits](tox-dev/filelock@3.13.3...3.13.4)

---
updated-dependencies:
- dependency-name: filelock
  dependency-type: direct:development
  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 pandas from 2.2.1 to 2.2.2 (#3182)

Bumps [pandas](https://github.com/pandas-dev/pandas) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/pandas-dev/pandas/releases)
- [Commits](pandas-dev/pandas@v2.2.1...v2.2.2)

---
updated-dependencies:
- dependency-name: pandas
  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 joblib from 1.3.2 to 1.4.0 (#3183)

Bumps [joblib](https://github.com/joblib/joblib) from 1.3.2 to 1.4.0.
- [Release notes](https://github.com/joblib/joblib/releases)
- [Changelog](https://github.com/joblib/joblib/blob/main/CHANGES.rst)
- [Commits](joblib/joblib@1.3.2...1.4.0)

---
updated-dependencies:
- dependency-name: joblib
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pyzmq from 25.1.2 to 26.0.0 (#3184)

Bumps [pyzmq](https://github.com/zeromq/pyzmq) from 25.1.2 to 26.0.0.
- [Release notes](https://github.com/zeromq/pyzmq/releases)
- [Commits](zeromq/pyzmq@v25.1.2...v26.0.0)

---
updated-dependencies:
- dependency-name: pyzmq
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump virtualenv from 20.25.1 to 20.25.3 (#3202)

Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.25.1 to 20.25.3.
- [Release notes](https://github.com/pypa/virtualenv/releases)
- [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst)
- [Commits](pypa/virtualenv@20.25.1...20.25.3)

---
updated-dependencies:
- dependency-name: virtualenv
  dependency-type: direct:development
  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 imageio from 2.34.0 to 2.34.1 (#3198)

Bumps [imageio](https://github.com/imageio/imageio) from 2.34.0 to 2.34.1.
- [Release notes](https://github.com/imageio/imageio/releases)
- [Changelog](https://github.com/imageio/imageio/blob/master/CHANGELOG.md)
- [Commits](imageio/imageio@v2.34.0...v2.34.1)

---
updated-dependencies:
- dependency-name: imageio
  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 pluggy from 1.4.0 to 1.5.0 (#3199)

Bumps [pluggy](https://github.com/pytest-dev/pluggy) from 1.4.0 to 1.5.0.
- [Changelog](https://github.com/pytest-dev/pluggy/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pluggy@1.4.0...1.5.0)

---
updated-dependencies:
- dependency-name: pluggy
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump traitlets from 5.14.2 to 5.14.3 (#3200)

Bumps [traitlets](https://github.com/ipython/traitlets) from 5.14.2 to 5.14.3.
- [Release notes](https://github.com/ipython/traitlets/releases)
- [Changelog](https://github.com/ipython/traitlets/blob/main/CHANGELOG.md)
- [Commits](ipython/traitlets@v5.14.2...v5.14.3)

---
updated-dependencies:
- dependency-name: traitlets
  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 notebook from 7.1.2 to 7.1.3 (#3201)

Bumps [notebook](https://github.com/jupyter/notebook) from 7.1.2 to 7.1.3.
- [Release notes](https://github.com/jupyter/notebook/releases)
- [Changelog](https://github.com/jupyter/notebook/blob/@jupyter-notebook/tree@7.1.3/CHANGELOG.md)
- [Commits](https://github.com/jupyter/notebook/compare/@jupyter-notebook/tree@7.1.2...@jupyter-notebook/tree@7.1.3)

---
updated-dependencies:
- dependency-name: notebook
  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 matplotlib-inline from 0.1.6 to 0.1.7 (#3203)

Bumps [matplotlib-inline](https://github.com/ipython/matplotlib-inline) from 0.1.6 to 0.1.7.
- [Commits](ipython/matplotlib-inline@0.1.6...0.1.7)

---
updated-dependencies:
- dependency-name: matplotlib-inline
  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 identify from 2.5.35 to 2.5.36 (#3205)

Bumps [identify](https://github.com/pre-commit/identify) from 2.5.35 to 2.5.36.
- [Commits](pre-commit/identify@v2.5.35...v2.5.36)

---
updated-dependencies:
- dependency-name: identify
  dependency-type: direct:development
  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 pyzmq from 26.0.0 to 26.0.2 (#3204)

Bumps [pyzmq](https://github.com/zeromq/pyzmq) from 26.0.0 to 26.0.2.
- [Release notes](https://github.com/zeromq/pyzmq/releases)
- [Commits](zeromq/pyzmq@v26.0.0...v26.0.2)

---
updated-dependencies:
- dependency-name: pyzmq
  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 sphinx from 7.2.6 to 7.3.7 (#3207)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 7.2.6 to 7.3.7.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst)
- [Commits](sphinx-doc/sphinx@v7.2.6...v7.3.7)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ruff from 0.3.5 to 0.4.1 (#3206)

* Bump ruff from 0.3.5 to 0.4.1

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.3.5 to 0.4.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@v0.3.5...v0.4.1)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* 🚨 Safe fixes

* 🚨 More manual fixes

* 🚨 Pre-commit and safe fixes

* 🚨 Ruff 0.4.1 fixes

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Oliver Funk <oli.funk@gmail.com>
Co-authored-by: james <james.cook1@ukaea.uk>

* ⬆️ Bump numba-scipy from 1e2f224 to 0.4.0 (#3209)

* Bump virtualenv from 20.25.3 to 20.26.0 (#3218)

Dependabot couldn't find the original pull request head commit, 44717c2.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump gmsh-interop from 2021.1.1 to 2024.1 (#3219)

Dependabot couldn't find the original pull request head commit, 35c80eb.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump myst-parser from 2.0.0 to 3.0.1 (#3220)

Dependabot couldn't find the original pull request head commit, 992252a.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pytools from 2024.1.1 to 2024.1.2 (#3221)

Dependabot couldn't find the original pull request head commit, 8a0c9d4.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pyvista from 0.43.5 to 0.43.6 (#3222)

Dependabot couldn't find the original pull request head commit, 6e158fd.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pytest from 8.1.1 to 8.2.0 (#3223)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ipython from 8.23.0 to 8.24.0 (#3225)

Bumps [ipython](https://github.com/ipython/ipython) from 8.23.0 to 8.24.0.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](ipython/ipython@8.23.0...8.24.0)

---
updated-dependencies:
- dependency-name: ipython
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump platformdirs from 4.2.0 to 4.2.1 (#3226)

Bumps [platformdirs](https://github.com/platformdirs/platformdirs) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/platformdirs/platformdirs/releases)
- [Changelog](https://github.com/platformdirs/platformdirs/blob/main/CHANGES.rst)
- [Commits](platformdirs/platformdirs@4.2.0...4.2.1)

---
updated-dependencies:
- dependency-name: platformdirs
  dependency-type: direct:development
  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 tinycss2 from 1.2.1 to 1.3.0 (#3228)

Bumps [tinycss2](https://github.com/Kozea/tinycss2) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/Kozea/tinycss2/releases)
- [Changelog](https://github.com/Kozea/tinycss2/blob/main/docs/changelog.rst)
- [Commits](Kozea/tinycss2@v1.2.1...v1.3.0)

---
updated-dependencies:
- dependency-name: tinycss2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump coverage[toml] from 7.4.4 to 7.5.0 (#3229)

Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 7.4.4 to 7.5.0.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@7.4.4...7.5.0)

---
updated-dependencies:
- dependency-name: coverage[toml]
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ruff from 0.4.1 to 0.4.2 (#3224)

* Bump ruff from 0.4.1 to 0.4.2

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.4.1 to 0.4.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@v0.4.1...v0.4.2)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* 🚨 Ruff 0.4.2 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>

* Bump threadpoolctl from 3.4.0 to 3.5.0 (#3248)

Bumps [threadpoolctl](https://github.com/joblib/threadpoolctl) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/joblib/threadpoolctl/releases)
- [Changelog](https://github.com/joblib/threadpoolctl/blob/master/CHANGES.md)
- [Commits](joblib/threadpoolctl@3.4.0...3.5.0)

---
updated-dependencies:
- dependency-name: threadpoolctl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jsonschema from 4.21.1 to 4.22.0 (#3246)

Bumps [jsonschema](https://github.com/python-jsonschema/jsonschema) from 4.21.1 to 4.22.0.
- [Release notes](https://github.com/python-jsonschema/jsonschema/releases)
- [Changelog](https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst)
- [Commits](python-jsonschema/jsonschema@v4.21.1...v4.22.0)

---
updated-dependencies:
- dependency-name: jsonschema
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump joblib from 1.4.0 to 1.4.2 (#3245)

Bumps [joblib](https://github.com/joblib/joblib) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/joblib/joblib/releases)
- [Changelog](https://github.com/joblib/joblib/blob/main/CHANGES.rst)
- [Commits](joblib/joblib@1.4.0...1.4.2)

---
updated-dependencies:
- dependency-name: joblib
  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.4.2 to 0.4.3 (#3247)

* Bump ruff from 0.4.2 to 0.4.3

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.4.2 to 0.4.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@v0.4.2...v0.4.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* 🚨 Ruff 0.4.3 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>

* Bump jupytext from 1.16.1 to 1.16.2 (#3256)

Bumps [jupytext](https://github.com/mwouts/jupytext) from 1.16.1 to 1.16.2.
- [Release notes](https://github.com/mwouts/jupytext/releases)
- [Changelog](https://github.com/mwouts/jupytext/blob/main/CHANGELOG.md)
- [Commits](mwouts/jupytext@v1.16.1...v1.16.2)

---
updated-dependencies:
- dependency-name: jupytext
  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 virtualenv from 20.26.0 to 20.26.1 (#3255)

Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.26.0 to 20.26.1.
- [Release notes](https://github.com/pypa/virtualenv/releases)
- [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst)
- [Commits](pypa/virtualenv@20.26.0...20.26.1)

---
updated-dependencies:
- dependency-name: virtualenv
  dependency-type: direct:development
  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 pygments from 2.17.2 to 2.18.0 (#3253)

Bumps [pygments](https://github.com/pygments/pygments) from 2.17.2 to 2.18.0.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](pygments/pygments@2.17.2...2.18.0)

---
updated-dependencies:
- dependency-name: pygments
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump filelock from 3.13.4 to 3.14.0 (#3252)

Bumps [filelock](https://github.com/tox-dev/py-filelock) from 3.13.4 to 3.14.0.
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst)
- [Commits](tox-dev/filelock@3.13.4...3.14.0)

---
updated-dependencies:
- dependency-name: filelock
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pyvista from 0.43.6 to 0.43.7 (#3258)

Bumps [pyvista](https://github.com/pyvista/pyvista) from 0.43.6 to 0.43.7.
- [Release notes](https://github.com/pyvista/pyvista/releases)
- [Commits](pyvista/pyvista@v0.43.6...v0.43.7)

---
updated-dependencies:
- dependency-name: pyvista
  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 pyzmq from 26.0.2 to 26.0.3 (#3262)

Bumps [pyzmq](https://github.com/zeromq/pyzmq) from 26.0.2 to 26.0.3.
- [Release notes](https://github.com/zeromq/pyzmq/releases)
- [Commits](zeromq/pyzmq@v26.0.2...v26.0.3)

---
updated-dependencies:
- dependency-name: pyzmq
  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 sqlalchemy from 2.0.29 to 2.0.30 (#3261)

Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 2.0.29 to 2.0.30.
- [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases)
- [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/main/CHANGES.rst)
- [Commits](https://github.com/sqlalchemy/sqlalchemy/commits)

---
updated-dependencies:
- dependency-name: sqlalchemy
  dependency-type: direct:development
  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 babel from 2.14.0 to 2.15.0 (#3260)

Bumps [babel](https://github.com/python-babel/babel) from 2.14.0 to 2.15.0.
- [Release notes](https://github.com/python-babel/babel/releases)
- [Changelog](https://github.com/python-babel/babel/blob/master/CHANGES.rst)
- [Commits](python-babel/babel@v2.14.0...v2.15.0)

---
updated-dependencies:
- dependency-name: babel
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump nbconvert from 7.16.3 to 7.16.4 (#3259)

Bumps [nbconvert](https://github.com/jupyter/nbconvert) from 7.16.3 to 7.16.4.
- [Release notes](https://github.com/jupyter/nbconvert/releases)
- [Changelog](https://github.com/jupyter/nbconvert/blob/main/CHANGELOG.md)
- [Commits](jupyter/nbconvert@v7.16.3...v7.16.4)

---
updated-dependencies:
- dependency-name: nbconvert
  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 coverage[toml] from 7.5.0 to 7.5.1 (#3263)

Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 7.5.0 to 7.5.1.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@7.5.0...7.5.1)

---
updated-dependencies:
- dependency-name: coverage[toml]
  dependency-type: direct:development
  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 pre-commit from 3.7.0 to 3.7.1 (#3269)

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](pre-commit/pre-commit@v3.7.0...v3.7.1)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  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 astroid from 3.1.0 to 3.2.0 (#3270)

Bumps [astroid](https://github.com/pylint-dev/astroid) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/pylint-dev/astroid/releases)
- [Changelog](https://github.com/pylint-dev/astroid/blob/main/ChangeLog)
- [Commits](pylint-dev/astroid@v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: astroid
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump gmsh from 4.12.2 to 4.13.0 (#3271)

Bumps [gmsh](https://gmsh.info) from 4.12.2 to 4.13.0.

---
updated-dependencies:
- dependency-name: gmsh
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ruff from 0.4.3 to 0.4.4 (#3268)

* Bump ruff from 0.4.3 to 0.4.4

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@v0.4.3...v0.4.4)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* 👷 Update pre-commit

---------

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>

---------

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: Oliver Funk <oli.funk@gmail.com>
Co-authored-by: je-cook <81617086+je-cook@users.noreply.github.com>
  • Loading branch information
5 people committed May 15, 2024
1 parent acf9598 commit 7574352
Show file tree
Hide file tree
Showing 52 changed files with 194 additions and 234 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
exclude: test_data
Expand All @@ -12,7 +12,7 @@ repos:
exclude: test_data

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.4
rev: v0.4.4
hooks:
- id: ruff
args: [ --fix ]
Expand Down
2 changes: 1 addition & 1 deletion bluemira/base/look_and_feel.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def count_slocs(
continue

lines[".py"] += LOCAL_LINES
lines["total"] = sum([lines[k] for k in lines])
lines["total"] = sum(lines[k] for k in lines)
return lines


Expand Down
6 changes: 3 additions & 3 deletions bluemira/builders/coil_supports.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def _get_intersection_wire(self, width):
"Boolean cutting returned nothing... check your geometry please."
)

return sorted(cut_result, key=lambda wire: wire.length)[0]
return min(cut_result, key=lambda wire: wire.length)

def _make_connection_block(self, width, v1, v4, intersection_wire):
"""
Expand Down Expand Up @@ -442,9 +442,9 @@ def _get_intersecting_wire(self, v1, v2, v3, v4, angle):

cut_box = make_polygon([v1, v2, v3, v4], closed=True)

return sorted(
return min(
boolean_cut(self.tf_xz_keep_out_zone, cut_box), key=lambda wire: wire.length
)[0]
)

def _make_rib_profile(self, support_face):
# Then, project sideways to find the minimum distance from a support point
Expand Down
6 changes: 3 additions & 3 deletions bluemira/codes/_freecadapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,8 @@ def make_ellipse(
center = Base.Vector(center)
output = Part.Ellipse(s1, s2, center)

start_angle = start_angle % 360.0
end_angle = end_angle % 360.0
start_angle %= 360.0
end_angle %= 360.0

if start_angle != end_angle:
output = Part.ArcOfEllipse(
Expand Down Expand Up @@ -1805,7 +1805,7 @@ def boolean_fuse(
raise ValueError( # noqa: TRY301
f"Fuse function still not implemented for {_type} instances."
)
except Exception as e: # noqa: BLE001
except Exception as e:
raise FreeCADError(str(e)) from e


Expand Down
4 changes: 2 additions & 2 deletions bluemira/codes/plasmod/equilibrium_2d_coupling.py
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,9 @@ def calc_curr_dens_profiles(

dum2 = cumulative_trapezoid(B, psi_norm_1D, initial=0)
dum1 = np.exp(2.0 * dum2)
dum1 = dum1 / dum1[-1]
dum1 /= dum1[-1]
dum3 = cumulative_trapezoid(C / dum1, psi_norm_1D, initial=0)
dum3 = dum3 - dum3[-1]
dum3 -= dum3[-1]

y = dum1 * (dum3 + 0.5 * Fb**2)
dum2 = g2 / q3
Expand Down
3 changes: 1 addition & 2 deletions bluemira/display/auto_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ def get_figure_scale_factor(figsize):
for ds, ss in zip(dpi_size, screen_size, strict=False):
if ds > ss:
scale_temp = ss / ds
if scale_temp < sf:
sf = scale_temp
sf = min(scale_temp, sf)
return sf


Expand Down
8 changes: 4 additions & 4 deletions bluemira/equilibria/equilibrium.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,14 @@ def _get_eqdsk(
psi = e.psi
elif "SCENE" in e.name and not isinstance(cls, Breakdown):
psi = e.psi
e.dxc = e.dxc / 2
e.dzc = e.dzc / 2
e.dxc /= 2
e.dzc /= 2
elif "fiesta" in e.name.lower():
psi = e.psi
else: # CREATE
psi = e.psi / (2 * np.pi) # V.s as opposed to V.s/rad
e.dxc = e.dxc / 2
e.dzc = e.dzc / 2
e.dxc /= 2
e.dzc /= 2
e.cplasma = abs(e.cplasma)

grid = Grid.from_eqdsk(e)
Expand Down
2 changes: 1 addition & 1 deletion bluemira/equilibria/flux_surfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ def clip(self, first_wall: Coordinates):
first_wall.xz.T[fw_arg + 1],
np.array([self.x_end, self.z_end]),
):
fw_arg = fw_arg + 1
fw_arg += 1

# Relying on the fact that first wall is ccw, get the intersection angle
self.alpha = get_angle_between_points(
Expand Down
2 changes: 1 addition & 1 deletion bluemira/equilibria/num_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def adjust_currents(self, d_current: float):
"""
Adjust the currents in the virtual control coils.
"""
self.current = self.current + d_current
self.current += d_current

def stabilise(self):
"""
Expand Down
16 changes: 8 additions & 8 deletions bluemira/equilibria/optimisation/constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def __init__(
z = np.array([z])

if is_num(B_max):
B_max = B_max * np.ones(len(x))
B_max *= np.ones(len(x))
if len(B_max) != len(x):
raise ValueError(
"Maximum field vector length not equal to the number of points."
Expand All @@ -123,7 +123,7 @@ def __init__(
if tolerance is None:
tolerance = 1e-3 * B_max
if is_num(tolerance):
tolerance = tolerance * np.ones(len(x))
tolerance *= np.ones(len(x))
if len(tolerance) != len(x):
raise ValueError("Tolerance vector length not equal to the number of coils.")

Expand Down Expand Up @@ -225,7 +225,7 @@ def __init__(
):
n_coils = coilset.n_coils()
if is_num(B_max):
B_max = B_max * np.ones(n_coils)
B_max *= np.ones(n_coils)
if len(B_max) != n_coils:
raise ValueError(
"Maximum field vector length not equal to the number of coils."
Expand Down Expand Up @@ -310,7 +310,7 @@ def __init__(
* np.ones(n_f_constraints)
)
if is_num(tolerance):
tolerance = tolerance * np.ones(n_f_constraints)
tolerance *= np.ones(n_f_constraints)
elif len(tolerance) != n_f_constraints:
raise ValueError(f"Tolerance vector not of length {n_f_constraints}")

Expand Down Expand Up @@ -394,9 +394,9 @@ def __init__(
tolerance = 1e-3 if target_value == 0 else 1e-3 * target_value
if is_num(tolerance):
if f_constraint == L2NormConstraint:
tolerance = tolerance * np.ones(1)
tolerance *= np.ones(1)
else:
tolerance = tolerance * np.ones(len(self))
tolerance *= np.ones(len(self))
self.weights = weights
self._f_constraint = f_constraint
self._args = {"a_mat": None, "b_vec": None, "value": 0.0, "scale": 1.0}
Expand Down Expand Up @@ -726,7 +726,7 @@ def plot(self, ax):
ax.plot(self.x, self.z, **kwargs)


class MagneticConstraintSet(ABC):
class MagneticConstraintSet:
"""
A set of magnetic constraints to be applied to an equilibrium. The optimisation
problem is of the form:
Expand Down Expand Up @@ -791,7 +791,7 @@ def __len__(self) -> int:
"""
The mathematical size of the constraint set.
"""
return sum([len(c) for c in self.constraints])
return sum(len(c) for c in self.constraints)

def get_weighted_arrays(self) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ def lcfs_fit_metric(coords1: Coordinates, coords2: Coordinates) -> float:
result2 = boolean_cut(c2_face, c1_face)

# Calculate metric
return (sum([f.area for f in result1]) + sum([f.area for f in result2])) / (
return (sum(f.area for f in result1) + sum(f.area for f in result2)) / (
c1_face.area + c2_face.area
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def __init__(
ord_mag = np.floor(np.log10(np.absolute(ref_harmonics))) - 3
tolerance = [max(smallest_tol, 10**x) for x in ord_mag]
elif is_num(tolerance):
tolerance = tolerance * np.ones(len(ref_harmonics))
tolerance *= np.ones(len(ref_harmonics))
elif len(tolerance) != len(ref_harmonics):
raise ValueError(f"Tolerance vector not of length {len(ref_harmonics)}")

Expand Down
4 changes: 2 additions & 2 deletions bluemira/equilibria/optimisation/objectives.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def __init__(

def f_objective(self, vector: npt.NDArray[np.float64]) -> float:
"""Objective function for an optimisation."""
vector = vector * self.scale
vector = vector * self.scale # nlopt read only # noqa: PLR6104
fom, _ = regularised_lsq_fom(vector, self.a_mat, self.b_vec, self.gamma)
if fom <= 0:
raise EquilibriaError(
Expand All @@ -94,7 +94,7 @@ def f_objective(self, vector: npt.NDArray[np.float64]) -> float:

def df_objective(self, vector: npt.NDArray[np.float64]) -> npt.NDArray[np.float64]:
"""Gradient of the objective function for an optimisation."""
vector = vector * self.scale
vector = vector * self.scale # nlopt read only # noqa: PLR6104
jac = 2 * self.a_mat.T @ self.a_mat @ vector / float(len(self.b_vec))
jac -= 2 * self.a_mat.T @ self.b_vec / float(len(self.b_vec))
jac += 2 * self.gamma * self.gamma * vector
Expand Down
2 changes: 1 addition & 1 deletion bluemira/fuel_cycle/timeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ def concatenate(p_phases, k_key):

for key in ["t", "inventory", "DT_rate", "DD_rate"]:
setattr(self, key, concatenate(phases, key))
self.t_unplanned_m = sum([p.t_unplanned_down for p in phases])
self.t_unplanned_m = sum(p.t_unplanned_down for p in phases)
t = [p.t for p in phases]
lens = np.array([len(i) for i in t])
self.mci = np.cumsum(lens)
Expand Down
19 changes: 8 additions & 11 deletions bluemira/fuel_cycle/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ def find_max_load_factor(time_years: np.ndarray, time_fpy: np.ndarray) -> float:
"""
_t, rt = discretise_1d(time_years, time_fpy, int(np.ceil(time_years[-1])))
try:
a = max([x - x1 for x1, x in pairwise(rt)])
a = max(x - x1 for x1, x in pairwise(rt))
except ValueError:
# Shortened time overflow error (only happens when debugging)
a = 1
Expand Down Expand Up @@ -621,9 +621,8 @@ def _fountain_linear_sink(

inventory = min_inventory
topup = min_inventory * (1 - np.exp(-T_LAMBDA * (t_out - t_in - t15)))
m_out_temp = mass_in - m_in * t15 - topup
m_out_temp = max(m_out_temp, 0)
m_out = m_out_temp / dts # spread evenly over timestep
# spread evenly over timestep
m_out = max(mass_in - m_in * t15 - topup, 0) / dts
elif i_mdot2 >= max_inventory:
# Case (unlikely) where massive overshoot occurs
# TODO: Handle properly
Expand All @@ -634,9 +633,9 @@ def _fountain_linear_sink(
topup = max_inventory * (
1 - np.exp(-T_LAMBDA * (t_out - t_in - t175 - t15))
)
m_out_temp = mass_in - topup - m_in * t15 - (1 - fs) * m_in * t175
m_out_temp = max(m_out_temp, 0)
m_out = m_out_temp / dts
m_out = (
max(mass_in - topup - m_in * t15 - (1 - fs) * m_in * t175, 0) / dts
)
else:
# Case where successfully crosses up
dt2 = t_out - t_in - t15
Expand All @@ -662,10 +661,8 @@ def _fountain_linear_sink(

inventory = min_inventory
topup = min_inventory * (1 - np.exp(-T_LAMBDA * (t_out - t_in - t15)))
m_out_temp = mass_in - m_in * t15 - topup
if m_out_temp < 0:
m_out_temp = 0
m_out = m_out_temp / dts # spread evenly over timestep
# spread evenly over timestep
m_out = max(mass_in - m_in * t15 - topup, 0) / dts

elif i_mdot >= max_inventory:
t15 = _find_t15(inventory, 1 - fs, m_in, t_in, t_out, max_inventory)
Expand Down
3 changes: 1 addition & 2 deletions bluemira/gen_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@ def main():
for vv in param_classes.values():
add_to_dict(vv, output, params)

with open(Path(args.directory, "params.py"), "w") as fh:
fh.write(create_parameterframe(params))
Path(args.directory, "params.py").write_text(create_parameterframe(params))
json_writer(output, file=Path(args.directory, "params.json"))

else:
Expand Down
2 changes: 1 addition & 1 deletion bluemira/geometry/parameterisations.py
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,7 @@ def create_shape(self, label: str = "") -> BluemiraWire:
l_end = variables[15:]

tilt = np.deg2rad(tilt)
height = 0.5 * height
height *= 0.5
ds_z = flat * height * np.cos(tilt)
ds_x = flat * height * np.sin(tilt)

Expand Down
2 changes: 1 addition & 1 deletion bluemira/geometry/plane.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def axis(self, value: Iterable[float]):

def move(self, vector: Iterable[float]):
"""Moves the Plane along the given vector"""
self.base = self.base + np.array(vector)
self.base += np.array(vector)

def __repr__(self) -> str:
"""
Expand Down
4 changes: 1 addition & 3 deletions bluemira/geometry/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -1391,9 +1391,7 @@ def _signed_distance_2D(point: np.ndarray, polygon: np.ndarray) -> float:
e = polygon[j] - polygon[i]
w = point - polygon[i]
b = w - e * _nb_clip(_nb_dot_2D(w, e) / _nb_dot_2D(e, e), 0.0, 1.0)
d_new = _nb_dot_2D(b, b)
if d_new < d:
d = d_new
d = min(_nb_dot_2D(b, b), d)

cond = np.array([
point[1] >= polygon[i][1],
Expand Down
6 changes: 3 additions & 3 deletions bluemira/magnetostatics/baseclass.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ def rotate(self, angle: float, axis: np.ndarray | str):
The axis of rotation
"""
r = rotation_matrix(np.deg2rad(angle), axis).T
self._origin = self._origin @ r
self._origin @= r
self._points = np.array([p @ r for p in self._points], dtype=object)
self._dcm = self._dcm @ r
self._dcm @= r

def _local_to_global(
self, points: npt.NDArray[np.float64]
Expand Down Expand Up @@ -315,7 +315,7 @@ def rotate(self, angle: float, axis: np.ndarray | str):
"""
for source in self.sources:
source.rotate(angle, axis)
self._points = self._points @ rotation_matrix(angle, axis)
self._points @= rotation_matrix(angle, axis)

def plot(self, ax: Axes | None = None, *, show_coord_sys: bool = False):
"""
Expand Down
10 changes: 5 additions & 5 deletions bluemira/magnetostatics/biot_savart.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,11 @@ def rotate(self, angle: float, axis: str | np.ndarray):
The axis of rotation
"""
r = rotation_matrix(np.deg2rad(angle), axis).T
self._points = self._points @ r
self._d_l = self._d_l @ r
self._mid_points = self._mid_points @ r
self.ref_d_l = self.ref_d_l @ r
self.ref_mid_points = self.ref_mid_points @ r
self._points @= r
self._d_l @= r
self._mid_points @= r
self.ref_d_l @= r
self.ref_mid_points @= r
self._arrays = [array @ r for array in self._arrays]

def plot(self, ax: Axes | None = None, *, show_coord_sys: bool = False):
Expand Down
6 changes: 3 additions & 3 deletions bluemira/magnetostatics/semianalytic_2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def _partial_z_integrand_nojit(phi: float, rr: float, zz: float) -> float:
result = result - 0.5 * rr if rr - 1 < EPS else result - 0.5 / rr
# F3
if 0.5 * np.pi * sin_phi > 1e-9: # noqa: PLR2004
result = result - sin_phi * np.arctan(zz * (rr - cos_phi) / (r0 * sin_phi))
result -= sin_phi * np.arctan(zz * (rr - cos_phi) / (r0 * sin_phi))
return result


Expand Down Expand Up @@ -127,7 +127,7 @@ def _get_working_coords(
"""
Convert coil and global coordinates to working coordinates.
"""
z = z - zc
z = z - zc # numba issue # noqa: PLR6104
r1, r2 = (xc - d_xc) / x, (xc + d_xc) / x
z1, z2 = (-d_zc - z) / x, (d_zc - z) / x
j_tor = 1 / (4 * d_xc * d_zc) # Keep current out of the equation
Expand Down Expand Up @@ -293,7 +293,7 @@ def _full_psi_integrand(x, phi, xc, zc, z, d_xc, d_zc):
"""
Integrand for psi = xBz
"""
z = z - zc
z = z - zc # numba issue # noqa: PLR6104
r1, r2 = (xc - d_xc) / x, (xc + d_xc) / x
z1, z2 = (-d_zc - z) / x, (d_zc - z) / x
return x**2 * (
Expand Down
Loading

0 comments on commit 7574352

Please sign in to comment.