add testing for psij

Author: adi611

.github/workflows/testpsij.yml

@@ -0,0 +1,45 @@
+name: PSI/J
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python-version: ['3.9', '3.10', '3.11']
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository }}
+
+      - name: Setup Python version ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies for PSI/J
+        run: |
+          pip install -e ".[test,psij]"
+
+      - name: Run tests for PSI/J
+        run: |
+          pytest --color=yes -vs -n auto pydra/engine --cov pydra --cov-config .coveragerc --cov-report xml:cov.xml
+
+      - name: Upload to codecov
+        run: codecov -f cov.xml -F unittests -e GITHUB_WORKFLOW

.github/workflows/testslurm.yml

@@ -8,13 +8,9 @@ on:
 
 jobs:
   build:
-    strategy:
-      matrix:
-        python-version: [3.8.16, 3.9.16, 3.10.9, 3.11.5]
-      fail-fast: false
     runs-on: ubuntu-latest
     env:
-      DOCKER_IMAGE: adi611/docker-centos7-slurm:23.02.1
+      DOCKER_IMAGE: giovtorres/docker-centos7-slurm:latest
 
     steps:
     - name: Disable etelemetry
@@ -28,7 +24,10 @@ jobs:
     - name: Display previous jobs with sacct
       run: |
         echo "Allowing ports/daemons time to start" && sleep 10
-        docker exec slurm bash -c "sacctmgr -i add account none,test Cluster=linux Description='none' Organization='none'"
+        docker exec slurm bash -c "sacctmgr -i add cluster name=linux \
+          && supervisorctl restart slurmdbd \
+          && supervisorctl restart slurmctld \
+          && sacctmgr -i add account none,test Cluster=linux Description='none' Organization='none'"
         docker exec slurm bash -c "sacct && sinfo && squeue" 2&> /dev/null
         if [ $? -ne 0 ]; then
             echo "Slurm docker image error"
@@ -39,16 +38,12 @@ jobs:
         docker exec slurm bash -c "echo $NO_ET"
         docker exec slurm bash -c "ls -la && echo list top level dir"
         docker exec slurm bash -c "ls -la /pydra && echo list pydra dir"
-        if [[ "${{ matrix.python-version }}" == "3.11.5" ]]; then
-            docker exec slurm bash -c "CONFIGURE_OPTS=\"-with-openssl=/opt/openssl\" pyenv install -v 3.11.5"
-        fi
-        docker exec slurm bash -c "pyenv global ${{ matrix.python-version }}"
-        docker exec slurm bash -c "pip install --upgrade pip && pip install -e /pydra[test] && python -c 'import pydra; print(pydra.__version__)'"
+        docker exec slurm bash -c "pip3.9 install --upgrade pip && pip3.9 install -e /pydra[test] && python3.9 -c 'import pydra; print(pydra.__version__)'"
     - name: Run pytest
       run: |
-        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'"
+        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'"
     - name: Upload to codecov
       run: |
-        docker exec slurm bash -c "pip install urllib3==1.26.6"
+        docker exec slurm bash -c "pip3.9 install urllib3==1.26.6"
         docker exec slurm bash -c "codecov --root /pydra -f /pydra/cov.xml -F unittests"
         docker rm -f slurm

pydra/conftest.py

@@ -14,7 +14,7 @@ def pytest_generate_tests(metafunc):
         if bool(shutil.which("sbatch")):
             Plugins = ["slurm"]
         else:
-            Plugins = ["cf"]
+            Plugins = ["psij-local"]
         try:
             if metafunc.config.getoption("dask"):
                 Plugins.append("dask")
@@ -34,7 +34,7 @@ def pytest_generate_tests(metafunc):
         elif bool(shutil.which("sbatch")):
             Plugins = ["slurm"]
         else:
-            Plugins = ["cf"]
+            Plugins = ["psij-local"]
         metafunc.parametrize("plugin", Plugins)
 
 

pyproject.toml

@@ -48,6 +48,9 @@ classifiers = [
 dynamic = ["version"]
 
 [project.optional-dependencies]
+psij = [
+    "psij-python",
+]
 dask = [
     "dask",
     "distributed",