summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2020-01-10 12:44:39 -0800
committerDavid Lord <davidism@gmail.com>2020-01-10 12:44:39 -0800
commit143667d95d73730415bb1281d1cd5e439b366fec (patch)
tree0906b1f4ce3357b6a1e9b1936628224d4524199c
parent126fce8b049e94ffda5adc3b1c3a301998923c98 (diff)
downloadjinja2-143667d95d73730415bb1281d1cd5e439b366fec.tar.gz
add py 3.8 and style to tests
-rw-r--r--.azure-pipelines.yml27
-rw-r--r--tox.ini20
2 files changed, 27 insertions, 20 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 48eb150..eabcaf7 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -4,32 +4,37 @@ trigger:
variables:
vmImage: ubuntu-latest
- python.version: 3.7
+ python.version: '3.8'
TOXENV: py,coverage-ci
- hasTestResults: true
+ hasTestResults: 'true'
strategy:
matrix:
- Python 3.7 Linux:
+ Python 3.8 Linux:
vmImage: ubuntu-latest
- Python 3.7 Windows:
+ Python 3.8 Windows:
vmImage: windows-latest
- Python 3.7 Mac:
+ Python 3.8 Mac:
vmImage: macos-latest
PyPy 3 Linux:
python.version: pypy3
+ Python 3.7 Linux:
+ python.version: '3.7'
Python 3.6 Linux:
- python.version: 3.6
+ python.version: '3.6'
Python 3.5 Linux:
- python.version: 3.5
+ python.version: '3.5'
Python 2.7 Linux:
- python.version: 2.7
+ python.version: '2.7'
Python 2.7 Windows:
- python.version: 2.7
+ python.version: '2.7'
vmImage: windows-latest
Docs:
- TOXENV: docs-html
- hasTestResults: false
+ TOXENV: docs
+ hasTestResults: 'false'
+ Style:
+ TOXENV: style
+ hasTestResults: 'false'
pool:
vmImage: $[ variables.vmImage ]
diff --git a/tox.ini b/tox.ini
index 0928efa..3ee86d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,8 @@
[tox]
envlist =
- py{37,36,35,27,py3,py}
- docs-html
+ py{38,37,36,35,27,py3,py}
+ style
+ docs
coverage
skip_missing_interpreters = true
@@ -11,13 +12,14 @@ deps =
pytest
commands = coverage run -p -m pytest --tb=short --basetemp={envtmpdir} {posargs}
-[testenv:docs-html]
-deps =
- Sphinx
- Pallets-Sphinx-Themes
- sphinxcontrib-log-cabinet
- sphinx-issues
-commands = sphinx-build -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
+[testenv:style]
+deps = pre-commit
+skip_install = true
+commands = pre-commit run --all-files --show-diff-on-failure
+
+[testenv:docs]
+deps = -r docs/requirements.txt
+commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
[testenv:coverage]
deps = coverage