Merge branch 'main' into revert-241-test_macos11

pyiron · Jan 20, 2024 · b4a2ff8 · b4a2ff8
2 parents 8ee055a + ddd7160
commit b4a2ff8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/.github/delete-merged-branch-config.yml b/.github/delete-merged-branch-config.yml
diff --git a/.github/workflows/unittest-flux.yml b/.github/workflows/unittest-flux.yml
@@ -16,14 +16,14 @@ jobs:
       matrix:
         include:
         - operating-system: ubuntu-latest
-          python-version: '3.11'
-          label: linux-64-py-3-11-openmpi
+          python-version: '3.12'
+          label: linux-64-py-3-12-openmpi
           prefix: /Users/runner/miniconda3/envs/my-env
           environment-file: .ci_support/environment-openmpi.yml
 
         - operating-system: ubuntu-latest
-          python-version: '3.11'
-          label: linux-64-py-3-11-mich
+          python-version: '3.12'
+          label: linux-64-py-3-12-mpich
           prefix: /usr/share/miniconda3/envs/my-env
           environment-file: .ci_support/environment-mpich.yml
 
@@ -42,7 +42,7 @@ jobs:
       shell: bash -l {0}
       timeout-minutes: 5
       run: |
-        mamba install -y flux-core coverage
+        mamba install -y flux-core=0.58.0 coverage
         pip install versioneer[toml]==0.29
         pip install . --no-deps --no-build-isolation
         cd tests

diff --git a/.github/workflows/unittest-mpich.yml b/.github/workflows/unittest-mpich.yml
@@ -16,10 +16,15 @@ jobs:
       matrix:
         include:
         - operating-system: macos-latest
-          python-version: '3.11'
-          label: osx-64-py-3-11-mpich
+          python-version: '3.12'
+          label: osx-64-py-3-12-mpich
           prefix: /Users/runner/miniconda3/envs/my-env
 
+        - operating-system: ubuntu-latest
+          python-version: '3.12'
+          label: linux-64-py-3-12-mpich
+          prefix: /usr/share/miniconda3/envs/my-env
+
         - operating-system: ubuntu-latest
           python-version: '3.11'
           label: linux-64-py-3-11-mpich

diff --git a/.github/workflows/unittest-openmpi.yml b/.github/workflows/unittest-openmpi.yml
@@ -16,10 +16,15 @@ jobs:
       matrix:
         include:
         - operating-system: macos-latest
-          python-version: '3.11'
-          label: osx-64-py-3-11-openmpi
+          python-version: '3.12'
+          label: osx-64-py-3-12-openmpi
           prefix: /Users/runner/miniconda3/envs/my-env
 
+        - operating-system: ubuntu-latest
+          python-version: '3.12'
+          label: linux-64-py-3-12-openmpi
+          prefix: /usr/share/miniconda3/envs/my-env
+
         - operating-system: ubuntu-latest
           python-version: '3.11'
           label: linux-64-py-3-11-openmpi

diff --git a/.github/workflows/unittest-win.yml b/.github/workflows/unittest-win.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [windows-latest]
-        python-version: ['3.11']
+        python-version: ['3.12']
 
     steps:
     - uses: actions/checkout@v2