diff options
author | David Lord <davidism@gmail.com> | 2023-01-09 14:08:48 -0800 |
---|---|---|
committer | David Lord <davidism@gmail.com> | 2023-01-09 14:08:48 -0800 |
commit | 78cf8f0fcb693e961fd6b31b40f7b1e3c176a745 (patch) | |
tree | 6be8ba772a3ffdca592d47753ed496a9669d55a6 | |
parent | 2fc49a4a46f955f6cdb68be175c166d022676b59 (diff) | |
parent | 3dd95adcaaf07c16e37d39f2d235cb0c552face5 (diff) | |
download | itsdangerous-78cf8f0fcb693e961fd6b31b40f7b1e3c176a745.tar.gz |
Merge branch '2.1.x'
-rw-r--r-- | .github/workflows/tests.yaml | 17 | ||||
-rw-r--r-- | tox.ini | 11 |
2 files changed, 18 insertions, 10 deletions
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 06ab21a..b757fa0 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -24,15 +24,16 @@ jobs: fail-fast: false matrix: include: - - {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: Linux, python: '3.11', os: ubuntu-latest, tox: py311} + - {name: Windows, python: '3.11', os: windows-latest, tox: py311} + - {name: Mac, python: '3.11', os: macos-latest, tox: py311} + - {name: '3.12-dev', python: '3.12-dev', os: ubuntu-latest, tox: py312} + - {name: '3.10', python: '3.10', os: ubuntu-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: 'PyPy', python: 'pypy-3.7', os: ubuntu-latest, tox: pypy37} - - {name: Typing, python: '3.10', os: ubuntu-latest, tox: typing} + - {name: 'PyPy', python: 'pypy-3.9', os: ubuntu-latest, tox: pypy39} + - {name: Typing, python: '3.11', os: ubuntu-latest, tox: typing} steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -46,10 +47,10 @@ jobs: pip install -U setuptools python -m pip install -U pip - name: cache mypy - uses: actions/cache@v3.2.2 + uses: actions/cache@v3 with: path: ./.mypy_cache key: mypy|${{ matrix.python }}|${{ hashFiles('setup.cfg') }} if: matrix.tox == 'typing' - run: pip install tox - - run: tox -e ${{ matrix.tox }} + - run: tox run -e ${{ matrix.tox }} @@ -1,24 +1,31 @@ [tox] envlist = - py3{11,10,9,8,7},pypy3{8,7} + py3{12,11,10,9,8,7} + pypy39 style typing docs skip_missing_interpreters = true [testenv] +package = wheel +wheel_build_env = .pkg deps = -r requirements/tests.txt commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs} [testenv:style] deps = pre-commit skip_install = true -commands = pre-commit run --all-files --show-diff-on-failure +commands = pre-commit run --all-files [testenv:typing] +package = wheel +wheel_build_env = .pkg deps = -r requirements/typing.txt commands = mypy [testenv:docs] +package = wheel +wheel_build_env = .pkg deps = -r requirements/docs.txt commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html |