Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c147c42

Browse files
committed
On 2.7, run tests on oldest documented supported pytest and pytest-cov.
... to make sure that they are indeed supported.
1 parent cc7de70 commit c147c42

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

.travis.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,25 @@ env:
3636
- secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
3737
- secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
3838
- secure: "dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
39+
- MOCK=
40+
- NOSE=
3941
- NUMPY=numpy
40-
- OPENBLAS_NUM_THREADS=1
4142
- PANDAS=
43+
- PYTEST=pytest
44+
- PYTEST_COV=pytest-cov
45+
- OPENBLAS_NUM_THREADS=1
4246
- NPROC=2
4347
- INSTALL_PEP8=
4448
- RUN_PEP8=
45-
- NOSE=
4649
- PYTEST_ARGS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
4750
- PYTHON_ARGS=
4851
- DELETE_FONT_CACHE=
4952

5053
matrix:
5154
include:
5255
- python: 2.7
53-
env: MOCK=mock NUMPY=numpy==1.7.1 PANDAS=pandas NOSE=nose
56+
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
57+
env: MOCK=mock NOSE=nose NUMPY=numpy==1.7.1 PANDAS=pandas PYTEST=pytest==3.0.0 PYTEST_COV=pytest-cov==2.3.1
5458
- python: 3.4
5559
env: PYTHON_ARGS=-OO
5660
- python: 3.6
@@ -101,17 +105,19 @@ install:
101105
# Upgrade pip and setuptools and wheel to get as clean an install as possible
102106
pip install --upgrade pip setuptools wheel
103107
- |
104-
# Install dependencies from pypi
108+
# Install dependencies from PyPI
105109
pip install --upgrade $PRE \
110+
codecov \
111+
coverage \
112+
cycler \
106113
$MOCK \
107114
$NOSE \
108115
$NUMPY \
109116
$PANDAS \
110-
codecov \
111-
coverage \
112-
cycler \
113117
pillow \
114118
pyparsing!=2.1.6 \
119+
$PYTEST \
120+
$PYTEST_COV \
115121
python-dateutil \
116122
sphinx
117123
# GUI toolkits are pip-installable only for some versions of Python so
@@ -130,7 +136,6 @@ install:
130136
echo 'wxPython is available' ||
131137
echo 'wxPython is not available'
132138
133-
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
134139
pip install $PRE \
135140
pytest \
136141
pytest-cov>=2.3.1 \

doc/devel/testing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ Requirements
2222

2323
The following software is required to run the tests:
2424

25-
- pytest_, version 3.0.0 or later
25+
- pytest_ (>=3.0.0)
2626
- mock_, when running Python versions < 3.3
2727
- Ghostscript_ (to render PDF files)
2828
- Inkscape_ (to render SVG files)
2929

3030
Optionally you can install:
3131

32-
- pytest-cov_ to collect coverage information
32+
- pytest-cov_ (>=2.3.1) to collect coverage information
3333
- pytest-pep8_ to test coding standards
3434
- pytest-timeout_ to limit runtime in case of stuck tests
3535
- pytest-xdist_ to run tests in parallel

0 commit comments

Comments
 (0)