Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/mpi4py-3.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-janssen authored Oct 17, 2023
2 parents 16a3e72 + d79c6d4 commit 97fabc2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .ci_support/environment-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies:
- python
- numpy
- mpich
- cloudpickle =2.2.1
- cloudpickle =3.0.0
- mpi4py =3.1.5
- tqdm =4.66.1
- pyzmq =24.0.1
- pyzmq =25.1.1
4 changes: 2 additions & 2 deletions .ci_support/environment-openmpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies:
- python
- numpy
- openmpi
- cloudpickle =2.2.1
- cloudpickle =3.0.0
- mpi4py =3.1.5
- tqdm =4.66.1
- pyzmq =24.0.1
- pyzmq =25.1.1
4 changes: 2 additions & 2 deletions .ci_support/environment-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies:
- python
- numpy
- msmpi
- cloudpickle =2.2.1
- cloudpickle =3.0.0
- mpi4py =3.1.5
- tqdm =4.66.1
- pyzmq =24.0.1
- pyzmq =25.1.1
12 changes: 4 additions & 8 deletions .github/workflows/unittest-flux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand All @@ -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
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
],
packages=find_packages(exclude=["*tests*", "*.ci_support*"]),
install_requires=[
'cloudpickle==2.2.1',
'cloudpickle==3.0.0',
'mpi4py==3.1.5',
'tqdm==4.66.1',
'pyzmq==24.0.1',
'pyzmq==25.1.1',
],
cmdclass=versioneer.get_cmdclass(),
)

0 comments on commit 97fabc2

Please sign in to comment.