Merge remote-tracking branch 'upstream/master' into release-1.22.5

This commit is contained in:
Bruno Oliveira
2018-07-28 09:12:22 -03:00
30 changed files with 1190 additions and 957 deletions

View File

@@ -8,8 +8,6 @@ environment:
- TOXENV: "py36-pytest36"
- TOXENV: "py27-pytest33-pexpect"
- TOXENV: "py36-pytest33-pexpect"
- TOXENV: "flakes"
- TOXENV: "readme"
install:
- C:\Python36\python -m pip install -U tox setuptools_scm pip