Ran Benita
87fb689ab1
Remove an unneeded `except KeyboardInterrupt`
...
KeyboardInterrupt is a subclass of BaseException, but not of Exception.
Hence if we remove this except, KeyboardInterrupts will still be raised
so the behavior stays the same.
2017-02-07 14:12:09 +02:00
Bruno Oliveira
ccf9877447
Merge pull request #2232 from vidartf/patch-1
...
Do not asssume `Item.obj` in 'skipping' plugin
2017-02-03 21:39:42 -02:00
Bruno Oliveira
a4d2a5785b
Merge pull request #2142 from barneygale/xfail_without_condition_getglobals
...
'xfail' markers without a condition no longer rely on the underlying `Item` objects deriving from `PyobjMixin`
2017-02-03 16:09:47 -02:00
Vidar Tonaas Fauske
832c89dd5f
Test for `pytest.mark.xfail` with non-Python Item
2017-02-03 17:13:05 +01:00
Vidar Tonaas Fauske
1a88a91c7a
Update authors/history
2017-02-03 16:29:43 +01:00
Vidar Tonaas Fauske
bad261279c
Do not asssume `Item.obj` in 'skipping' plugin
...
See #2231 for discussion.
2017-02-03 16:04:34 +01:00
Ronny Pfannschmidt
da5a3dba87
Merge pull request #2226 from nicoddemus/raise-stop-iteration
...
Replace 'raise StopIteration' usages in the code by 'return's in accordance to PEP-479
2017-02-01 14:50:54 +01:00
Bruno Oliveira
e1c5314d80
Replace 'raise StopIteration' usages in the code by 'return's in accordance to PEP-479
...
Fix #2160
2017-02-01 02:37:55 -02:00
Bruno Oliveira
0931fe2c89
Merge pull request #2221 from pytest-dev/ionelmc-patch-1
...
Discourage users from using unittest support somewhat
2017-01-25 21:38:44 -02:00
Ionel Cristian Mărieș
c8032a9bbb
Fix reference.
2017-01-25 14:44:07 +02:00
Ionel Cristian Mărieș
d98d122e81
Discourage users from using this all the time.
2017-01-25 14:20:38 +02:00
Bruno Oliveira
beb77c1a38
Fix release date for 3.0.6
2017-01-23 13:51:12 -02:00
Ronny Pfannschmidt
d076e4158f
Merge pull request #2216 from vmuriart/patch-1
...
Add py36 classifier & Add py37 to travis
2017-01-23 10:19:13 +01:00
Victor Uriarte
902fd2ff6a
Add py37-nightly to travis
2017-01-22 17:20:15 -07:00
Victor Uriarte
839aa963a1
Add py36 identifier
...
and order AUTHORS
2017-01-22 17:13:17 -07:00
Ronny Pfannschmidt
400b0779f9
Merge pull request #2213 from RonnyPfannschmidt/release-3.0.6
...
Release 3.0.6
2017-01-22 22:21:53 +01:00
Ronny Pfannschmidt
c9f327dc87
bump version to next dev
2017-01-22 22:21:08 +01:00
Ronny Pfannschmidt
0e64cd045c
take off author_email after pypi rejects
2017-01-22 22:14:54 +01:00
Ronny Pfannschmidt
22da561ae5
fix copy+paste error, its supposed to be 3.0.6
2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt
449b88c640
rerun regendoc with correct install
2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt
34b898b47e
generate the release announcement
2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt
01eaf9db51
fix the xfail docstring typo at the actual docstring + regendoc
2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt
4d0c635252
regendoc
2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt
55f21bd2b9
bump version
2017-01-22 18:44:30 +01:00
Bruno Oliveira
c39d846c1b
Merge pull request #2215 from RonnyPfannschmidt/fix-doctesting/devpi-bug
...
fix devpi test for doctesting env
2017-01-22 13:02:03 -02:00
Ronny Pfannschmidt
403122281a
fix devpi test for doctesting env
...
due to a devpi bug, we always get a sdist install which in turn triggers
the pytest issue #2042 / #726
going for pyargs and a changed folder, it should no longer happen
(and will be tested firther after rebasing the release branch)
2017-01-22 11:48:05 +01:00
Bruno Oliveira
15a3b57ec7
Merge pull request #2120 from RonnyPfannschmidt/fix-2118
...
fix #2118 - rework Node._getcustomclass and Node compat properties
2017-01-20 14:38:55 -02:00
Ronny Pfannschmidt
6a96b464ab
update changelog as suggested
2017-01-20 15:26:59 +01:00
Ronny Pfannschmidt
7b4afd8946
remove unused import
2017-01-20 12:09:49 +01:00
Ronny Pfannschmidt
1a2d6388ac
Merge pull request #2211 from nicoddemus/trial-envs
...
Fix pytester internal plugin to work correctly with latest versions of zope.interface
2017-01-20 12:08:12 +01:00
Bruno Oliveira
3766060893
Merge branch 'master' into trial-envs
2017-01-20 08:37:34 -02:00
Ronny Pfannschmidt
4082f4024a
comment out compatproperty deprecations
...
todo: reenable in the features branch
2017-01-20 11:25:48 +01:00
Ronny Pfannschmidt
e0c48b4fe7
Merge pull request #2212 from nicoddemus/pytester-rewrite
...
Assert statements of the pytester plugin again benefit from assertion rewriting
fixes #1920
2017-01-20 10:04:12 +01:00
Bruno Oliveira
7b4368f3f4
Merge pull request #2184 from eli-b/parseoutcomes-explicit-failure
...
Fail assert_outcomes() on missing terminal report
2017-01-19 21:38:54 -02:00
Bruno Oliveira
c477f09177
Assert statements of the pytester plugin again benefit from assertion rewriting
...
Fix #1920
2017-01-19 21:33:51 -02:00
Bruno Oliveira
2574da8d32
Fix pytester internal plugin to work correctly with latest versions of zope.interface
...
Fix #1989
2017-01-19 20:53:35 -02:00
Ronny Pfannschmidt
d15724f74f
Merge pull request #2204 from nicoddemus/linux-marker-doc
...
Fix marker example on "linux" platform
2017-01-18 09:34:34 +01:00
Bruno Oliveira
61fa91f3d0
Fix marker example on "linux" platform
...
I cheated a little and updated the example output by hand. 😁
Fix #2200
2017-01-17 21:09:04 -02:00
Ronny Pfannschmidt
125e89b7f8
Merge pull request #2194 from rjprins/remove-reinterp-from-docs
...
Remove mention of --assert=reinterp in documentation
2017-01-14 14:58:50 +01:00
Rutger Prins
46a9861d29
Remove mention of --assert=reinterp in documentation
...
Related to #1940
2017-01-13 22:35:37 +01:00
Bruno Oliveira
3dfdbaf490
Merge pull request #2186 from nicoddemus/pytest-plugins-env-rewrite
...
Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite
2017-01-12 23:29:58 -02:00
Bruno Oliveira
7cd7c283dd
Refactor plugin specs handling into an isolated function
2017-01-12 14:31:35 -02:00
Bruno Oliveira
043aadeaf2
Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite
...
Fix #2185
2017-01-11 17:15:16 -02:00
Eli Boyarski
e18b2a427a
Fail assert_outcomes() on missing terminal report
...
Currently if the terminal report of testdir.runpytest() is missing,
assert_outcomes() on its output fails because parseoutcomes()
returns an unexpected value (None).
It's better to fail parseoutcomes() directly.
2017-01-11 17:09:37 +02:00
Ronny Pfannschmidt
ff309b3584
Merge pull request #2182 from pombredanne/patch-1
...
Ensure the LICENSE is included in built wheels
2017-01-10 21:44:43 +01:00
Philippe Ombredanne
aa82db9fe2
Ensure the LICENSE is included in built wheels
...
Otherwise it is not included by default as wheels do not honor the MANIFEST.in
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
2017-01-10 19:25:57 +01:00
Bruno Oliveira
64cb67b703
Merge pull request #2174 from nicoddemus/appveyor-py36
...
Test py36 on AppVeyor
2017-01-05 22:35:20 -02:00
Bruno Oliveira
7559400183
Add py36 to test on AppVeyor
...
Fix #2134
2017-01-05 19:18:03 -02:00
Bruno Oliveira
9477f598d8
Merge pull request #2173 from jeffwidman/patch-1
...
Switch monkeypatch fixture to yield syntax
2017-01-04 23:17:30 -02:00
Jeff Widman
6d81c684cc
Switch monkeypatch fixture to yield syntax
2017-01-04 15:06:52 -08:00