From 4100d31cd32707378ce45db4bbe0423c32e999f8 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Mon, 2 Jan 2023 22:52:53 +0100
Subject: [PATCH] fix CI

---
 .github/workflows/ci.yml            |  9 ++++++---
 .github/workflows/install_h2spec.sh |  5 ++---
 tox.ini                             | 13 +++++++------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c51ea500..88d6340c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tox:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04 # bump to -latest or -22.04 once we drop py36
     strategy:
       max-parallel: 5
       matrix:
@@ -18,11 +18,12 @@ jobs:
         - "3.8"
         - "3.9"
         - "3.10"
-        - pypy3
+        - "3.11"
+        - "pypy3.9"
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install tox
@@ -30,6 +31,8 @@ jobs:
         python -m pip install --upgrade pip setuptools
         pip install --upgrade tox tox-gh-actions
     - name: Install h2spec
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         .github/workflows/install_h2spec.sh
     - name: Initialize tox envs
diff --git a/.github/workflows/install_h2spec.sh b/.github/workflows/install_h2spec.sh
index d4d80c02a..fcde8143d 100755
--- a/.github/workflows/install_h2spec.sh
+++ b/.github/workflows/install_h2spec.sh
@@ -1,16 +1,15 @@
 #!/usr/bin/env bash
 
 set -e
-set -x
 
 # For some reason it helps to have this here.
-echo $(curl -s https://api.github.com/repos/summerwind/h2spec/releases/latest)
+echo $(curl -s --url https://api.github.com/repos/summerwind/h2spec/releases/latest --header "authorization: Bearer ${GITHUB_TOKEN}")
 
 # We want to get the latest release of h2spec. We do that by asking the
 # Github API for it, and then parsing the JSON for the appropriate kind of
 # binary. Happily, the binary is always called "h2spec" so we don't need
 # even more shenanigans to get this to work.
-TARBALL=$(curl -s https://api.github.com/repos/summerwind/h2spec/releases/latest | jq --raw-output '.assets[] | .browser_download_url | select(endswith("linux_amd64.tar.gz"))')
+TARBALL=$(curl -s --url https://api.github.com/repos/summerwind/h2spec/releases/latest --header "authorization: Bearer ${GITHUB_TOKEN}" | jq --raw-output '.assets[] | .browser_download_url | select(endswith("linux_amd64.tar.gz"))')
 
 curl -s -L "$TARBALL" -o h2spec.tgz
 tar xvf h2spec.tgz
diff --git a/tox.ini b/tox.ini
index e401b5bc5..2c0206360 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36, py37, py38, py39, py310, pypy3, lint, docs, packaging
+envlist = py36, py37, py38, py39, py310, py311, pypy3, lint, docs, packaging
 
 [gh-actions]
 python =
@@ -8,6 +8,7 @@ python =
     3.8: py38
     3.9: py39, lint, docs, packaging, h2spec
     3.10: py310
+    3.11: py311
     pypy3: pypy3
 
 [testenv]
@@ -33,7 +34,7 @@ commands = flake8 src/ test/
 [testenv:docs]
 deps =
     sphinx>=4.0.2,<5
-whitelist_externals = make
+allowlist_externals = make
 changedir = {toxinidir}/docs
 commands =
     make clean
@@ -43,9 +44,9 @@ commands =
 basepython = python3.9
 deps =
     check-manifest==0.46
-    readme-renderer==29.0
+    readme-renderer==37.3
     twine>=3.4.1,<4
-whitelist_externals = rm
+allowlist_externals = rm
 commands =
     rm -rf dist/
     check-manifest
@@ -56,7 +57,7 @@ commands =
 basepython = {[testenv:packaging]basepython}
 deps =
     {[testenv:packaging]deps}
-whitelist_externals = {[testenv:packaging]whitelist_externals}
+allowlist_externals = {[testenv:packaging]allowlist_externals}
 commands =
     {[testenv:packaging]commands}
     twine upload dist/*
@@ -72,6 +73,6 @@ commands =
 basepython = python3.8
 deps =
     twisted[tls]==20.3.0
-whitelist_externals = {toxinidir}/test/h2spectest.sh
+allowlist_externals = {toxinidir}/test/h2spectest.sh
 commands =
     {toxinidir}/test/h2spectest.sh