Revert "Drop support to old pytest versions (<3.4)"

This reverts commit b5abe791ad.
This commit is contained in:
Bruno Oliveira
2018-07-27 17:02:20 -03:00
parent 3776f3b74b
commit b8154cf655
4 changed files with 20 additions and 17 deletions

View File

@@ -17,9 +17,10 @@ python:
- '3.5' - '3.5'
- '3.6' - '3.6'
env: env:
- TOXENV=py-pytest34 - TOXENV=py-pytest30
- TOXENV=py-pytest35 - TOXENV=py-pytest31
- TOXENV=py-pytest36 - TOXENV=py-pytest32
- TOXENV=py-pytest33
install: pip install tox setuptools_scm install: pip install tox setuptools_scm
script: tox script: tox

View File

@@ -1,21 +1,22 @@
environment: environment:
matrix: matrix:
- TOXENV: "py27-pytest36" # note: please use "tox --listenvs" to populate the build matrix
- TOXENV: "py34-pytest36" - TOXENV: "py27-pytest33"
- TOXENV: "py35-pytest36" - TOXENV: "py34-pytest33"
- TOXENV: "py36-pytest36" - TOXENV: "py35-pytest33"
- TOXENV: "py27-pytest36-pexpect" - TOXENV: "py36-pytest33"
- TOXENV: "py36-pytest36-pexpect" - TOXENV: "py27-pytest33-pexpect"
- TOXENV: "py36-pytest33-pexpect"
- TOXENV: "flakes" - TOXENV: "flakes"
- TOXENV: "readme" - TOXENV: "readme"
install: install:
- C:\Python36\python -m pip install -U tox setuptools_scm pip - C:\Python35\python -m pip install -U tox setuptools_scm pip
build: false # Not a C# project, build stuff at the test step instead. build: false # Not a C# project, build stuff at the test step instead.
test_script: test_script:
- C:\Python36\python -m tox - C:\Python35\python -m tox
# We don't deploy anything on tags with AppVeyor, we use Travis instead, so we # We don't deploy anything on tags with AppVeyor, we use Travis instead, so we
# might as well save resources # might as well save resources

View File

@@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
install_requires = ['execnet>=1.1', 'pytest>=3.4', 'pytest-forked'] install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked']
setup( setup(

11
tox.ini
View File

@@ -1,8 +1,8 @@
[tox] [tox]
# if you change the envlist, please update .travis.yml file as well # if you change the envlist, please update .travis.yml file as well
envlist= envlist=
py{27,34,35,36}-pytest{34,35,36} py{27,34,35,36}-pytest{30,31,32,33}
py{27,36}-pytest36-pexpect py{27,36}-pytest{30,31,32,33}-pexpect
py{27,36}-pytest{master,features} py{27,36}-pytest{master,features}
flakes flakes
readme readme
@@ -15,9 +15,10 @@ deps =
pycmd pycmd
# to avoid .eggs # to avoid .eggs
setuptools_scm setuptools_scm
pytest34: pytest~=3.4.0 pytest30: pytest~=3.0.5
pytest35: pytest~=3.5.0 pytest31: pytest~=3.1.0
pytest36: pytest~=3.6.0 pytest32: pytest~=3.2.0
pytest33: pytest~=3.3.0
pytestmaster: git+https://github.com/pytest-dev/pytest.git@master pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
pexpect: pexpect pexpect: pexpect