From 2c0a4023d681c93d9d8c78527614888be9ce16e7 Mon Sep 17 00:00:00 2001 From: Julian Berman Date: Sat, 20 Feb 2021 19:32:30 -0500 Subject: Unskip most of the skipped windows builds. --- .github/workflows/ci.yml | 88 ------------------------------------------------ 1 file changed, 88 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9844c42..0292a54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,94 +96,6 @@ jobs: - name: 3.9 toxenv: style 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 - - os: windows-latest - python-version: - name: 3.8 - toxenv: py38-format-tests - - os: windows-latest - python-version: - name: 3.8 - toxenv: py38-format_nongpl-tests - - os: windows-latest - python-version: - name: 3.9 - toxenv: py39-noextra-tests - - os: windows-latest - python-version: - name: 3.9 - toxenv: py39-format-tests - - os: windows-latest - python-version: - name: 3.9 - toxenv: py39-format_nongpl-tests - os: windows-latest python-version: name: 3.9 -- cgit v1.2.1 From a590d6ba0e70177725092a728a84d86276aeafc0 Mon Sep 17 00:00:00 2001 From: Julian Berman Date: Sat, 20 Feb 2021 19:47:43 -0500 Subject: Test via PyPy3.7 --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0292a54..64ce22f 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 -- cgit v1.2.1 From c1bcd426d533f004bcd6fe3e1dd27cfc0635c167 Mon Sep 17 00:00:00 2001 From: Milly Date: Sat, 6 Feb 2021 11:09:35 +0900 Subject: Fix test to windows path matching --- jsonschema/tests/test_cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"}' -- cgit v1.2.1 From cabe9b0d84aca0b0e5d905aefb07a9931d3a8210 Mon Sep 17 00:00:00 2001 From: Julian Berman Date: Mon, 22 Feb 2021 17:39:58 -0500 Subject: No, don't use venv. --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64ce22f..3efb6c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,8 +127,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 }}" -- cgit v1.2.1 From 6e83dc76d5028de3a71d6974c52a21d789db91ba Mon Sep 17 00:00:00 2001 From: Julian Berman Date: Mon, 22 Feb 2021 17:45:13 -0500 Subject: Try the Twisted prerelease, which hopefully obviates installing IOCP. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index e731f11..f4ed6f4 100644 --- a/tox.ini +++ b/tox.ini @@ -43,7 +43,7 @@ deps = perf: pyperf - tests,coverage,codecov: twisted + tests,coverage,codecov: twisted>=21.2.0rc1 coverage,codecov: coverage codecov: codecov -- cgit v1.2.1 From d01a699c1a1863d66fb8d79ba59d856d877c7722 Mon Sep 17 00:00:00 2001 From: Julian Berman Date: Mon, 22 Feb 2021 18:06:52 -0500 Subject: Reskip the PyPy-on-Windows tests. They seem to produce a fun variety of errors that I can't diagnose at the minute See e.g. https://github.com/Julian/jsonschema/runs/1956639377?check_suite_focus=true --- .github/workflows/ci.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3efb6c6..3446f25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,6 +108,30 @@ jobs: python-version: name: 3.9 toxenv: docs-style + - os: windows-latest + python-version: + name: pypy-3.7 + toxenv: pypy3-noextra-build + - os: windows-latest + python-version: + name: pypy-3.7 + toxenv: pypy3-noextra-tests + - os: windows-latest + python-version: + name: pypy-3.7 + toxenv: pypy3-format-build + - os: windows-latest + python-version: + name: pypy-3.7 + toxenv: pypy3-format-tests + - os: windows-latest + python-version: + name: pypy-3.7 + toxenv: pypy3-format_nongpl-build + - os: windows-latest + python-version: + name: pypy-3.7 + toxenv: pypy3-format_nongpl-tests steps: - uses: actions/checkout@v2 -- cgit v1.2.1