Merge branch 'main' into update_repo_refs

Author: hategan

README-testing.md

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

docs/_static/extras.css

@@ -0,0 +1,57 @@
+.psij-selector-value {
+    display: inline-block;
+    border-style: solid;
+    border-width: 1pt;
+    border-radius: 3pt;
+    border-color: rgba(0, 0, 0, 0.2);
+    background-color: rgba(255, 255, 255, 0.7);
+}
+
+select.psij-selector {
+    border: thin solid;
+    border-color: rgba(0, 0, 0, 0.2);
+    border-radius: 3pt;
+    padding-left: 4pt;
+    padding-right: 16pt;
+    appearance: none;
+    background: url(select-arrow.png) no-repeat;
+    background-position: right 4pt center;
+    background-size: 8pt;
+}
+
+select.psij-selector:focus {
+    outline: none;
+    border-color: var(--color-fg-lines);
+    box-shadow: 0 0 1.5pt var(--color-fg-lines);
+}
+
+.selector-radio {
+	width: 0;
+    height: 0;
+}
+
+.selector-label {
+	cursor: pointer;
+
+	font-size: 94%;
+
+	z-index: 1;
+	display: inline-block;
+	position: relative;
+	min-width: 80pt;
+
+	padding: 3pt;
+	padding-left: 8pt;
+	height: 22pt;
+
+	margin-right: 1pt;
+	
+	background: #e7f2fa;
+	top: 12pt;
+}
+
+.selector-radio:checked + .selector-label {
+	z-index: 3;
+	height: 24pt;
+	border-top: 3px solid #6ab0de;
+}

docs/_static/select-arrow.png

@@ -35,6 +35,7 @@
 # These are needed for the dhtml trickery
 html_static_path = ["_static"]
 html_js_files = ["extras.js"]
+html_css_files = ["extras.css"]
 
 # Setup Sphinx extensions (and associated variables)
 extensions = [

docs/conf.py

@@ -16,7 +16,6 @@ failifempty() {
     fi
 }
 
-source psij-ci-load
 if [ -f psij-ci-env ]; then
     source psij-ci-env
 fi

psij-ci-load

@@ -188,8 +188,7 @@ echo "This script will install requirements for the PSI/J CI tests and"
 echo "add a cron job to run the tests once a day at some random time. "
 echo "                                                                "
 echo "If you need to set up a special environment, such as loading an "
-echo "environment module please exit this script and add the relevant "
-echo "commands to psij-ci-load.                                       "
+echo "environment module please do so and then re-run this script.    "
 echo "================================================================"
 echo
 

psij-ci-run

@@ -0,0 +1,3 @@
+/* This overwrites the standard docs extras.css which contains styling
+   for the selectors and would otherwise mess up the specific styling
+   used for the web build of the docs */