Commit Graph

6423 Commits

Author SHA1 Message Date
Ronny Pfannschmidt bdec2c8f9e move marker transfer to _pytest.mark 2017-06-22 08:45:10 +02:00
Bruno Oliveira 9bd8907716 Merge pull request #2489 from RonnyPfannschmidt/move-python-api
Move python api code to own file
2017-06-11 11:25:35 -03:00
Ronny Pfannschmidt f8b2277413 changelog fragment 2017-06-11 14:17:40 +02:00
Ronny Pfannschmidt 6be57a3711 move python api helpers out of the python module
this separates exposed normal api from collection elements
2017-06-11 12:27:16 +02:00
Ronny Pfannschmidt 36251e0db4 move approx to own file 2017-06-11 12:15:30 +02:00
Bruno Oliveira 467c526307 Merge remote-tracking branch 'upstream/master' into features 2017-06-09 18:33:46 -03:00
Bruno Oliveira b2d7c26d80 Merge pull request #2483 from nicoddemus/release-3.1.2
Preparing release version 3.1.2
2017-06-09 08:18:43 -03:00
Bruno Oliveira 7cbf265bb5 Preparing release version 3.1.2 2017-06-08 17:37:42 -04:00
Ronny Pfannschmidt 917b9a8352 Merge pull request #2476 from nicoddemus/fix-2459-numpy-comparison
Fix internal error when a recursion error occurs and frames contain objects that can't be compared
2017-06-07 20:34:36 +02:00
Bruno Oliveira 2127a2378a Fix internal error with recursive tracebacks with that frames contain objects that can't be compared
Fix #2459
2017-06-07 14:40:13 -03:00
Ronny Pfannschmidt d2db6626cf Merge pull request #2466 from nicoddemus/remove-unicode-warning
Remove UnicodeWarning from pytest warnings
2017-06-07 08:00:36 +02:00
Bruno Oliveira c67bf9d82a Merge remote-tracking branch 'upstream/master' into features 2017-06-06 20:45:23 -03:00
Bruno Oliveira 57e2ced969 Merge pull request #2473 from ApaDoctor/docs-fixes
docs: Create links for objects to show the api
2017-06-06 09:52:54 -03:00
Bruno Oliveira 80944e32ad Add CHANGELOG entry 2017-06-06 09:09:54 -03:00
ApaDoctor 54a90e9555 docs: Create links for objects to show the api 2017-06-06 01:10:32 +02:00
Bruno Oliveira 9d41eaedbf Issue UnicodeWarning only for non-ascii unicode
Fix #2463
2017-06-05 10:43:15 -03:00
Bruno Oliveira 5ee9793c99 Fix CHANGELOG issue id
Fix #2467
2017-06-03 17:34:05 -03:00
Bruno Oliveira 1863b7c7b2 Merge pull request #2462 from segevfiner/py36-windowsconsoleio-workaround
[WIP] A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture
2017-06-03 15:11:36 -03:00
Segev Finer 01ed6dfc3b Added a changelog entry for the WindowsConsoleIO workaround 2017-06-02 12:38:31 +03:00
Segev Finer 59b3693988 Fixed wrong if in the WindowsConsoleIO workaround 2017-06-02 12:34:26 +03:00
Segev Finer 05796be21a A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture
Python 3.6 implemented unicode console handling for Windows. This works
by reading/writing to the raw console handle using
``{Read,Write}ConsoleW``.

The problem is that we are going to ``dup2`` over the stdio file
descriptors when doing ``FDCapture`` and this will ``CloseHandle`` the
handles used by Python to write to the console. Though there is still some
weirdness and the console handle seems to only be closed randomly and not
on the first call to ``CloseHandle``, or maybe it gets reopened with the
same handle value when we suspend capturing.

The workaround in this case will reopen stdio with a different fd which
also means a different handle by replicating the logic in
"Py_lifecycle.c:initstdio/create_stdio".

See https://github.com/pytest-dev/py/issues/103
2017-06-02 11:19:03 +03:00
Ronny Pfannschmidt f826b23f58 Merge pull request #2458 from segevfiner/fix-required-options-help
Fix --help with required options
2017-06-02 08:39:19 +02:00
Segev Finer 9abff7f72f Add a docstring to HelpAction 2017-06-01 22:25:09 +03:00
Segev Finer f74f14f038 Fix --help with required options
This works by adding an argparse Action that will raise an exception in
order to skip the rest of the argument parsing. This prevents argparse
from quitting due to missing required arguments, similar to the way that
the builtin argparse --help option is implemented by raising SystemExit.

