Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 655ad9e

Browse filesBrowse files
Bump pytest to 3.6.1
Else pytest fails to start, fixed upstream in: pytest-dev/pytest@b5a94d8
1 parent bffc34b commit 655ad9e
Copy full SHA for 655ad9e

File tree

Expand file treeCollapse file tree

2 files changed

+4
-3
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+4
-3
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ install:
6666
- activate test-environment
6767
- echo %PYTHON_VERSION% %TARGET_ARCH%
6868
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
69-
- pip install -q "pytest>=3.6.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
69+
- pip install -q "pytest>=3.6.1" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
7070

7171
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
7272
# https://github.com/matplotlib/matplotlib/issues/9176

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ env:
5757
- PANDAS=
5858
- PILLOW=pillow
5959
- PYPARSING=pyparsing
60-
- PYTEST='pytest>=3.6'
60+
- PYTEST='pytest>=3.6.1'
6161
- PYTEST_COV=pytest-cov
6262
- PYTEST_PEP8=
6363
- PYTEST_TIMEOUT=pytest-timeout
@@ -73,6 +73,7 @@ matrix:
7373
include:
7474
- python: 2.7
7575
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
76+
# pytest>=3.6.1 due to https://github.com/pytest-dev/pytest/commit/b5a94d8e6c49201c8c79a7c52b8466e020e6d6b8
7677
env:
7778
- CYCLER=cycler==0.10
7879
- DATEUTIL=python-dateutil==2.1
@@ -81,7 +82,7 @@ matrix:
8182
- NUMPY=numpy==1.7.1
8283
- PANDAS='pandas<0.21.0'
8384
- PYPARSING=pyparsing==2.0.1
84-
- PYTEST=pytest==3.6.0
85+
- PYTEST=pytest==3.6.1
8586
- PYTEST_COV=pytest-cov==2.3.1
8687
- PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest <3.4.
8788
- SPHINX=sphinx==1.3

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.