Merge branch 'master' into dependabot/github_actions/mamba-org/setup-micromamba-2.0.4

Author: CagtayFabry

.github/workflows/citation.yml

@@ -20,6 +20,6 @@ jobs:
           path: ~/.cache/pip
           key: pip-cffconvert-0
       - name: pip installs
-        run: pip install cffconvert
+        run: pip install git+https://github.com/citation-file-format/cffconvert.git
       - name: run cffconvert validate
         run: cffconvert --validate

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       - id: check-yaml
         exclude: devtools/conda.recipe/meta.yaml  # doesn't play nice with jinja
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.21
+    rev: 0.7.22
     hooks:
       - id: mdformat
         additional_dependencies:
@@ -29,7 +29,7 @@ repos:
           - mdformat-config
   # ----- Python formatting -----
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.11.4
     hooks:
     # Run ruff linter.
     - id: ruff
@@ -39,11 +39,11 @@ repos:
     # Run ruff formatter.
     - id: ruff-format
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.5.0
+    rev: v2.5.1
     hooks:
     - id: pyproject-fmt
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.23
+    rev: v0.24.1
     hooks:
       - id: validate-pyproject
   # ----- Jupyter Notebooks -----
@@ -63,7 +63,7 @@ repos:
           - --remove-kernel-metadata
   # ----- spellchecking -----
   - repo: https://github.com/codespell-project/codespell/
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         exclude: doc/src/legal-notice.md

.ruff.toml

@@ -54,6 +54,7 @@ select = [
 ]
 "doc/src/tutorials/*" = [
     "D",
+    "B018",
 ]
 "doc/src/conf.py" = [
     "E501",   # ignore long lines.

doc/rtd_environment.yml

@@ -26,6 +26,7 @@ dependencies:
   #- jinja2=3.0
   - sphinx-copybutton=0.5
   - pydata-sphinx-theme<0.15 # parallel-write-unsafe
+  - beautifulsoup4=4.12 # circular import error in 4.13
   - numpydoc>=0.5
   - sphinx-autodoc-typehints>=1.21.8,=2.0
   - typing_extensions

doc/src/tutorials/groove_types_01.ipynb

@@ -14,7 +14,7 @@
     "## Introduction\n",
     "\n",
     "\n",
-    "This tutorial is about generating different groove types and using the groove methods. The methods are seperatable in X parts:\n",
+    "This tutorial is about generating different groove types and using the groove methods. The methods are separable in X parts:\n",
     "\n",
     "* Creating a groove with `get_groove`\n",
     "* Converting a groove to a profile\n",

doc/src/tutorials/util.py

@@ -39,8 +39,7 @@ def hash_path(path):
     sha256sum_actual = hash_path(out_file)
     if sha256sum_actual != sha256sum:
         raise RuntimeError(
-            f"hash mismatch:\n actual = \t{sha256sum_actual}\n"
-            f"desired = \t{sha256sum}"
+            f"hash mismatch:\n actual = \t{sha256sum_actual}\ndesired = \t{sha256sum}"
         )
     if print_status:
         print("download successful.")

weldx/asdf/file.py

@@ -348,7 +348,7 @@ def resolve_schema(schema):
                     schema = get_schema_path(schema)
                 except ValueError as ve:
                     raise ValueError(
-                        f"provided custom_schema '{schema}' " "does not exist."
+                        f"provided custom_schema '{schema}' does not exist."
                     ) from ve
             return schema
 
@@ -427,7 +427,7 @@ def _handle_path(filename, mode) -> (IO, bool):
         new_file_created = False
         exists = pathlib.Path(filename).exists()
         if not exists and mode == "r":
-            raise RuntimeError(f"file {filename} has be created," " but mode is 'r'.")
+            raise RuntimeError(f"file {filename} has be created, but mode is 'r'.")
 
         if mode == "rw":
             if not exists:

weldx/asdf/util.py

@@ -301,7 +301,7 @@ def readline_replace_eol():
     if isinstance(file, types_file_like.__args__):
         if isinstance(file, TextIOBase):
             raise ValueError(
-                "cannot read files opened in text mode. " "Please open in binary mode."
+                "cannot read files opened in text mode. Please open in binary mode."
             )
         if isinstance(file, SupportsFileReadWrite):
             file.seek(0)

weldx/asdf/validators.py

@@ -284,7 +284,7 @@ def _validate_expected_list(list_expected):
         if "..." in str(exp):
             if "..." != exp:
                 raise WxSyntaxError(
-                    f'"..." should not have additional properties:' f" {exp} was found."
+                    f'"..." should not have additional properties: {exp} was found.'
                 )
             validator = 2
         elif "(" in str(exp):
@@ -417,8 +417,7 @@ def _validate_instance_shape(
 
     if _dict_values is False:
         raise ValidationError(
-            f"Shape {list_test[::-1]} does not match requirement "
-            f"{list_expected[::-1]}"
+            f"Shape {list_test[::-1]} does not match requirement {list_expected[::-1]}"
         )
 
     return _dict_values

weldx/core/time_series.py

@@ -116,7 +116,7 @@ def __repr__(self):
                 representation += (
                     f"\nTime:\n\t{self.time}\n"
                     f"Values:\n\t{self.data.magnitude}\n"
-                    f'Interpolation:\n\t{self._data.attrs["interpolation"]}\n'
+                    f"Interpolation:\n\t{self._data.attrs['interpolation']}\n"
                 )
         else:
             representation += self.data.__repr__().replace(