floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6440 from blueyed/py351 

ci: Travis: Python 3.5.1 via Trusty
This commit is contained in:
Daniel Hahler 2020-01-14 12:41:16 +01:00 committed by GitHub
parent 8eec42f040 f0c7f21312
commit b2cb87fae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -52,8 +52,10 @@ jobs:
- env: TOXENV=pypy3-xdist - env: TOXENV=pypy3-xdist
python: 'pypy3' python: 'pypy3'
- env: TOXENV=py35-xdist # Coverage for Python 3.5.{0,1} specific code, mostly typing related.
python: '3.5' - env: TOXENV=py35 PYTEST_COVERAGE=1 PYTEST_ADDOPTS="-k test_raises_cyclic_reference"
python: '3.5.1'
dist: trusty
# Specialized factors for py37. # Specialized factors for py37.
- env: TOXENV=py37-pluggymaster-xdist - env: TOXENV=py37-pluggymaster-xdist

2
src/_pytest/compat.py
View File

@ -371,7 +371,7 @@ class CaptureIO(io.TextIOWrapper):
return self.buffer.getvalue().decode("UTF-8") return self.buffer.getvalue().decode("UTF-8")
if sys.version_info < (3, 5, 2): # pragma: no cover if sys.version_info < (3, 5, 2):
def overload(f): # noqa: F811 def overload(f): # noqa: F811
return f return f

2
testing/python/raises.py
View File

@ -166,7 +166,7 @@ class TestRaises:
# Early versions of Python 3.5 have some bug causing the # Early versions of Python 3.5 have some bug causing the
# __call__ frame to still refer to t even after everything # __call__ frame to still refer to t even after everything
# is done. This makes the test pass for them. # is done. This makes the test pass for them.
if sys.version_info < (3, 5, 2): # pragma: no cover if sys.version_info < (3, 5, 2):
del self del self
raise ValueError raise ValueError