Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
jaraco committed May 17, 2020
2 parents 7789c62 + 7455f2f commit 1b5f636
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dist: xenial
dist: bionic
language: python

python:
Expand All @@ -8,10 +8,10 @@ python:
cache: pip

install:
- pip install tox tox-venv
- pip install tox

before_script:
# Disable IPv6. Ref travis-ci/travis-ci#8361
# Enable IPv6. Ref travis-ci/travis-ci#8361
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
fi
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cache:
- '%LOCALAPPDATA%\pip\Cache'

test_script:
- "python -m pip install -U tox tox-venv virtualenv"
- "python -m pip install -U tox virtualenv"
- "tox"

version: '{build}'
15 changes: 12 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ trigger:
- '*'

pool:
vmimage: 'Ubuntu-18.04'
vmImage: $(pool_vm_image)

variables:
- group: Azure secrets
- name: pool_vm_image
value: Ubuntu-18.04

stages:
- stage: Test
Expand All @@ -23,10 +25,17 @@ stages:
- job: 'Test'
strategy:
matrix:
Python36:
Bionic Python 3.6:
python.version: '3.6'
Python38:
Bionic Python 3.8:
python.version: '3.8'
Windows:
python.version: '3.8'
pool_vm_image: vs2017-win2016
MacOS:
python.version: '3.8'
pool_vm_image: macos-10.15

maxParallel: 4

steps:
Expand Down
2 changes: 2 additions & 0 deletions mypy.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[mypy]
ignore_missing_imports = True
6 changes: 5 additions & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
[pytest]
norecursedirs=dist build .tox .eggs
addopts=--doctest-modules --flake8 --black --cov
addopts=--doctest-modules --flake8 --black --cov --mypy
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
# workaround for warning pytest-dev/pytest#6178
junit_family=xunit2
filterwarnings=
# https://github.com/pytest-dev/pytest/issues/6928
ignore:direct construction of .*Item has been deprecated:DeprecationWarning
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ testing =
pytest >= 3.5, !=3.7.3
pytest-checkdocs >= 1.2.3
pytest-flake8
pytest-black-multipy
pytest-black >= 0.3.7
pytest-cov
pytest-mypy

# local
appdirs
Expand Down
2 changes: 1 addition & 1 deletion skeleton.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Features include:

Features include:
- test against Python 3
- run on Ubuntu Xenial
- run on Ubuntu Bionic
- correct for broken IPv6

### AppVeyor
Expand Down
5 changes: 0 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@ envlist = python
minversion = 3.2
# https://github.com/jaraco/skeleton/issues/6
tox_pip_extensions_ext_venv_update = true
# Ensure that a late version of pip is used even on tox-venv.
requires =
tox-pip-version>=0.0.6
tox-venv


[testenv]
deps =
pip_version = pip
commands =
pytest {posargs}
usedevelop = True
Expand Down

0 comments on commit 1b5f636

Please sign in to comment.