Fixes: #1999
2017-06-01 21:29:50 +03:00
Bruno Oliveira bcbad5b1af Merge pull request #2140 from pelme/issue2121
Handle python_files correctly in assertion rewrite
2017-06-01 07:55:42 -03:00
Ronny Pfannschmidt 5d785e415e Merge pull request #2454 from nicoddemus/xfail-docs
Make it clear that pytest.xfail stops the test
2017-06-01 08:46:49 +02:00
Bruno Oliveira 409d2f1d54 Make it clear that pytest.xfail stops the test
Also did a general review of the document to improve the flow

Fix #810
2017-05-31 19:54:01 -03:00
Bruno Oliveira 9adf513c4b Merge remote-tracking branch 'upstream/master' into features 2017-05-31 13:51:41 -03:00
Bruno Oliveira cca4de20cf Merge pull request #2450 from nicoddemus/release-3.1.1
Release 3.1.1
2017-05-31 08:55:40 -03:00
Andreas Pelme c98ad2a0a0 Install py 1.4.33 that contains the fnmatch py.std import fix. 2017-05-31 08:32:51 +02:00
Andreas Pelme 5de203195c Add changelog for #2121 2017-05-31 08:29:19 +02:00
Andreas Pelme 021e843427 Fixed #2121 Use `py.path`s fnmatch. This fixes an issue where
python_files handled properly when rewriting assertions.
2017-05-31 08:25:04 +02:00
Andreas Pelme ac9c8fcdab Failing test for issue #2121 2017-05-31 08:25:04 +02:00
Florian Bruhin 3871810d1c Merge pull request #2451 from nicoddemus/update-release-howto
Update HOWTORELEASE
2017-05-31 07:45:33 +02:00
Bruno Oliveira 281fcd5a58 Update HOWTORELEASE
* Remove the CHANGELOG step now that it is automated;
* Overall clean-up and formatting, trying to make the steps more
  explicit;
2017-05-30 22:16:54 -03:00
Bruno Oliveira 2fd7626046 Preparing release version 3.1.1 2017-05-30 17:19:34 -04:00
Bruno Oliveira 0540d72c87 Add extra space between changelog items 2017-05-30 17:15:31 -04:00
Bruno Oliveira 1dee443c2b Merge pull request #2445 from nicoddemus/warnings-remove-filter
No longer override existing warning filters during warnings capture
2017-05-30 18:14:01 -03:00
Bruno Oliveira 32e2642233 No longer override existing warning filters during warnings capture
Fix #2430
2017-05-30 17:17:36 -03:00
Ronny Pfannschmidt 454426cba5 Merge pull request #2446 from nicoddemus/issue-2441
pytest.deprecated_call now captures PendingDeprecationWarning in context manager form
2017-05-30 20:09:37 +02:00
Bruno Oliveira f96a1d89c5 pytest.deprecated_call now captures PendingDeprecationWarning in context manager form
Fix #2441
2017-05-30 12:52:18 -03:00
Bruno Oliveira ee0844dbd8 Merge pull request #2431 from RonnyPfannschmidt/towncrier
initial addition of towncrier
2017-05-30 12:41:37 -03:00
Ronny Pfannschmidt b74c626026 switch changelog management to towncrier 2017-05-30 15:54:15 +02:00
Ronny Pfannschmidt 4e6e29dbee Merge pull request #2442 from nicoddemus/merge-master-into-features
Merge master into features
2017-05-29 17:55:08 +02:00
Floris Bruynooghe 6117930642 Merge pull request #2438 from nicoddemus/issue-2434
Fix unicode issue while running doctests in Python 2
2017-05-29 13:36:07 +02:00
Floris Bruynooghe 7bb06b6dad Merge pull request #2439 from nicoddemus/warnings-docs
Warn that warning-capture can break existing suites in the docs and CHANGELOG
2017-05-29 13:34:39 +02:00
Bruno Oliveira 7950c26a8e Add Hui Wang to AUTHORS list 2017-05-26 08:09:29 -03:00
Bruno Oliveira 836dc451f4 Fix unicode issue while running doctests in Python 2
Fix #2434
2017-05-26 07:35:14 -03:00
Bruno Oliveira 8df3e55a31 Merge pull request #2437 from coldnight/master
Correct warnings that contains Unicode message
2017-05-26 07:24:27 -03:00
wanghui 53add4435f
Add ChangeLog 2017-05-26 13:14:42 +08:00