Clean up .cirrus.yml

Minor whitespace cleanup, push the $PATH out of the Matrix (which is
more aligned with Github Actions), and make the list of tasks more
obvious.

.cirrus.yml

@@ -6,24 +6,25 @@ test_task:
   only_if: $CIRRUS_TAG == ''
   only_if: $CIRRUS_TAG == ''
   skip: "!changesInclude('.cirrus.yml', 'poetry.lock', 'pyproject.toml', '**.json','**.py')"
   skip: "!changesInclude('.cirrus.yml', 'poetry.lock', 'pyproject.toml', '**.json','**.py')"
   env:
   env:
-    PATH: /.local/bin:${PATH}
     matrix:
     matrix:
       - PYTHON: python3.8
       - PYTHON: python3.8
       - PYTHON: python3.9
       - PYTHON: python3.9
-  python_script:
+  pkg_script:
     - PYPACKAGE=$(printf '%s' $PYTHON | tr -d '.')
     - PYPACKAGE=$(printf '%s' $PYTHON | tr -d '.')
     - SQLPACKAGE=$(printf '%s-sqlite3' $PYPACKAGE | sed 's/thon//')
     - SQLPACKAGE=$(printf '%s-sqlite3' $PYPACKAGE | sed 's/thon//')
     - pkg install -y git-lite curl $PYPACKAGE $SQLPACKAGE
     - pkg install -y git-lite curl $PYPACKAGE $SQLPACKAGE
   pip_script:
   pip_script:
     - $PYTHON -m ensurepip
     - $PYTHON -m ensurepip
     - $PYTHON -m pip --disable-pip-version-check install -U pip
     - $PYTHON -m pip --disable-pip-version-check install -U pip
+  env_script:
+    - echo "PATH=/.local/bin:${PATH}" >> $CIRRUS_ENV
   poetry_script:
   poetry_script:
     - curl -sL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py \
     - curl -sL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py \
       | $PYTHON - -y
       | $PYTHON - -y
     - poetry config virtualenvs.in-project true
     - poetry config virtualenvs.in-project true
-  test_script: |
-    poetry install
-    poetry run pytest -q --junitxml=junit.xml tests
+  test_script:
+    - poetry install
+    - poetry run pytest -q --junitxml=junit.xml tests
   on_failure:
   on_failure:
     annotate_failure_artifacts:
     annotate_failure_artifacts:
       path: junit.xml
       path: junit.xml