Skip to content

Commit 079ec6a

Browse files
authored
Merge pull request #291 from ExaWorks/updated_testing_readme
Removed mentions of psij-ci-load since it has been phased out by
2 parents 8e67128 + b456d27 commit 079ec6a

File tree

4 files changed

+9
-17
lines changed

4 files changed

+9
-17
lines changed

README-testing.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,14 @@ use the provided setup script:
2828
./psij-ci-setup
2929
```
3030

31-
or manually set up the CI runner with Cron or your favorite scheduler.
32-
33-
Note: If you need to set up an environment module (such as
34-
`module load python/cpython-x.y.z`) or something similar, such as
35-
loading a conda or virtual environment, please add the relevant commands to
36-
`psij-ci-load`, which is sourced before tests are run by `psij-ci-run`. If the
37-
setup script is run under a venv or Conda, it will attempt to detect this and
38-
ask whether the relevant environment activation commands should be added to
39-
`psij-ci-load`. However, not all circumstances can be reliably detected and
40-
you may need to manually edit `psij-ci-load`.
31+
or manually set up the CI runner (`psij-ci-run`) with Cron or your
32+
favorite scheduler.
33+
34+
Note: If you need to set up an environment module (such as `module load
35+
python/cpython-x.y.z`) or something similar, such as loading a conda or
36+
virtual environment, please run the relevant commands before invoking
37+
`psij-ci-setup`.
38+
4139

4240
Testing with the CI runner
4341
==========================

psij-ci-load

Lines changed: 0 additions & 4 deletions
This file was deleted.

psij-ci-run

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ failifempty() {
1616
fi
1717
}
1818

19-
source psij-ci-load
2019
if [ -f psij-ci-env ]; then
2120
source psij-ci-env
2221
fi

psij-ci-setup

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@ echo "This script will install requirements for the PSI/J CI tests and"
188188
echo "add a cron job to run the tests once a day at some random time. "
189189
echo " "
190190
echo "If you need to set up a special environment, such as loading an "
191-
echo "environment module please exit this script and add the relevant "
192-
echo "commands to psij-ci-load. "
191+
echo "environment module please do so and then re-run this script. "
193192
echo "================================================================"
194193
echo
195194

0 commit comments

Comments
 (0)