.editorconfig

@@ -18,6 +18,9 @@ trim_trailing_whitespace = true
 [*.py]
 max_line_length = 100
 
+[*.pyi]
+max_line_length = 100
+
 [*.c]
 max_line_length = 100
 

.github/workflows/coverage.yml

@@ -18,6 +18,7 @@ defaults:
 
 env:
   PIP_DISABLE_PIP_VERSION_CHECK: 1
+  FORCE_COLOR: 1    # Get colored pytest output
 
 permissions:
   contents: read
@@ -46,15 +47,25 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
-          - "3.11.0-rc.2"
+          - "3.11"
           - "pypy-3.7"
+          - "pypy-3.8"
+          - "pypy-3.9"
         exclude:
           # Windows PyPy doesn't seem to work?
           - os: windows-latest
             python-version: "pypy-3.7"
+          - os: windows-latest
+            python-version: "pypy-3.8"
+          - os: windows-latest
+            python-version: "pypy-3.9"
           # Mac PyPy always takes the longest, and doesn't add anything.
           - os: macos-latest
             python-version: "pypy-3.7"
+          - os: macos-latest
+            python-version: "pypy-3.8"
+          - os: macos-latest
+            python-version: "pypy-3.9"
       # If one job fails, stop the whole thing.
       fail-fast: true
 
@@ -94,6 +105,10 @@ jobs:
     name: "Combine coverage data"
     needs: coverage
     runs-on: ubuntu-latest
+    outputs:
+      total: ${{ steps.total.outputs.total }}
+    env:
+      COVERAGE_RCFILE: "metacov.ini"
 
     steps:
       - name: "Check out the repo"
@@ -102,7 +117,7 @@ jobs:
       - name: "Set up Python"
         uses: "actions/setup-python@v4"
         with:
-          python-version: "3.8"
+          python-version: "3.7" # Minimum of PYVERSIONS
           cache: pip
           cache-dependency-path: 'requirements/*.pip'
 
@@ -122,71 +137,69 @@ jobs:
       - name: "Combine and report"
         id: combine
         env:
-          COVERAGE_RCFILE: "metacov.ini"
-          COVERAGE_METAFILE: ".metacov"
           COVERAGE_CONTEXT: "yes"
         run: |
           set -xe
-          python -m igor combine_html
-          python -m coverage json
+          python igor.py combine_html
 
       - name: "Upload HTML report"
         uses: actions/upload-artifact@v3
         with:
           name: html_report
           path: htmlcov
 
-      - name: "Upload JSON report"
-        uses: actions/upload-artifact@v3
-        with:
-          name: json_report
-          path: coverage.json
+      - name: "Get total"
+        id: total
+        run: |
+          echo "total=$(python -m coverage report --format=total)" >> $GITHUB_OUTPUT
 
   publish:
     name: "Publish coverage report"
     needs: combine
     runs-on: ubuntu-latest
 
     steps:
-      - name: "Checkout reports repo"
-        run: |
-          set -xe
-          git clone --depth=1 --no-checkout https://${{ secrets.COVERAGE_REPORTS_TOKEN }}@github.com/nedbat/coverage-reports reports_repo
-          cd reports_repo
-          git sparse-checkout init --cone
-          git sparse-checkout set --skip-checks '/*' '!/reports'
-          git config user.name nedbat
-          git config user.email ned@nedbatchelder.com
-          git checkout main
-
-      - name: "Download coverage JSON report"
-        uses: actions/download-artifact@v3
-        with:
-          name: json_report
-
       - name: "Compute info for later steps"
         id: info
         run: |
           set -xe
-          export TOTAL=$(python -c "import json;print(json.load(open('coverage.json'))['totals']['percent_covered_display'])")
           export SHA10=$(echo ${{ github.sha }} | cut -c 1-10)
           export SLUG=$(date +'%Y%m%d')_$SHA10
           export REPORT_DIR=reports/$SLUG/htmlcov
           export REF="${{ github.ref }}"
-          echo "total=$TOTAL" >> $GITHUB_ENV
+          echo "total=${{ needs.combine.outputs.total }}" >> $GITHUB_ENV
           echo "sha10=$SHA10" >> $GITHUB_ENV
           echo "slug=$SLUG" >> $GITHUB_ENV
           echo "report_dir=$REPORT_DIR" >> $GITHUB_ENV
           echo "url=https://nedbat.github.io/coverage-reports/$REPORT_DIR" >> $GITHUB_ENV
           echo "branch=${REF#refs/heads/}" >> $GITHUB_ENV
 
