diff options
| -rw-r--r-- | .github/workflows/ci.yml | 115 | ||||
| -rw-r--r-- | jsonschema/tests/test_cli.py | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 26 insertions, 93 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 }}" diff --git a/jsonschema/tests/test_cli.py b/jsonschema/tests/test_cli.py index 22528fe..884a037 100644 --- a/jsonschema/tests/test_cli.py +++ b/jsonschema/tests/test_cli.py @@ -747,7 +747,7 @@ class TestCLI(TestCase): ], ) error = str(e.exception) - self.assertIn("/someNonexistentFile.json'", error) + self.assertIn(f"{os.sep}someNonexistentFile.json'", error) def test_invalid_exlicit_base_uri(self): schema = '{"$ref": "foo.json#definitions/num"}' @@ -43,7 +43,7 @@ deps = perf: pyperf - tests,coverage,codecov: twisted + tests,coverage,codecov: twisted>=21.2.0rc1 coverage,codecov: coverage codecov: codecov |