Bring in PR 3631

.github/workflows/ci.yaml

@@ -60,7 +60,7 @@ jobs:
         export PARSL_TEST_PRESERVE_NUM_RUNS=7
 
         make test
-        ln -s .pytest/parsltest-current test_runinfo
+        ln -s pytest-parsl/parsltest-current test_runinfo
 
     - name: Documentation checks
       run: |
@@ -80,11 +80,11 @@ jobs:
         # database manager log file or monitoring router log file. It would be better if
         # the tests themselves failed immediately when there was a monitoring error, but
         # in the absence of that, this is a dirty way to check.
-        bash -c '! grep ERROR .pytest/parsltest-current/runinfo*/*/database_manager.log'
-        bash -c '! grep ERROR .pytest/parsltest-current/runinfo*/*/monitoring_router.log'
+        bash -c '! grep ERROR pytest-parsl/parsltest-current/runinfo*/*/database_manager.log'
+        bash -c '! grep ERROR pytest-parsl/parsltest-current/runinfo*/*/monitoring_router.log'
 
         # temporary; until test-matrixification
-        rm -f .pytest/parsltest-current test_runinfo
+        rm -f pytest-parsl/parsltest-current test_runinfo
 
     - name: Checking parsl-visualize
       run: |
@@ -112,7 +112,7 @@ jobs:
         name: runinfo-${{ matrix.python-version }}-${{ steps.job-info.outputs.as-ascii }}-${{ github.sha }}
         path: |
           runinfo/
-          .pytest/
+          pytest-parsl/
           ci_job_info.txt
         compression-level: 9
 

.gitignore

@@ -63,6 +63,7 @@ coverage.xml
 *.cover
 .hypothesis/
 /.pytest/
+/pytest-parsl/
 
 # Translations
 *.mo

parsl/tests/conftest.py

@@ -59,7 +59,7 @@ def _chmod(path: pathlib.Path, mode: int):
 
     config = re.sub(r"[^A-z0-9_-]+", "_", pytestconfig.getoption('config')[0])
     cwd = pathlib.Path(os.getcwd())
-    pytest_dir = cwd / ".pytest"
+    pytest_dir = cwd / "pytest-parsl"
     pytest_dir.mkdir(mode=0o700, parents=True, exist_ok=True)
 
     test_dir_prefix = "parsltest-"

parsl/version.py

@@ -1,3 +1,3 @@
 """Set module version.
 """
-VERSION = '2024.10.07+desc-2024.10.09a'
+VERSION = '2024.10.07+desc-2024.10.10a'