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

…micromamba-1.5.0

.github/workflows/build_pkg.yml

@@ -77,7 +77,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 
@@ -99,7 +99,7 @@ jobs:
         run: |
           python -m build
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: dist
           path: ./dist/

.github/workflows/citation.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - uses: actions/cache@v3

.github/workflows/docs.yml

@@ -75,7 +75,7 @@ jobs:
       - name: Build docs
         run: sphinx-build -W -n -b html -d build/doctrees doc/src build/html --keep-going -j 2 -D nb_execution_mode=${{ env.nb_execution_mode }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: |
           always() && (
           startsWith(github.ref, 'refs/tags/') ||

.github/workflows/pytest.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Event File
           path: ${{ github.event_path }}
@@ -88,7 +88,7 @@ jobs:
 
       - name: Upload Test Results
         if: always() && (matrix.py == '3.10')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Unit Test Results
           path: pytest.xml

.github/workflows/pytest_asdf.yml

@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - uses: actions/cache@v3

.github/workflows/static_analysis.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - name: Lint

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ exclude: '.*.weldx$|.*.wx$|.*.asdf$'
 repos:
   # ----- general formatting -----
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
@@ -29,28 +29,28 @@ repos:
           - mdformat-config
   # ----- Python formatting -----
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.14.0
+    rev: v3.15.0
     hooks:
     - id: pyupgrade
       args: [--py39-plus]
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.12.1
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.292
+    rev: v0.1.9
     hooks:
       - id: ruff
         args:
           - --quiet
           - --fix
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.14
+    rev: v0.15
     hooks:
       - id: validate-pyproject
   # ----- Jupyter Notebooks -----
   - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.7.0
+    rev: 1.7.1
     hooks:
       - id: nbqa-black
       - id: nbqa-ruff  # ruff handles isort

weldx/asdf/file.py

@@ -193,13 +193,10 @@ class WeldxFile(_ProtectedViewDict):
     %YAML 1.1
     %TAG ! tag:stsci.edu:asdf/
     --- !core/asdf-1.1.0
-    asdf_library: !core/software-1.0.0 {...
-      name: asdf, version: ...}
+    asdf_library: !core/software-1.0.0 ...
     history:
       extensions:
-      - !core/extension_metadata-1.0.0
-        extension_class: asdf.extension.BuiltinExtension
-        software: !core/software-1.0.0 {name: asdf, version: ...}
+      ...
     name: CXCOMP
     value: 42
     <BLANKLINE>

weldx/tests/asdf_tests/test_weldx_file.py

@@ -449,7 +449,8 @@ def get_mem_info():
             # pytest increases memory a bit, but not as much as our large array would
             # occupy in memory.
             assert diff <= large_array.nbytes * 1.1, diff / 1024**2
-        assert np.all(WeldxFile(fn)["x"] == large_array)
+        with WeldxFile(fn) as wf:
+            assert np.all(wf["x"] == large_array)
 
     @staticmethod
     @pytest.mark.parametrize("mode", ("r", "rw"))