Merge pull request #187 from datalad/ghsuite

daily-status.py and dispatch-build: Replace PyGithub with ghreq and Pydantic

.github/workflows/build-macos.yaml

@@ -60,10 +60,10 @@ jobs:
         run: |
           # The goal here is for $BUILD_COMMIT to be the HEAD (necessary for
           # git-annex's version detection to use the correct git commit) with
-          # the contents of master — or whatever ref is being used as the
-          # workflow source — also available.
+          # the .github/ and patches/ trees from master — or whatever ref is
+          # being used as the workflow source — also available.
           git checkout "$BUILD_COMMIT"
-          git checkout "$GITHUB_SHA" -- .
+          git checkout "$GITHUB_SHA" -- .github patches
 
       - name: Get build version
         id: build-version

.github/workflows/build-ubuntu.yaml

@@ -79,10 +79,10 @@ jobs:
         run: |
           # The goal here is for $BUILD_COMMIT to be the HEAD (necessary for
           # git-annex's version detection to use the correct git commit) with
-          # the contents of master — or whatever ref is being used as the
-          # workflow source — also available.
+          # the .github/ and patches/ trees from master — or whatever ref is
+          # being used as the workflow source — also available.
           git checkout "$BUILD_COMMIT"
-          git checkout "$GITHUB_SHA" -- .
+          git checkout "$GITHUB_SHA" -- .github patches
 
       - name: Get build version
         id: build-version

.github/workflows/build-windows.yaml

@@ -66,14 +66,14 @@ jobs:
         run: |
           # The goal here is for $BUILD_COMMIT to be the HEAD (necessary for
           # git-annex's version detection to use the correct git commit) with
-          # the contents of master — or whatever ref is being used as the
-          # workflow source — also available.
+          # the .github/ and patches/ trees from master — or whatever ref is
+          # being used as the workflow source — also available.
           git reset --soft "$BUILD_COMMIT"
           # Avoid checking out unnecessary files with paths that are invalid on
           # Windows.
           git ls-tree --name-only HEAD | grep -v '^doc$' | xargs git checkout HEAD
           git checkout HEAD doc/license ':(glob)doc/*.mdwn' ':(glob)doc/logo*'
-          git checkout "$GITHUB_SHA" -- .
+          git checkout "$GITHUB_SHA" -- .github patches
 
       - name: Get build version
         id: build-version

.github/workflows/template/build-{{ostype}}.yaml.j2

@@ -33,7 +33,7 @@ jobs:
       build-version: ${{ steps.build-version.outputs.version }}
     steps:
       - name: Checkout this repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -96,8 +96,8 @@ jobs:
         run: |
           # The goal here is for $BUILD_COMMIT to be the HEAD (necessary for
           # git-annex's version detection to use the correct git commit) with
-          # the contents of master — or whatever ref is being used as the
-          # workflow source — also available.
+          # the .github/ and patches/ trees from master — or whatever ref is
+          # being used as the workflow source — also available.
           {% if ostype == "windows" %}
           git reset --soft "$BUILD_COMMIT"
           # Avoid checking out unnecessary files with paths that are invalid on
@@ -107,7 +107,7 @@ jobs:
           {% else %}
           git checkout "$BUILD_COMMIT"
           {% endif %}
-          git checkout "$GITHUB_SHA" -- .
+          git checkout "$GITHUB_SHA" -- .github patches
 
       - name: Get build version
         id: build-version
@@ -277,7 +277,7 @@ jobs:
     {% if ostype == "ubuntu" %}
       - name: Clone datalad/git-annex-ci-client-jobs
         if: contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: datalad/git-annex-ci-client-jobs
           fetch-depth: 1
@@ -384,7 +384,7 @@ jobs:
   {% endif %}
     steps:
       - name: Checkout this repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create pending PR status
         if: github.event.inputs.pr != ''
@@ -539,7 +539,7 @@ jobs:
     needs: build-package
     steps:
       - name: Checkout this repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create pending PR status
         if: github.event.inputs.pr != ''
@@ -600,7 +600,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout this repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create pending PR status
         if: github.event.inputs.pr != ''
@@ -732,7 +732,7 @@ jobs:
 
       # needed for ssh certs under ubuntu and tox.ini everywhere
       - name: Checkout datalad
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: datalad/datalad
           path: datalad

.github/workflows/template/mkworkflows.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
-from   pathlib import Path
+from pathlib import Path
 import sys
 import jinja2
 import yaml
 
+
 def jinja_render(template, context):
     """
     Custom renderer, in which we first replace GitHub Actions' ``${{`` with a
@@ -16,11 +17,12 @@ def jinja_render(template, context):
         )
     rendered = jinja2.Template(
         template.replace("${{", PLACEHOLDER),
-        trim_blocks   = True,
-        lstrip_blocks = True,
+        trim_blocks=True,
+        lstrip_blocks=True,
     ).render(context)
     return rendered.replace(PLACEHOLDER, "${{")
 
+
 def main():
     specs_file, template_file, workflows_dir = map(Path, sys.argv[1:])
     with specs_file.open() as fp:
@@ -31,5 +33,6 @@ def main():
         filename = jinja_render(template_file.with_suffix("").name, sp)
         (workflows_dir / filename).write_text(workflow + "\n")
 
+
 if __name__ == "__main__":
     main()

.github/workflows/tools/containers/buildenv-git-annex/Dockerfile

@@ -8,7 +8,7 @@ RUN echo 'Acquire::http::Dl-Limit "1000";' >| /etc/apt/apt.conf.d/20snapshots \
     && echo 'Acquire::https::Dl-Limit "1000";' >> /etc/apt/apt.conf.d/20snapshots \
     && echo 'Acquire::Retries "5";' >> /etc/apt/apt.conf.d/20snapshots
 
-# Notes: 
+# Notes:
 # - in APT for NeuroDebian we have #deb-src  for debian-devel, so we need to change
 #   that too.
 # - APT specification switched away from .list to .sources format in bookworm.