Merge branch 'master' into pre-commit-ci-update-config

.github/workflows/build_pkg.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
 
@@ -74,10 +74,10 @@ jobs:
     name: pypi build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: '3.8'
 

.github/workflows/changelog.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Grep for PR number in CHANGELOG.rst
         run: grep -P ':pull:`${{github.event.number}}`' CHANGELOG.rst

.github/workflows/citation.yml

@@ -11,8 +11,8 @@ jobs:
     name: Validate CITATION.cff
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
       - uses: actions/cache@v2
         with:
           path: ~/.cache/pip

.github/workflows/docs.yml

@@ -29,7 +29,7 @@ jobs:
       nbsphinx_execute: 'always'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Cache conda
         uses: actions/cache@v2

.github/workflows/pytest.yml

@@ -27,10 +27,10 @@ jobs:
         os: [ubuntu-latest]
         py: ['3.8', '3.9', '3.10']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.py }}
 
@@ -88,10 +88,10 @@ jobs:
         os: [macos-latest, windows-latest]
         py: ['3.8']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.py }}
 

.github/workflows/pytest_asdf.yml

@@ -11,10 +11,10 @@ jobs:
     name: pytest asdf
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v3
         with:
           python-version: '3.10'
       - name: pip installs
@@ -28,8 +28,8 @@ jobs:
     name: validate weldx manifest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
         with:
           python-version: '3.10'
       - name: pip installs

.github/workflows/static_analysis.yml

@@ -10,8 +10,8 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
         with:
           python-version: 3.x
       - name: Lint
@@ -25,8 +25,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
         with:
           python-version: '3.9'
       - name: pip installs

doc/conf.py

@@ -38,6 +38,7 @@ def _workaround_imports_typechecking():
     import meshio  # noqa
     import pandas  # noqa
     import pint  # noqa
+    import sympy  # noqa
     import xarray  # noqa
 
 

weldx/geometry.py

@@ -1443,13 +1443,15 @@ def _get_component(v, i):
 
         me = self._series.data
         subs = [(k, _get_component(v.data, i)) for k, v in me.parameters.items()]
-        return me.expression.subs(subs).diff(self._series.position_dim_name) ** 2
+
+        sym = sympy.sympify(self._series.position_dim_name)
+        return me.expression.subs(subs).diff(sym) ** 2
 
     def _get_derivative_expression(self) -> MathematicalExpression:
         """Get the derivative of an expression as `MathematicalExpression`."""
-        expr = MathematicalExpression(
-            self._series.data.expression.diff(self._series.position_dim_name)
-        )
+        sym = sympy.sympify(self._series.position_dim_name)
+        der = self._series.data.expression.diff(sym)
+        expr = MathematicalExpression(der)
 
         # parameters might not be present anymore in the derived expression
         params = {
@@ -1467,7 +1469,10 @@ def _get_tangent_vec_discrete(self, position: float) -> np.ndarray:
         idx_low = np.abs(pos_data - position).argmin()
         if pos_data[idx_low] > position or idx_low + 1 == len(pos_data):
             idx_low -= 1
-        vals = self._series.evaluate(s=[pos_data[idx_low], pos_data[idx_low + 1]]).data
+
+        pdn = self._series.position_dim_name
+        coords = {pdn: [pos_data[idx_low], pos_data[idx_low + 1]]}
+        vals = self._series.evaluate(**coords).data
         return (vals[1] - vals[0]).m
 
     def _get_length_expr(self) -> MathematicalExpression:
@@ -1524,7 +1529,7 @@ def _get_lcs_from_coords_and_tangent(
         pdn = self._series.position_dim_name
 
         if coords.coords[pdn].size == 1:
-            coords = coords.isel(s=0)
+            coords = coords.isel(**{pdn: 0})
 
         x = tangent
         z = [0, 0, 1] if x.size == 3 else [[0, 0, 1] for _ in range(x.shape[0])]
@@ -1658,7 +1663,8 @@ def __init__(
         else:
             self._sign_winding = -1
 
-        expr = "(x*sin(s)+w*y*(cos(s)-1))*r "
+        pdn = SpatialSeries._position_dim_name
+        expr = f"(x*sin({pdn})+w*y*(cos({pdn})-1))*r "
         params = dict(
             x=Q_([1, 0, 0], "mm"),
             y=Q_([0, 1, 0], "mm"),