diff options
author | Julian Berman <Julian@GrayVines.com> | 2021-03-02 18:42:16 -0500 |
---|---|---|
committer | Julian Berman <Julian@GrayVines.com> | 2021-03-02 18:42:16 -0500 |
commit | 2e6d699d218836b6336b542b42d0570b60b2f8b8 (patch) | |
tree | 595c1ca9914cfe609316dacddcf024558b7b419d /.github | |
parent | 94e0f72081584db8dc80cc826c270dfef36f652b (diff) | |
parent | b4a33401cbfa2a79787fbc7d5e19206ce01b896e (diff) | |
download | jsonschema-2e6d699d218836b6336b542b42d0570b60b2f8b8.tar.gz |
Merge branch 'main' into DavidKorczynski/main
* main:
Reskip the PyPy-on-Windows tests.
Try the Twisted prerelease, which hopefully obviates installing IOCP.
No, don't use venv.
Fix test to windows path matching
Test via PyPy3.7
Unskip most of the skipped windows builds.
Update pre-commit.
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/ci.yml | 115 |
1 files changed, 24 insertions, 91 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9844c42..3446f25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,17 +17,17 @@ jobs: matrix: os: [macos-latest, ubuntu-latest, windows-latest] python-version: - - name: pypy3 + - name: pypy-3.7 toxenv: pypy3-noextra-build - - name: pypy3 + - name: pypy-3.7 toxenv: pypy3-noextra-tests - - name: pypy3 + - name: pypy-3.7 toxenv: pypy3-format-build - - name: pypy3 + - name: pypy-3.7 toxenv: pypy3-format-tests - - name: pypy3 + - name: pypy-3.7 toxenv: pypy3-format_nongpl-build - - name: pypy3 + - name: pypy-3.7 toxenv: pypy3-format_nongpl-tests - name: 3.6 toxenv: py36-noextra-build @@ -98,104 +98,40 @@ jobs: exclude: - os: windows-latest python-version: - name: pypy3 - toxenv: pypy3-noextra-build - - os: windows-latest - python-version: - name: pypy3 - toxenv: pypy3-format-build - - os: windows-latest - python-version: - name: pypy3 - toxenv: pypy3-format_nongpl-build - - os: windows-latest - python-version: - name: pypy3 - toxenv: pypy3-noextra-tests - - os: windows-latest - python-version: - name: pypy3 - toxenv: pypy3-format-tests - - os: windows-latest - python-version: - name: pypy3 - toxenv: pypy3-format_nongpl-tests - - os: windows-latest - python-version: - name: pypy3 - toxenv: safety - - os: windows-latest - python-version: - name: 3.6 - toxenv: py36-noextra-build - - os: windows-latest - python-version: - name: 3.6 - toxenv: py36-format-build - - os: windows-latest - python-version: - name: 3.6 - toxenv: py36-format_nongpl-build - - os: windows-latest - python-version: - name: 3.6 - toxenv: py36-noextra-tests - - os: windows-latest - python-version: - name: 3.6 - toxenv: py36-format-tests - - os: windows-latest - python-version: - name: 3.6 - toxenv: py36-format_nongpl-tests - - os: windows-latest - python-version: - name: 3.7 - toxenv: py37-noextra-tests - - os: windows-latest - python-version: - name: 3.7 - toxenv: py37-format-tests - - os: windows-latest - python-version: - name: 3.7 - toxenv: py37-format_nongpl-tests - - os: windows-latest - python-version: - name: 3.8 - toxenv: py38-noextra-tests + name: 3.9 + toxenv: readme - os: windows-latest python-version: - name: 3.8 - toxenv: py38-format-tests + name: 3.9 + toxenv: docs-linkcheck - os: windows-latest python-version: - name: 3.8 - toxenv: py38-format_nongpl-tests + name: 3.9 + toxenv: docs-style - os: windows-latest python-version: - name: 3.9 - toxenv: py39-noextra-tests + name: pypy-3.7 + toxenv: pypy3-noextra-build - os: windows-latest python-version: - name: 3.9 - toxenv: py39-format-tests + name: pypy-3.7 + toxenv: pypy3-noextra-tests - os: windows-latest python-version: - name: 3.9 - toxenv: py39-format_nongpl-tests + name: pypy-3.7 + toxenv: pypy3-format-build - os: windows-latest python-version: - name: 3.9 - toxenv: readme + name: pypy-3.7 + toxenv: pypy3-format-tests - os: windows-latest python-version: - name: 3.9 - toxenv: docs-linkcheck + name: pypy-3.7 + toxenv: pypy3-format_nongpl-build - os: windows-latest python-version: - name: 3.9 - toxenv: docs-style + name: pypy-3.7 + toxenv: pypy3-format_nongpl-tests steps: - uses: actions/checkout@v2 @@ -215,8 +151,5 @@ jobs: if: runner.os == 'macOS' && startsWith(matrix.python-version.toxenv, 'docs-') - name: Install tox run: python -m pip install tox - - name: Use venv on Windows - run: python -m pip install tox-venv - if: runner.os == 'Windows' - name: Run tox run: python -m tox -e "${{ matrix.python-version.toxenv }}" |