From 43cff5701769d3278b7a0f48acc6898af245c3df Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Mon, 12 Sep 2022 16:46:45 +0200 Subject: [PATCH 1/2] Restrict python patch version in ci This can be reverted once a mypy version with https://github.com/python/mypy/pull/13500 is out --- .github/workflows/pytest.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index c63cdfce030f..153474c433ec 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -18,7 +18,10 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.7", "3.8", "3.9", "3.10"] + # we need to pin to 3.10.6 until + # https://github.com/python/mypy/pull/13500 + # is part of a released version of mypy + python-version: ["3.7", "3.8", "3.9", "3.10.6"] exclude: - os: windows-latest python-version: "3.7" From 5a5acfceee9d4257c7994c19fb9fd2a8f509d7b3 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Mon, 12 Sep 2022 16:58:54 +0200 Subject: [PATCH 2/2] update bors too --- bors.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bors.toml b/bors.toml index 25cc2fc4c8bf..d8898cb902bd 100644 --- a/bors.toml +++ b/bors.toml @@ -7,8 +7,8 @@ status = [ "pytestmypy (ubuntu-latest, 3.7)", "pytestmypy (ubuntu-latest, 3.8)", "pytestmypy (ubuntu-latest, 3.9)", - "pytestmypy (ubuntu-latest, 3.10)", - "pytestmypy (windows-latest, 3.10)", + "pytestmypy (ubuntu-latest, 3.10.6)", + "pytestmypy (windows-latest, 3.10.6)", "pytestmin (ubuntu-latest, 3.7)" ] # these are the checks that must pass before a branch can be merged to staging using bors r+ @@ -20,8 +20,8 @@ pr_status = [ "pytestmypy (ubuntu-latest, 3.7)", "pytestmypy (ubuntu-latest, 3.8)", "pytestmypy (ubuntu-latest, 3.9)", - "pytestmypy (ubuntu-latest, 3.10)", - "pytestmypy (windows-latest, 3.10)", + "pytestmypy (ubuntu-latest, 3.10.6)", + "pytestmypy (windows-latest, 3.10.6)", "pytestmin (ubuntu-latest, 3.7)", "pre-commit.ci - pr" ]