Skip to content

Commit c2ef2fa

Browse files
authored
Merge pull request #364 from pyiron/conda_environment
Add support for conda environments again
2 parents d644080 + 75a80d0 commit c2ef2fa

20 files changed

+226
-19
lines changed

.ci_support/environment-mpich.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dependencies:
55
- numpy
66
- mpich
77
- cloudpickle =3.0.0
8+
- conda_subprocess =0.0.4
89
- mpi4py =3.1.6
910
- tqdm =4.66.4
1011
- pyzmq =26.0.3

.ci_support/environment-old.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dependencies:
55
- numpy
66
- openmpi =4.1.4
77
- cloudpickle =2.0.0
8+
- conda_subprocess =0.0.3
89
- mpi4py =3.1.4
910
- tqdm =4.44.0
1011
- pyzmq =25.0.0

.ci_support/environment-openmpi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dependencies:
55
- numpy
66
- openmpi
77
- cloudpickle =3.0.0
8+
- conda_subprocess =0.0.4
89
- mpi4py =3.1.6
910
- tqdm =4.66.4
1011
- pyzmq =26.0.3

.ci_support/environment-win.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dependencies:
55
- numpy
66
- msmpi
77
- cloudpickle =3.0.0
8+
- conda_subprocess =0.0.4
89
- mpi4py =3.1.6
910
- tqdm =4.66.4
1011
- pyzmq =26.0.3
@@ -13,4 +14,4 @@ dependencies:
1314
- matplotlib =3.8.4
1415
- networkx =3.3
1516
- pygraphviz =1.13
16-
- ipython =8.25.0
17+
- ipython =8.25.0

.github/workflows/unittest-flux-mpich.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
shell: bash -l {0}
3030
timeout-minutes: 5
3131
run: |
32+
conda create -y -n py312 python=3.12.1 pympipool
3233
pip install . --no-deps --no-build-isolation
3334
python -m unittest discover tests
3435
- name: Test Flux

.github/workflows/unittest-flux-openmpi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
shell: bash -l {0}
3030
timeout-minutes: 5
3131
run: |
32+
conda create -y -n py312 python=3.12.1 pympipool
3233
pip install . --no-deps --no-build-isolation
3334
coverage run -a --omit="pympipool/_version.py,tests/*" -m unittest discover tests
3435
- name: Test Flux with OpenMPI

.github/workflows/unittest-mpich.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
timeout-minutes: 5
5151
run: |
5252
pip install versioneer[toml]==0.29
53+
conda create -y -n py312 python=3.12.1 pympipool
5354
pip install . --no-deps --no-build-isolation
5455
cd tests
5556
python -m unittest discover .

.github/workflows/unittest-openmpi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
timeout-minutes: 5
5151
run: |
5252
pip install versioneer[toml]==0.29
53+
conda create -y -n py312 python=3.12.1 pympipool
5354
pip install . --no-deps --no-build-isolation
5455
cd tests
5556
python -m unittest discover .

.github/workflows/unittest-win.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
timeout-minutes: 5
3333
run: |
3434
pip install versioneer[toml]==0.29
35+
conda create -y -n py312 python=3.12.1 pympipool
3536
pip install . --no-deps --no-build-isolation
3637
cd tests
3738
python -m unittest discover .

.github/workflows/unittests-old.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
timeout-minutes: 5
2828
run: |
2929
pip install versioneer[toml]==0.29
30+
conda create -y -n py312 python=3.12.1 pympipool
3031
pip install . --no-deps --no-build-isolation
3132
cd tests
3233
python -m unittest discover .

0 commit comments

Comments
 (0)