Merge pull request #195 from pyiron/main

Merge main
pyiron · Nov 2, 2023 · 6d99325 · 6d99325
2 parents 82b5b7c + 3824e4d
commit 6d99325
Show file tree

Hide file tree

Showing 28 changed files with 1,473 additions and 859 deletions.
diff --git a/.ci_support/environment-mpich.yml b/.ci_support/environment-mpich.yml
@@ -4,7 +4,7 @@ dependencies:
 - python
 - numpy
 - mpich
-- cloudpickle =2.2.1
-- mpi4py =3.1.4
-- tqdm =4.65.0
-- pyzmq =25.1.0
+- cloudpickle =3.0.0
+- mpi4py =3.1.5
+- tqdm =4.66.1
+- pyzmq =25.1.1
diff --git a/.ci_support/environment-openmpi.yml b/.ci_support/environment-openmpi.yml
@@ -4,7 +4,7 @@ dependencies:
 - python
 - numpy
 - openmpi
-- cloudpickle =2.2.1
-- mpi4py =3.1.4
-- tqdm =4.65.0
-- pyzmq =25.1.0
+- cloudpickle =3.0.0
+- mpi4py =3.1.5
+- tqdm =4.66.1
+- pyzmq =25.1.1
diff --git a/.ci_support/environment-win.yml b/.ci_support/environment-win.yml
@@ -4,7 +4,7 @@ dependencies:
 - python
 - numpy
 - msmpi
-- cloudpickle =2.2.1
-- mpi4py =3.1.4
-- tqdm =4.65.0
-- pyzmq =25.1.0
+- cloudpickle =3.0.0
+- mpi4py =3.1.5
+- tqdm =4.66.1
+- pyzmq =25.1.1
diff --git a/.github/workflows/unittest-flux.yml b/.github/workflows/unittest-flux.yml
@@ -40,7 +40,7 @@ jobs:
         environment-file: ${{ matrix.environment-file }}
     - name: Install flux
       shell: bash -l {0}
-      run: mamba install -y flux-core coverage coveralls=3.3.1
+      run: mamba install -y flux-core coverage
     - name: Setup
       shell: bash -l {0}
       run: pip install --no-deps .
@@ -64,15 +64,11 @@ jobs:
       run: >
         flux start
         coverage run --omit pympipool/_version.py -m unittest tests/test_flux.py;
+        coverage combine
       env:
         OMPI_MCA_plm: 'isolated'
         OMPI_MCA_rmaps_base_oversubscribe: 'yes'
         OMPI_MCA_btl_vader_single_copy_mechanism: 'none'
-    - name: Coverage
+    - name: Coveralls
       if:  matrix.label == 'linux-64-py-3-11-openmpi'
-      continue-on-error: True
-      shell: bash -l {0}
-      run: |
-        coverage combine
-        coveralls
-        coverage xml
+      uses: coverallsapp/github-action@v2
diff --git a/.github/workflows/unittest-openmpi.yml b/.github/workflows/unittest-openmpi.yml
@@ -24,17 +24,17 @@ jobs:
           python-version: '3.11'
           label: linux-64-py-3-11-openmpi
           prefix: /usr/share/miniconda3/envs/my-env
-          
+
         - operating-system: ubuntu-latest
           python-version: '3.10'
           label: linux-64-py-3-10-openmpi
           prefix: /usr/share/miniconda3/envs/my-env
-          
+
         - operating-system: ubuntu-latest
           python-version: 3.9
           label: linux-64-py-3-9-openmpi
           prefix: /usr/share/miniconda3/envs/my-env
-          
+
         - operating-system: ubuntu-latest
           python-version: 3.8
           label: linux-64-py-3-8-openmpi