From 55ad59089197593985b3e6a94aac9a13d7853b39 Mon Sep 17 00:00:00 2001 From: "Terence D. Honles" Date: Mon, 12 Apr 2021 15:38:24 -0700 Subject: [PATCH 1/2] Mark support for Python 3.8 & 3.9 and add to testing matrix --- .github/workflows/ci.yml | 16 +++++++++------- setup.py | 2 ++ tox.ini | 8 ++++++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da50a6d..22e0174 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ --- name: build -on: push +on: [push, pull_request] jobs: tox: runs-on: ubuntu-18.04 @@ -8,9 +8,11 @@ jobs: fail-fast: false matrix: python: - - py27 - - py36 - - py37 + - '2.7' + - '3.6' + - '3.7' + - '3.8' + - '3.9' httplib: - default - fido @@ -19,9 +21,9 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: ${{ matrix.python }} - run: pip install tox - - run: tox -e ${{ matrix.python }}-${{ matrix.httplib }} + - run: tox -e py$(tr -d . <<<${{ matrix.python }})-${{ matrix.httplib }} misc: runs-on: ubuntu-18.04 @@ -35,6 +37,6 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.9 - run: pip install tox - run: tox -e ${{ matrix.tox }} diff --git a/setup.py b/setup.py index 6c46ede..4c9779a 100755 --- a/setup.py +++ b/setup.py @@ -29,6 +29,8 @@ 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', ], package_data={ 'bravado': ['py.typed'], diff --git a/tox.ini b/tox.ini index 638363a..a184cd8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,9 @@ [tox] -envlist = {py27,py36,py37}-{default,fido}, {py27,py36,py37}-fido-requests2dot17, mypy, pre-commit +envlist = + {py27,py36,py37,py38,py39}-{default,fido} + {py27,py36,py37,py38,py39}-fido-requests2dot17 + mypy + pre-commit [testenv] deps = @@ -23,7 +27,7 @@ commands = pre-commit {posargs:run --all-files} [testenv:mypy] -basepython = python3.7 +basepython = python3 deps = # TODO: Latest twisted (>=21) and mypy (0.8XX) don't get along. Remove when they're friends again. # From d9070d6f7c49757d08bd4d439f08af17aef1d9fd Mon Sep 17 00:00:00 2001 From: "Terence D. Honles" Date: Mon, 12 Apr 2021 15:46:14 -0700 Subject: [PATCH 2/2] Allow mypy GitHub action runner to fail --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22e0174..c507429 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,12 +27,16 @@ jobs: misc: runs-on: ubuntu-18.04 + continue-on-error: ${{ matrix.experimental }} strategy: fail-fast: false matrix: tox: - - mypy - pre-commit + experimental: [false] + include: + - tox: mypy + experimental: true steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2