Skip to content

Commit 7574033

Browse files
flubflub
authored
Merge pull request #2060 from pytest-dev/master
Merge master into features due to recent CI updates
2 parents 6876ba9 + 73d4815 commit 7574033

7 files changed

Lines changed: 59 additions & 17 deletions

File tree

‎.travis.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@ env:
2222
- TESTENV=py27-trial
2323
- TESTENV=py35-pexpect
2424
- TESTENV=py35-xdist
25-
# Disable py35-trial temporarily: #1989
26-
#- TESTENV=py35-trial
25+
- TESTENV=py35-trial
2726
- TESTENV=py27-nobyte
2827
- TESTENV=doctesting
2928
- TESTENV=freeze
3029
- TESTENV=docs
3130

31+
matrix:
32+
allow_failures:
33+
# py35-trial failing on Linux: #1989
34+
- env: TESTENV=py35-trial
35+
3236
script: tox --recreate -e $TESTENV
3337

3438
notifications:

‎MANIFEST.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ include HOWTORELEASE.rst
99
include tox.ini
1010
include setup.py
1111

12+
recursive-include scripts *.py
13+
recursive-include scripts *.bat
14+
1215
include .coveragerc
1316

1417
recursive-include bench *.py

‎appveyor.yml‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,30 @@ environment:
66
# https://www.appveyor.com/docs/build-configuration#secure-variables
77

88
matrix:
9-
# create multiple jobs to execute a set of tox runs on each; this is to workaround having
10-
# builds timing out in AppVeyor
11-
# pypy is disabled until #1963 gets fixed
12-
- TOXENV: "linting,py26,py27,py33,py34,py35"
13-
- TOXENV: "py27-pexpect,py27-xdist,py27-trial,py35-pexpect,py35-xdist,py35-trial"
14-
- TOXENV: "py27-nobyte,doctesting,freeze,docs"
9+
# note: please use "tox --listenvs" to populate the build matrix below
10+
- TOXENV: "linting"
11+
- TOXENV: "py26"
12+
- TOXENV: "py27"
13+
- TOXENV: "py33"
14+
- TOXENV: "py34"
15+
- TOXENV: "py35"
16+
- TOXENV: "pypy"
17+
- TOXENV: "py27-pexpect"
18+
- TOXENV: "py27-xdist"
19+
- TOXENV: "py27-trial"
20+
- TOXENV: "py35-pexpect"
21+
- TOXENV: "py35-xdist"
22+
- TOXENV: "py35-trial"
23+
- TOXENV: "py27-nobyte"
24+
- TOXENV: "doctesting"
25+
- TOXENV: "freeze"
26+
- TOXENV: "docs"
1527

1628
install:
1729
- echo Installed Pythons
1830
- dir c:\Python*
1931

20-
# install pypy using choco (redirect to a file and write to console in case
21-
# choco install returns non-zero, because choco install python.pypy is too
22-
# noisy)
23-
# pypy is disabled until #1963 gets fixed
24-
#- choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
25-
#- set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy
26-
#- echo PyPy installed
27-
#- pypy --version
32+
- if "%TOXENV%" == "pypy" scripts\install-pypy.bat
2833

2934
- C:\Python35\python -m pip install tox
3035

‎doc/en/talks.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ Talks and Tutorials
1111
Talks and blog postings
1212
---------------------------------------------
1313

14+
- `Pythonic testing, Igor Starikov (Russian, PyNsk, November 2016)
15+
<https://www.youtube.com/watch?v=_92nfdd5nK8>`_.
16+
1417
- `pytest - Rapid Simple Testing, Florian Bruhin, Swiss Python Summit 2016
1518
<https://www.youtube.com/watch?v=rCBHkQ_LVIs>`_.
1619

‎scripts/check-manifest.py‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
"""
2+
Script used by tox.ini to check the manifest file if we are under version control, or skip the
3+
check altogether if not.
4+
5+
"check-manifest" will needs a vcs to work, which is not available when testing the package
6+
instead of the source code (with ``devpi test`` for example).
7+
"""
8+
9+
from __future__ import print_function
10+
11+
import os
12+
import subprocess
13+
import sys
14+
15+
16+
if os.path.isdir('.git'):
17+
sys.exit(subprocess.call('check-manifest', shell=True))
18+
else:
19+
print('No .git directory found, skipping checking the manifest file')
20+
sys.exit(0)
21+

‎scripts/install-pypy.bat‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
REM install pypy using choco
2+
REM redirect to a file because choco install python.pypy is too noisy. If the command fails, write output to console
3+
choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
4+
set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy
5+
echo PyPy installed
6+
pypy --version

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ deps =
5252
restructuredtext_lint
5353
check-manifest
5454
commands =
55-
check-manifest
55+
{envpython} scripts/check-manifest.py
5656
flake8 pytest.py _pytest testing
5757
rst-lint CHANGELOG.rst HOWTORELEASE.rst README.rst
5858

0 commit comments

Comments
 (0)