Skip to content

Commit

Permalink
Drop support to old pytest versions (<3.4)
Browse files Browse the repository at this point in the history
Let's take the opportunity to reduce the build matrix and test with latest
pytest versions as well
  • Loading branch information
nicoddemus committed Jul 23, 2018
1 parent fe1f239 commit b5abe79
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 20 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ python:
- '3.5'
- '3.6'
env:
- TOXENV=py-pytest30
- TOXENV=py-pytest31
- TOXENV=py-pytest32
- TOXENV=py-pytest33
- TOXENV=py-pytest34
- TOXENV=py-pytest35
- TOXENV=py-pytest36

install: pip install tox setuptools_scm
script: tox
Expand Down
17 changes: 8 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
environment:
matrix:
# note: please use "tox --listenvs" to populate the build matrix
- TOXENV: "py27-pytest33"
- TOXENV: "py34-pytest33"
- TOXENV: "py35-pytest33"
- TOXENV: "py36-pytest33"
- TOXENV: "py27-pytest33-pexpect"
- TOXENV: "py36-pytest33-pexpect"
- TOXENV: "py27-pytest36"
- TOXENV: "py34-pytest36"
- TOXENV: "py35-pytest36"
- TOXENV: "py36-pytest36"
- TOXENV: "py27-pytest36-pexpect"
- TOXENV: "py36-pytest36-pexpect"
- TOXENV: "flakes"
- TOXENV: "readme"

install:
- C:\Python35\python -m pip install -U tox setuptools_scm pip
- C:\Python36\python -m pip install -U tox setuptools_scm pip

build: false # Not a C# project, build stuff at the test step instead.

test_script:
- C:\Python35\python -m tox
- C:\Python36\python -m tox

# We don't deploy anything on tags with AppVeyor, we use Travis instead, so we
# might as well save resources
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages

install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked']
install_requires = ['execnet>=1.1', 'pytest>=3.4', 'pytest-forked']


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

0 comments on commit b5abe79

Please sign in to comment.