diff options
| author | David Lord <davidism@gmail.com> | 2021-01-29 13:59:40 -0800 |
|---|---|---|
| committer | David Lord <davidism@gmail.com> | 2021-01-29 13:59:40 -0800 |
| commit | 1f82fb389c6fd13258b248cca7d68a658d2d9e03 (patch) | |
| tree | 2890e6e55b8dd86b8be9a2c5ee1344b824afa5a2 | |
| parent | 36c57b3809f2a5895aea3e3b86f26b267a907926 (diff) | |
| parent | fff7934929be0d889685f33dae6f3f3b0f6d76c8 (diff) | |
| download | markupsafe-1f82fb389c6fd13258b248cca7d68a658d2d9e03.tar.gz | |
Merge branch '1.1.x'
| -rw-r--r-- | .github/workflows/build.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/tests.yaml | 11 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8029e88..5885f54 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.9' - run: pip install cibuildwheel - run: cibuildwheel - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4c457e1..0cd5fda 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -16,14 +16,15 @@ jobs: fail-fast: false matrix: include: - - {name: Linux, python: '3.8', os: ubuntu-latest, tox: py38} - - {name: Windows, python: '3.8', os: windows-latest, tox: py38} - - {name: Mac, python: '3.8', os: macos-latest, tox: py38} + - {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: '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: Style, python: '3.8', os: ubuntu-latest, tox: style} - - {name: Docs, python: '3.8', os: ubuntu-latest, tox: docs} + - {name: Style, python: '3.9', os: ubuntu-latest, tox: style} + - {name: Docs, python: '3.9', os: ubuntu-latest, tox: docs} steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -1,6 +1,6 @@ [tox] envlist = - py{38,37,36,py3} + py{39,38,37,36,py3} style docs skip_missing_interpreters = true |