+      - name: "Create summary"
+        run: |
+          echo '### Total coverage: ${{ env.total }}%' >> $GITHUB_STEP_SUMMARY
+          echo '[${{ env.url }}](${{ env.url }})' >> $GITHUB_STEP_SUMMARY
+
+      - name: "Checkout reports repo"
+        if: ${{ github.ref == 'refs/heads/master' }}
+        run: |
+          set -xe
+          git clone --depth=1 --no-checkout https://${{ secrets.COVERAGE_REPORTS_TOKEN }}@github.com/nedbat/coverage-reports reports_repo
+          cd reports_repo
+          git sparse-checkout init --cone
+          git sparse-checkout set --skip-checks '/*' '!/reports'
+          git config user.name nedbat
+          git config user.email ned@nedbatchelder.com
+          git checkout main
+
       - name: "Download coverage HTML report"
+        if: ${{ github.ref == 'refs/heads/master' }}
         uses: actions/download-artifact@v3
         with:
           name: html_report
           path: reports_repo/${{ env.report_dir }}
 
       - name: "Push to report repo"
+        if: ${{ github.ref == 'refs/heads/master' }}
         env:
           COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
         run: |
@@ -209,9 +222,9 @@ jobs:
           git push
 
       - name: "Create badge"
+        if: ${{ github.ref == 'refs/heads/master' }}
         # https://gist.githubusercontent.com/nedbat/8c6980f77988a327348f9b02bbaf67f5
-        # uses: schneegans/dynamic-badges-action@v1.4.0
-        uses: schneegans/dynamic-badges-action@54d929a33e7521ab6bf19d323d28fb7b876c53f7
+        uses: schneegans/dynamic-badges-action@5d424ad4060f866e4d1dab8f8da0456e6b1c4f56
         with:
           auth: ${{ secrets.METACOV_GIST_SECRET }}
           gistID: 8c6980f77988a327348f9b02bbaf67f5
@@ -221,8 +234,3 @@ jobs:
           minColorRange: 60
           maxColorRange: 95
           valColorRange: ${{ env.total }}
-
-      - name: "Create summary"
-        run: |
-          echo '### Total coverage: ${{ env.total }}%' >> $GITHUB_STEP_SUMMARY
-          echo '[${{ env.url }}](${{ env.url }})' >> $GITHUB_STEP_SUMMARY

.github/workflows/dependency-review.yml

@@ -17,4 +17,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v3
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v2
+        uses: actions/dependency-review-action@v3

.github/workflows/kit.yml

@@ -77,11 +77,13 @@ jobs:
           #   }
           #   # PYVERSIONS. Available versions:
           #   # https://github.com/actions/python-versions/blob/main/versions-manifest.json
+          #   # Include prereleases if they are at rc stage.
+          #   # PyPy versions are handled further below in the "pypy" step.
           #   pys = ["cp37", "cp38", "cp39", "cp310", "cp311"]
           #
           #   # Some OS/arch combinations need overrides for the Python versions:
           #   os_arch_pys = {
-          #     ("macos", "arm64"): ["cp38", "cp39", "cp310"],
+          #     ("macos", "arm64"): ["cp38", "cp39", "cp310", "cp311"],
           #   }
           #
           #   #----- ^^^ ---------------------- ^^^ -----
@@ -115,6 +117,7 @@ jobs:
           - {"os": "macos", "py": "cp38", "arch": "arm64"}
           - {"os": "macos", "py": "cp39", "arch": "arm64"}
           - {"os": "macos", "py": "cp310", "arch": "arm64"}
+          - {"os": "macos", "py": "cp311", "arch": "arm64"}
           - {"os": "macos", "py": "cp37", "arch": "x86_64"}
           - {"os": "macos", "py": "cp38", "arch": "x86_64"}
           - {"os": "macos", "py": "cp39", "arch": "x86_64"}
@@ -130,14 +133,13 @@ jobs:
           - {"os": "windows", "py": "cp39", "arch": "AMD64"}
           - {"os": "windows", "py": "cp310", "arch": "AMD64"}
           - {"os": "windows", "py": "cp311", "arch": "AMD64"}
-        # [[[end]]] (checksum: 428e5138336453464dde968cc3149f4f)
+        # [[[end]]] (checksum: ded8a9f214bf59776562d91ae6828863)
       fail-fast: false
 
     steps:
       - name: "Setup QEMU"
         if: matrix.os == 'ubuntu'
-        # uses: docker/setup-qemu-action@v2
-        uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8
+        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18
         with:
           platforms: arm64
 
@@ -216,8 +218,7 @@ jobs:
       - name: "Install PyPy"
         uses: actions/setup-python@v4
         with:
-          # PYVERSIONS
-          python-version: "pypy-3.7"
+          python-version: "pypy-3.7" # Minimum of PyPy PYVERSIONS
           cache: pip
           cache-dependency-path: 'requirements/*.pip'
 
@@ -227,9 +228,9 @@ jobs:
 
       - name: "Build wheel"
         run: |
-          # One wheel works for all PyPy versions.
+          # One wheel works for all PyPy versions. PYVERSIONS
           # yes, this is weird syntax: https://github.com/pypa/build/issues/202
-          pypy3 -m build -w -C="--global-option=--python-tag" -C="--global-option=pp36.pp37.pp38"
+          pypy3 -m build -w -C="--global-option=--python-tag" -C="--global-option=pp37.pp38.pp39"
 
       - name: "List wheels"
         run: |

