diff options
| author | David Lord <davidism@gmail.com> | 2018-10-21 06:09:29 -0700 |
|---|---|---|
| committer | David Lord <davidism@gmail.com> | 2018-10-21 07:00:25 -0700 |
| commit | 48733e4470f178d01b20bed1c289c37fd62ab0f3 (patch) | |
| tree | c73dddff4c04a5416adfc8e4413a7df0a989e340 | |
| parent | c640a7ef30b72268530920cb5e01978e22e6a4fc (diff) | |
| download | markupsafe-48733e4470f178d01b20bed1c289c37fd62ab0f3.tar.gz | |
test python 3.7, fix coverage
| -rw-r--r-- | .appveyor.yml | 12 | ||||
| -rw-r--r-- | .travis.yml | 39 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | tox.ini | 28 |
4 files changed, 41 insertions, 40 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 253126a..b05238e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,6 +3,8 @@ environment: TOXENV: py matrix: + - PYTHON: C:\Python37-x64 + - PYTHON: C:\Python37 - PYTHON: C:\Python36-x64 - PYTHON: C:\Python36 - PYTHON: C:\Python35-x64 @@ -16,12 +18,13 @@ init: - SET PATH=%PYTHON%;%PATH% install: - - python -m pip install -U pip setuptools wheel tox + - python -m pip install -IU pip + - python -m pip install -IU setuptools wheel tox build: false test_script: - - python -m tox + - python -m tox --skip-missing-interpreters=false after_test: - python setup.py release bdist_wheel @@ -33,4 +36,7 @@ artifacts: branches: only: - master - - /^.*-maintenance$/ + - /^.*\.x$/ + +cache: + - '%LOCALAPPDATA%\pip\Cache' diff --git a/.travis.yml b/.travis.yml index ccdc19f..4ab5fc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,40 +1,41 @@ os: linux sudo: false language: python +python: + - "3.6" + - "3.5" + - "3.4" + - "2.7" + - "nightly" + - "pypy3" +env: TOXENV=py,codecov matrix: include: - - python: 3.6 - env: TOXENV=py,codecov - - python: 3.6 - env: TOXENV=docs-html - - python: 3.5 - env: TOXENV=py,codecov - - python: 3.4 - env: TOXENV=py,codecov - - python: 2.7 - env: TOXENV=py,codecov - - python: pypy - env: TOXENV=py,codecov - - python: nightly - env: TOXENV=py + - dist: xenial + sudo: required + python: "3.7" + - env: TOXENV=docs-html allow_failures: - - python: nigthly - env: TOXENV=py + - python: nightly + - python: pypy3 + fast_finish: true install: - pip install tox script: - - tox + - tox --skip-missing-interpreters=false cache: - - pip + directories: + - $HOME/.cache/pip + - $HOME/.cache/pre-commit branches: only: - master - - /^.*-maintenance$/ + - /^.*\.x$/ notifications: email: false @@ -19,4 +19,4 @@ source = source = src/markupsafe .tox/*/lib/python*/site-packages/markupsafe - .tox/pypy/site-packages/markupsafe + .tox/*/site-packages/markupsafe @@ -1,44 +1,38 @@ [tox] envlist = - py{36,35,34,27,py} + py{37,36,35,34,27,py3,py} docs-html coverage-report +skip_missing_interpreters = true [testenv] -passenv = LANG +setenv = + COVERAGE_FILE = .coverage.{envname} deps = pytest-cov -commands = pytest --cov={envsitepackagesdir}/markupsafe --cov-config=tox.ini --cov-report='' --cov-append {posargs} +commands = pytest --cov --cov-report= {posargs} [testenv:docs-html] deps = -r docs/requirements.txt commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html [testenv:coverage-report] +setenv = + COVERAGE_FILE = .coverage deps = coverage skip_install = true commands = coverage combine - coverage report coverage html + coverage report [testenv:codecov] passenv = CI TRAVIS TRAVIS_* +setenv = + COVERAGE_FILE = .coverage deps = codecov skip_install = true commands = coverage combine - coverage report codecov - -[coverage:run] -branch = True -parallel = True -source = - markupsafe - -[coverage:paths] -source = - src/markupsafe - .tox/*/lib/python*/site-packages/markupsafe - .tox/pypy/site-packages/markupsafe + coverage report |