diff options
| author | David Lord <davidism@gmail.com> | 2023-01-09 15:09:02 -0800 |
|---|---|---|
| committer | David Lord <davidism@gmail.com> | 2023-01-09 15:09:02 -0800 |
| commit | 03fac16fd8723418b6e8623c2fb0bec616aff677 (patch) | |
| tree | e30ab1db68d98810c483f3a8f761c381b4747e32 | |
| parent | 1b07d600ee4eb475da2a52d84c3c81ecd59b6f7d (diff) | |
| parent | 64e1c36851cb615276f631c9ee8bbd95f6e6c39f (diff) | |
| download | markupsafe-03fac16fd8723418b6e8623c2fb0bec616aff677.tar.gz | |
Merge branch '2.1.x'
| -rw-r--r-- | .github/workflows/lock.yaml | 12 | ||||
| -rw-r--r-- | .github/workflows/tests.yaml | 17 | ||||
| -rw-r--r-- | tox.ini | 8 |
3 files changed, 26 insertions, 11 deletions
diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml index c771673..20bec85 100644 --- a/.github/workflows/lock.yaml +++ b/.github/workflows/lock.yaml @@ -1,15 +1,25 @@ name: 'Lock threads' +# Lock closed issues that have not received any further activity for +# two weeks. This does not close open issues, only humans may do that. +# We find that it is easier to respond to new issues with fresh examples +# rather than continuing discussions on old issues. on: schedule: - cron: '0 0 * * *' +permissions: + issues: write + pull-requests: write + +concurrency: + group: lock + jobs: lock: runs-on: ubuntu-latest steps: - uses: dessant/lock-threads@v4 with: - github-token: ${{ github.token }} issue-inactive-days: 14 pr-inactive-days: 14 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,28 @@ [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 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 deps = -r requirements/typing.txt commands = mypy [testenv:docs] +package = wheel deps = -r requirements/docs.txt commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html |