diff options
| author | David Lord <davidism@gmail.com> | 2021-11-05 09:07:17 -0700 |
|---|---|---|
| committer | David Lord <davidism@gmail.com> | 2021-11-05 09:07:17 -0700 |
| commit | d5932d674d804cf67b20e4f1c3546abf5aa65494 (patch) | |
| tree | ba5257208069087ca5c9a53e3027f70d9e4ce60e | |
| parent | 2996d3c11972ad1d71339481f2119495185e7d8d (diff) | |
| parent | df6b72d3e079a8bf1f8455486cf7ac6663ea1916 (diff) | |
| download | click-d5932d674d804cf67b20e4f1c3546abf5aa65494.tar.gz | |
Merge branch '8.0.x'
| -rw-r--r-- | .github/workflows/tests.yaml | 12 | ||||
| -rw-r--r-- | requirements/dev.txt | 2 | ||||
| -rw-r--r-- | requirements/tests.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index b00a866..4e48dd9 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -24,14 +24,16 @@ jobs: fail-fast: false matrix: include: - - {name: Linux, python: '3.9', os: ubuntu-latest, tox: py39} - - {name: Windows, python: '3.9', os: windows-latest, tox: py39} - - {name: Mac, python: '3.9', os: macos-latest, tox: py39} + - {name: Linux, python: '3.10', os: ubuntu-latest, tox: py310} + - {name: Windows, python: '3.10', os: windows-latest, tox: py310} + - {name: Mac, python: '3.10', os: macos-latest, tox: py310} + - {name: '3.11-dev', python: '3.11-dev', os: ubuntu-latest, tox: py311} + - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39} - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38} - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37} - {name: '3.6', python: '3.6', os: ubuntu-latest, tox: py36} - - {name: 'PyPy', python: pypy3, os: ubuntu-latest, tox: pypy3} - - {name: Typing, python: '3.9', os: ubuntu-latest, tox: typing} + - {name: 'PyPy', python: 'pypy-3.7', os: ubuntu-latest, tox: pypy37} + - {name: Typing, python: '3.10', os: ubuntu-latest, tox: typing} steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 diff --git a/requirements/dev.txt b/requirements/dev.txt index 135c3c8..9fafe31 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -68,7 +68,7 @@ pluggy==1.0.0 # tox pre-commit==2.15.0 # via -r requirements/dev.in -py==1.10.0 +py==1.11.0 # via # pytest # tox diff --git a/requirements/tests.txt b/requirements/tests.txt index eae3d8f..02dd8e8 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -12,7 +12,7 @@ packaging==21.2 # via pytest pluggy==1.0.0 # via pytest -py==1.10.0 +py==1.11.0 # via pytest pyparsing==2.4.7 # via packaging @@ -1,6 +1,6 @@ [tox] envlist = - py{39,38,37,36,py3} + py3{11,10,9,8,7,6},pypy37 style typing docs |