.github/workflows/python-nightly.yml

@@ -32,7 +32,12 @@ concurrency:
 jobs:
   tests:
     name: "Python ${{ matrix.python-version }}"
-    runs-on: ubuntu-latest
+    # Choose a recent Ubuntu that deadsnakes still builds all the versions for.
+    # For example, deadsnakes doesn't provide 3.10 nightly for 22.04 (jammy)
+    # because jammy ships 3.10, and deadsnakes doesn't want to clobber it.
+    # https://launchpad.net/~deadsnakes/+archive/ubuntu/nightly/+packages
+    # https://github.com/deadsnakes/issues/issues/234
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
@@ -41,9 +46,9 @@ jobs:
           # tox.ini so that tox will run properly. PYVERSIONS
           # Available versions:
           # https://launchpad.net/~deadsnakes/+archive/ubuntu/nightly/+packages
-          - "3.9-dev"
           - "3.10-dev"
           - "3.11-dev"
+          - "3.12-dev"
           # https://github.com/actions/setup-python#available-versions-of-pypy
           - "pypy-3.7-nightly"
           - "pypy-3.8-nightly"
@@ -55,8 +60,7 @@ jobs:
         uses: "actions/checkout@v3"
 
       - name: "Install ${{ matrix.python-version }} with deadsnakes"
-        # uses: deadsnakes/action@v2.1.1
-        uses: deadsnakes/action@7ab8819e223c70d2bdedd692dfcea75824e0a617
+        uses: deadsnakes/action@e3117c2981fd8afe4af79f3e1be80066c82b70f5
         if: "!startsWith(matrix.python-version, 'pypy-')"
         with:
           python-version: "${{ matrix.python-version }}"

.github/workflows/quality.yml

@@ -46,15 +46,37 @@ jobs:
 
       - name: "Install dependencies"
         run: |
-          set -xe
-          python -VV
-          python -m site
           python -m pip install --require-hashes -r requirements/tox.pip
 
       - name: "Tox lint"
         run: |
           python -m tox -e lint
 
+  mypy:
+    name: "Check types"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Check out the repo"
+        uses: "actions/checkout@v3"
+
+      - name: "Install Python"
+        uses: "actions/setup-python@v4"
+        with:
+          python-version: "3.8" # Minimum of PYVERSIONS, but at least 3.8
+          cache: pip
+          cache-dependency-path: 'requirements/*.pip'
+
+      - name: "Install dependencies"
+        run: |
+          # We run on 3.8, but the pins were made on 3.7, so don't insist on
+          # hashes, which won't match.
+          python -m pip install -r requirements/tox.pip
+
+      - name: "Tox mypy"
+        run: |
+          python -m tox -e mypy
+
   doc:
     name: "Build docs"
     runs-on: ubuntu-latest

.github/workflows/testsuite.yml

@@ -18,6 +18,7 @@ defaults:
 env:
   PIP_DISABLE_PIP_VERSION_CHECK: 1
   COVERAGE_IGOR_VERBOSE: 1
+  FORCE_COLOR: 1    # Get colored pytest output
 
 permissions:
   contents: read
@@ -47,9 +48,13 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
-          - "3.11.0-rc.2"
+          - "3.11"
           - "pypy-3.7"
           - "pypy-3.9"
+        exclude:
+          # Windows PyPy-3.9 always gets killed.
+          - os: windows
+            python-version: "pypy-3.9"
       fail-fast: false
 
     steps:
@@ -73,31 +78,26 @@ jobs:
           # python -c "import urllib.request as r; exec(r.urlopen('https://bit.ly/pydoctor').read())"
 
       - name: "Run tox for ${{ matrix.python-version }}"
-        continue-on-error: true
-        id: tox1
         run: |
           python -m tox -- -rfsEX
 
       - name: "Retry tox for ${{ matrix.python-version }}"
-        id: tox2
-        if: steps.tox1.outcome == 'failure'
+        if: failure()
         run: |
-          python -m tox -- -rfsEX
-
-      - name: "Set status"
-        if: always()
-        run: |
-          if ${{ steps.tox1.outcome != 'success' && steps.tox2.outcome != 'success' }}; then
-             exit 1
-          fi
+          # `exit 1` makes sure that the job remains red with flaky runs
+          python -m tox -- -rfsEX --lf -vvvvv && exit 1
 
-  # A final step to give a simple name for required status checks.
+  # This job aggregates test results. It's the required check for branch protection.
+  # https://github.com/marketplace/actions/alls-green#why
   # https://github.com/orgs/community/discussions/33579
   success:
-    needs: tests
-    runs-on: ubuntu-latest
     name: Tests successful
+    if: always()
+    needs:
+      - tests
+    runs-on: ubuntu-latest
     steps:
-      - name: "Success"
-        run: |
-          echo Tests successful
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe
+        with:
+          jobs: ${{ toJSON(needs) }}