Merge branch 'master' into py312

BAMWelDX · Jan 13, 2024 · 19c8903 · 19c8903
2 parents 5bf048b + c38c19f
commit 19c8903
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml
@@ -41,7 +41,7 @@ jobs:
           fetch-depth: 0 # Fetch all history for all tags and branches
 
       - name: Setup Conda Environment
-        uses: mamba-org/setup-micromamba@v1.4.4
+        uses: mamba-org/setup-micromamba@v1.5.0
         with:
           environment-file: ./devtools/conda.recipe/build_env.yml
           environment-name: build_env

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -47,7 +47,7 @@ jobs:
           fetch-depth: 0 # Fetch all history for all tags and branches
 
       - name: Setup Conda Environment
-        uses: mamba-org/setup-micromamba@v1.4.4
+        uses: mamba-org/setup-micromamba@v1.5.0
         with:
           environment-file: ./doc/rtd_environment.yml
           environment-name: rtd

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -47,7 +47,7 @@ jobs:
           setup_requires: 'include'
 
       - name: Setup Conda Environment
-        uses: mamba-org/setup-micromamba@v1.4.4
+        uses: mamba-org/setup-micromamba@v1.6.0
         with:
           environment-file: ./environment.yml
           environment-name: weldx
@@ -147,7 +147,7 @@ jobs:
           setup_requires: 'include'
 
       - name: Setup Conda Environment
-        uses: mamba-org/setup-micromamba@v1.4.4
+        uses: mamba-org/setup-micromamba@v1.6.0
         with:
           environment-file: ./environment.yml
           environment-name: weldx

diff --git a/.github/workflows/pytest_asdf.yml b/.github/workflows/pytest_asdf.yml
@@ -33,7 +33,7 @@ jobs:
           setup_requires: 'include'
 
       - name: Setup Conda Environment
-        uses: mamba-org/setup-micromamba@v1.4.4
+        uses: mamba-org/setup-micromamba@v1.5.0
         with:
           environment-file: ./environment.yml
           environment-name: weldx

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
@@ -49,7 +49,7 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('./environment.yml') }}
 
       - name: Setup Conda Environment
-        uses: mamba-org/setup-micromamba@v1.4.4
+        uses: mamba-org/setup-micromamba@v1.5.0
         with:
           environment-file: ./environment.yml
           environment-name: weldx

diff --git a/pyproject.toml b/pyproject.toml
@@ -64,7 +64,7 @@ test = [
     "pytest >=6",
     "pytest-cov",
     "pytest-xdist",
-    "nbval",
+    "nbval <0.10",
 ]
 vis = [
     "weldx_widgets >=0.2",