Skip to content

Commit fa4d4f9

Browse files
authored
Merge pull request #697 from adi611/adi611-patch-testslurm-17
Update DOCKER_IMAGE tag in testslurm.yml
2 parents e425b83 + afeb705 commit fa4d4f9

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

.github/workflows/testslurm.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ on:
88

99
jobs:
1010
build:
11+
strategy:
12+
matrix:
13+
python-version: [3.8.16, 3.9.16, 3.10.9, 3.11.5]
14+
fail-fast: false
1115
runs-on: ubuntu-latest
1216
env:
13-
DOCKER_IMAGE: giovtorres/docker-centos7-slurm:latest
17+
DOCKER_IMAGE: adi611/docker-centos7-slurm:23.02.1
1418

1519
steps:
1620
- name: Disable etelemetry
@@ -24,10 +28,7 @@ jobs:
2428
- name: Display previous jobs with sacct
2529
run: |
2630
echo "Allowing ports/daemons time to start" && sleep 10
27-
docker exec slurm bash -c "sacctmgr -i add cluster name=linux \
28-
&& supervisorctl restart slurmdbd \
29-
&& supervisorctl restart slurmctld \
30-
&& sacctmgr -i add account none,test Cluster=linux Description='none' Organization='none'"
31+
docker exec slurm bash -c "sacctmgr -i add account none,test Cluster=linux Description='none' Organization='none'"
3132
docker exec slurm bash -c "sacct && sinfo && squeue" 2&> /dev/null
3233
if [ $? -ne 0 ]; then
3334
echo "Slurm docker image error"
@@ -38,12 +39,16 @@ jobs:
3839
docker exec slurm bash -c "echo $NO_ET"
3940
docker exec slurm bash -c "ls -la && echo list top level dir"
4041
docker exec slurm bash -c "ls -la /pydra && echo list pydra dir"
41-
docker exec slurm bash -c "pip3.9 install --upgrade pip && pip3.9 install -e /pydra[test] && python3.9 -c 'import pydra; print(pydra.__version__)'"
42+
if [[ "${{ matrix.python-version }}" == "3.11.5" ]]; then
43+
docker exec slurm bash -c "CONFIGURE_OPTS=\"-with-openssl=/opt/openssl\" pyenv install -v 3.11.5"
44+
fi
45+
docker exec slurm bash -c "pyenv global ${{ matrix.python-version }}"
46+
docker exec slurm bash -c "pip install --upgrade pip && pip install -e /pydra[test] && python -c 'import pydra; print(pydra.__version__)'"
4247
- name: Run pytest
4348
run: |
44-
docker exec slurm bash -c "pytest --color=yes -vs -n auto --cov pydra --cov-config /pydra/.coveragerc --cov-report xml:/pydra/cov.xml --doctest-modules /pydra/pydra/ -k 'not test_audit_prov and not test_audit_prov_messdir_1 and not test_audit_prov_messdir_2 and not test_audit_prov_wf and not test_audit_all'"
49+
docker exec slurm bash -c "pytest --color=yes -vs --cov pydra --cov-config /pydra/.coveragerc --cov-report xml:/pydra/cov.xml --doctest-modules /pydra/pydra/ -k 'not test_audit_prov and not test_audit_prov_messdir_1 and not test_audit_prov_messdir_2 and not test_audit_prov_wf and not test_audit_all'"
4550
- name: Upload to codecov
4651
run: |
47-
docker exec slurm bash -c "pip3.9 install urllib3==1.26.6"
52+
docker exec slurm bash -c "pip install urllib3==1.26.6"
4853
docker exec slurm bash -c "codecov --root /pydra -f /pydra/cov.xml -F unittests"
4954
docker rm -f slurm

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "flit_scm:buildapi"
66
name = "pydra"
77
description = "Pydra dataflow engine"
88
readme = "README.rst"
9-
requires-python = ">=3.8"
9+
requires-python = ">=3.8, !=3.11.1"
1010
dependencies = [
1111
"attrs >=19.1.0",
1212
"cloudpickle >=2.0.0",

0 commit comments

Comments
 (0)