diff options
author | David Lord <davidism@gmail.com> | 2021-11-05 09:02:19 -0700 |
---|---|---|
committer | David Lord <davidism@gmail.com> | 2021-11-05 09:02:19 -0700 |
commit | db9fa82733607017fc93fe2a53178bf7527dfde8 (patch) | |
tree | c64582ba65d2bbdda53827ed4aa2e8d39b99bc89 | |
parent | c71f03b0f8b7caa764a0bfec845ce0036a6080e3 (diff) | |
parent | d734226d19f6cd30821baf0090154c91a3db762d (diff) | |
download | markupsafe-db9fa82733607017fc93fe2a53178bf7527dfde8.tar.gz |
Merge branch '2.0.x'
-rw-r--r-- | .github/workflows/build.yaml | 2 | ||||
-rw-r--r-- | .github/workflows/tests.yaml | 1 | ||||
-rw-r--r-- | requirements/dev.txt | 2 | ||||
-rw-r--r-- | requirements/tests.txt | 2 | ||||
-rw-r--r-- | tox.ini | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a4a161a..d8bee02 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,7 @@ jobs: uses: docker/setup-qemu-action@v1 with: platforms: arm64 - - uses: joerick/cibuildwheel@v2.1.1 + - uses: joerick/cibuildwheel@v2.2.0 env: CIBW_SKIP: 'pp*' CIBW_ARCHS_LINUX: auto aarch64 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3c375ef..4e48dd9 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -27,6 +27,7 @@ jobs: - {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} diff --git a/requirements/dev.txt b/requirements/dev.txt index 53f069c..392f7a4 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -66,7 +66,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{310,39,38,37,36,py37} + py3{11,10,9,8,7,6},pypy37 style typing docs |