Skip to content

Commit 1b5f636

Browse files
committed
2 parents 7789c62 + 7455f2f commit 1b5f636

8 files changed

+26
-15
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dist: xenial
1+
dist: bionic
22
language: python
33

44
python:
@@ -8,10 +8,10 @@ python:
88
cache: pip
99

1010
install:
11-
- pip install tox tox-venv
11+
- pip install tox
1212

1313
before_script:
14-
# Disable IPv6. Ref travis-ci/travis-ci#8361
14+
# Enable IPv6. Ref travis-ci/travis-ci#8361
1515
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
1616
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
1717
fi

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cache:
1818
- '%LOCALAPPDATA%\pip\Cache'
1919

2020
test_script:
21-
- "python -m pip install -U tox tox-venv virtualenv"
21+
- "python -m pip install -U tox virtualenv"
2222
- "tox"
2323

2424
version: '{build}'

azure-pipelines.yml

+12-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ trigger:
1111
- '*'
1212

1313
pool:
14-
vmimage: 'Ubuntu-18.04'
14+
vmImage: $(pool_vm_image)
1515

1616
variables:
1717
- group: Azure secrets
18+
- name: pool_vm_image
19+
value: Ubuntu-18.04
1820

1921
stages:
2022
- stage: Test
@@ -23,10 +25,17 @@ stages:
2325
- job: 'Test'
2426
strategy:
2527
matrix:
26-
Python36:
28+
Bionic Python 3.6:
2729
python.version: '3.6'
28-
Python38:
30+
Bionic Python 3.8:
2931
python.version: '3.8'
32+
Windows:
33+
python.version: '3.8'
34+
pool_vm_image: vs2017-win2016
35+
MacOS:
36+
python.version: '3.8'
37+
pool_vm_image: macos-10.15
38+
3039
maxParallel: 4
3140

3241
steps:

mypy.ini

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[mypy]
2+
ignore_missing_imports = True

pytest.ini

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
[pytest]
22
norecursedirs=dist build .tox .eggs
3-
addopts=--doctest-modules --flake8 --black --cov
3+
addopts=--doctest-modules --flake8 --black --cov --mypy
44
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
5+
# workaround for warning pytest-dev/pytest#6178
6+
junit_family=xunit2
57
filterwarnings=
8+
# https://github.com/pytest-dev/pytest/issues/6928
9+
ignore:direct construction of .*Item has been deprecated:DeprecationWarning

setup.cfg

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ testing =
3131
pytest >= 3.5, !=3.7.3
3232
pytest-checkdocs >= 1.2.3
3333
pytest-flake8
34-
pytest-black-multipy
34+
pytest-black >= 0.3.7
3535
pytest-cov
36+
pytest-mypy
3637

3738
# local
3839
appdirs

skeleton.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Features include:
120120

121121
Features include:
122122
- test against Python 3
123-
- run on Ubuntu Xenial
123+
- run on Ubuntu Bionic
124124
- correct for broken IPv6
125125

126126
### AppVeyor

tox.ini

-5
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,10 @@ envlist = python
33
minversion = 3.2
44
# https://github.com/jaraco/skeleton/issues/6
55
tox_pip_extensions_ext_venv_update = true
6-
# Ensure that a late version of pip is used even on tox-venv.
7-
requires =
8-
tox-pip-version>=0.0.6
9-
tox-venv
106

117

128
[testenv]
139
deps =
14-
pip_version = pip
1510
commands =
1611
pytest {posargs}
1712
usedevelop = True

0 commit comments

Comments
 (0)