summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2021-11-05 06:45:06 -0700
committerGitHub <noreply@github.com>2021-11-05 06:45:06 -0700
commit7e98f2353882f1d4c22f5903251a7efedcf5aa7b (patch)
tree789cbb856bc27173f5c364ea6f4302663d6287ab
parentd5a436c2794932c2dcba3ec60c58461a453ed2cf (diff)
parent34eb205e83b67bdfe4aa0b07b68c53fbd435728f (diff)
downloadjinja2-7e98f2353882f1d4c22f5903251a7efedcf5aa7b.tar.gz
Merge pull request #1530 from pallets/test-3.10
test Python 3.10
-rw-r--r--.github/workflows/tests.yaml11
-rw-r--r--tox.ini2
2 files changed, 7 insertions, 6 deletions
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index b00a866..3c375ef 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -24,14 +24,15 @@ 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.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/tox.ini b/tox.ini
index de68730..2da3432 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py{39,38,37,36,py3}
+ py{310,39,38,37,36,py37}
style
typing
docs