Merge-back main -> unstructured_scheme

.cirrus.yml

@@ -92,10 +92,10 @@ test_task:
       - conda install --quiet --name base ${CONDA_CACHE_PACKAGES}
   nox_cache:
     folder: ${CIRRUS_WORKING_DIR}/.nox
+    reupload_on_changes: true
     fingerprint_script:
       - echo "${CIRRUS_TASK_NAME}"
-      - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${NOX_CACHE_BUILD}"
-      - sha256sum ${CIRRUS_WORKING_DIR}/requirements/py$(echo ${PY_VER} | tr -d ".").yml
+      - echo "${NOX_CACHE_BUILD}"
       - if [ -n "${IRIS_SOURCE}" ]; then echo "${IRIS_SOURCE}"; fi
   test_script:
     - export CONDA_OVERRIDE_LINUX="$(uname -r | cut -d'+' -f1)"

.github/workflows/refresh-lockfiles.yml

@@ -0,0 +1,42 @@
+# This workflow periodically creates new environment lock files based on the newest
+# available packages and dependencies.
+#
+# Environment specifications are given as conda environment.yml files found in
+# ``requirements/py**.yml``.  These state the packages required, the conda channels
+# that the packages will be pulled from, and any versions of packages that need to be
+# pinned at specific versions.
+#
+# For environments that have changed, a pull request will be made and submitted
+# to the master branch.
+
+name: Refresh Lockfiles
+
+
+on:
+  workflow_dispatch:
+  schedule:
+    # Run once a week on a Saturday night.
+    - cron: 1 0 * * 6
+
+
+jobs:
+
+  gen_lockfiles:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: install nox
+        run: |
+          source $CONDA/bin/activate base
+          conda install -y -c conda-forge nox pyyaml
+      - name: generate lockfiles
+        run: $CONDA/bin/nox --session update_lockfiles
+      - name: create pull request
+        uses: peter-evans/create-pull-request@052fc72b4198ba9fbc81b818c6e1859f747d49a8
+        with:
+          commit-message: Updated environment lockfiles
+          delete-branch: true
+          branch: auto-update-lockfiles
+          title: Update CI environment lockfiles
+          body: |
+            Lockfiles updated to the latest resolvable environment.

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 'v3.4.0'
+    rev: 'v4.0.1'
     hooks:
         # Prevent giant files from being committed.
     -   id: check-added-large-files
@@ -17,14 +17,14 @@ repos:
         # Don't commit to master branch.
     -   id: no-commit-to-branch
 -   repo: https://github.com/psf/black
-    rev: '20.8b1'
+    rev: '21.5b1'
     hooks:
     -   id: black
         # Force black to run on whole repo, using settings from pyproject.toml
         pass_filenames: false
         args: [--config=./pyproject.toml, .]
--   repo: https://gitlab.com/pycqa/flake8
-    rev: '3.9.0'
+-   repo: https://github.com/PyCQA/flake8
+    rev: '3.9.2'
     hooks:
         # Run flake8.
     -   id: flake8