diff options
author | Julian Berman <Julian@GrayVines.com> | 2019-12-21 17:02:00 +0100 |
---|---|---|
committer | Julian Berman <Julian@GrayVines.com> | 2019-12-22 08:09:00 +0100 |
commit | d9b9302c16fff700edf9de5977632d5383fe32d0 (patch) | |
tree | 2bc05b61e8f73fa5a4c66584150f23f6c4837805 | |
parent | 2c079f224c0e2fd426f937484c7c26f13d3d58af (diff) | |
download | jsonschema-d9b9302c16fff700edf9de5977632d5383fe32d0.tar.gz |
Hacky running of tox in CI.
This needs to be better, but hopefully upstream
catches up.
-rw-r--r-- | .appveyor.yml | 33 | ||||
-rw-r--r-- | .github/workflows/ci.yml | 92 | ||||
-rw-r--r-- | .travis.yml | 27 | ||||
-rw-r--r-- | README.rst | 8 | ||||
-rw-r--r-- | docs/conf.py | 5 | ||||
-rw-r--r-- | tox.ini | 7 |
6 files changed, 101 insertions, 71 deletions
diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 80d5aa5..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,33 +0,0 @@ -build: false -environment: - VENV: "%APPVEYOR_BUILD_FOLDER%\\venv" - - matrix: - - TOXENV: py35-tests - PYTHON: "C:\\Python35" - - - TOXENV: py35-tests - PYTHON: "C:\\Python35-x64" - - - TOXENV: py36-tests - PYTHON: "C:\\Python36" - - - TOXENV: py36-tests - PYTHON: "C:\\Python36-x64" - - - TOXENV: py37-tests - PYTHON: "C:\\Python37" - - - TOXENV: py37-tests - PYTHON: "C:\\Python37-x64" - -init: - - echo "TOXENV - %TOXENV%" - -install: - - ps: Update-AppveyorBuild -Version "v$(python setup.py --version) b$Env:APPVEYOR_BUILD_NUMBER" - - virtualenv -p "%PYTHON%\\python.exe" "%VENV%" - - "%VENV%\\Scripts\\pip install tox" - -test_script: - - "%VENV%\\Scripts\\tox" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..8a2b273 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,92 @@ +name: CI + +on: + push: + release: + types: [published] + +jobs: + ci: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [macos-latest, ubuntu-latest, windows-latest] + python-version: + - name: pypy2 + toxenv: pypy2-build + - name: pypy2 + toxenv: pypy2-tests + - name: pypy2 + toxenv: pypy2-tests_nongpl + - name: pypy2 + toxenv: safety + - name: pypy3 + toxenv: pypy3-build + - name: pypy3 + toxenv: pypy3-tests + - name: pypy3 + toxenv: pypy3-tests_nongpl + - name: pypy3 + toxenv: demo + - name: pypy3 + toxenv: readme + - name: pypy3 + toxenv: safety + - name: pypy3 + toxenv: secrets + - name: pypy3 + toxenv: style + - name: pypy3 + toxenv: docs-html + - name: pypy3 + toxenv: docs-doctest + - name: pypy3 + toxenv: docs-linkcheck + - name: pypy3 + toxenv: docs-spelling + - name: pypy3 + toxenv: docs-style + - name: 3.5 + toxenv: py35-build + - name: 3.5 + toxenv: py35-tests + - name: 3.5 + toxenv: py35-tests_nongpl + - name: 3.6 + toxenv: py36-build + - name: 3.6 + toxenv: py36-tests + - name: 3.6 + toxenv: py36-tests_nongpl + - name: 3.7 + toxenv: py37-build + - name: 3.7 + toxenv: py37-tests + - name: 3.7 + toxenv: py37-tests_nongpl + - name: 3.8 + toxenv: py38-build + - name: 3.8 + toxenv: py38-tests + - name: 3.8 + toxenv: py38-tests_nongpl + + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version.name }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version.name }} + - name: Ensure we have new enough versions to respect python_version + run: python -m pip install -U pip setuptools + - name: Install dependencies + run: sudo apt-get install -y libenchant-dev libxml2-dev libxslt-dev + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.python-version.toxenv, 'docs-') + - name: Install dependencies + run: brew install enchant + if: startsWith(matrix.os, 'mac') && startsWith(matrix.python-version.toxenv, 'docs-') + - name: Install tox + run: python -m pip install tox + - name: Run tox + run: python -m tox -e "${{ matrix.python-version.toxenv }}" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e886dda..0000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -sudo: false - -language: python - -dist: xenial - -python: - - 3.5 - - 3.6 - - 3.7 - - 3.8 - - pypy - - pypy3 - -install: - - pip install tox-travis - -script: - - tox - -addons: - apt: - packages: - - libenchant-dev - -git: - depth: false @@ -2,7 +2,7 @@ jsonschema ========== -|PyPI| |Pythons| |Travis| |AppVeyor| |Codecov| |ReadTheDocs| +|PyPI| |Pythons| |CI| |AppVeyor| |Codecov| |ReadTheDocs| .. |PyPI| image:: https://img.shields.io/pypi/v/jsonschema.svg :alt: PyPI version @@ -12,9 +12,9 @@ jsonschema :alt: Supported Python versions :target: https://pypi.org/project/jsonschema/ -.. |Travis| image:: https://travis-ci.com/Julian/jsonschema.svg?branch=master - :alt: Travis build status - :target: https://travis-ci.com/Julian/jsonschema +.. |CI| image:: https://github.com/Julian/jsonschema/workflows/CI/badge.svg + :alt: Build status + :target: https://github.com/Julian/jsonschema/actions?query=workflow%3ACI .. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/adtt0aiaihy6muyn/branch/master?svg=true :alt: AppVeyor build status diff --git a/docs/conf.py b/docs/conf.py index 1ec003c..dca6bcf 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -246,7 +246,10 @@ def entire_domain(host): return r"http.?://" + re.escape(host) + r"($|/.*)" -linkcheck_ignore = [entire_domain("codecov.io")] +linkcheck_ignore = [ + entire_domain("codecov.io"), + "https://github.com/Julian/jsonschema/actions", +] # -- Options for sphinxcontrib-spelling ----------------------------------- @@ -1,6 +1,6 @@ [tox] envlist = - py{35,36,37,38,py,py3}-{build,tests,tests_nongpl}, + py{35,36,37,38,py2,py3}-{build,tests,tests_nongpl}, demo readme safety @@ -146,8 +146,3 @@ commands = {envbindir}/coverage run --rcfile={toxinidir}/.coveragerc {envbindir}/trial jsonschema {envbindir}/coverage xml -o {envtmpdir}/coverage.xml codecov --required --disable gcov --file {envtmpdir}/coverage.xml - -[travis] -python = - pypy: pypy, readme, safety, secrets - pypy3: pypy3, demo, docs, style |