Commit Graph

580 Commits

Author SHA1 Message Date
Hugo Martins
f52a5d3be2 Merge remote-tracking branch 'upstream/master' 2018-07-03 23:11:35 +01:00
Bruno Oliveira
2b75a311a7 Merge pull request #3637 from RonnyPfannschmidt/fix-3631
fix #3631 - don't store legacy markinfo when its impossible
2018-06-30 17:48:46 -03:00
Hugo Martins
f7c929c932 Fix linting errors in docs/fixtures.rst 2018-06-30 14:34:19 +01:00
Hugo Martins
b48f1d378b Clarify examples in fixtures' documentation 2018-06-30 02:01:49 +01:00
Victor
738933938a Added changelog. 2018-06-29 16:18:16 +02:00
Ronny Pfannschmidt
5bd5b8c68a fix #3631 - don't store legacy markinfo when its impossible 2018-06-29 14:01:20 +02:00
Ronny Pfannschmidt
643e5a9c44 fix docs 2018-06-26 21:57:31 +02:00
Ronny Pfannschmidt
b8486037d3 fix #3605 - unpack markdecorators from parameterization 2018-06-26 21:57:31 +02:00
Marcelo Duarte Trevisani
0030ceb11c Bug fix #3593 - approx method in a single element of numpy array
If the user pass as a expected value a numpy array created like
numpy.array(5); it will creates an array with one element without shape,
when used with approx it will raise an error
'TypeError: iteration over a 0-d array'
2018-06-25 22:55:16 +02:00
Bruno Oliveira
50a0d4fa95 Merge pull request #3613 from asottile/module_spec_warnings
Fix `ImportWarning` triggered by explicit relative imports
2018-06-23 18:27:19 -03:00
Anthony Sottile
22a2734d9a Merge pull request #3611 from AdamEr8/doc-fix-skipif
Doc Fix: skipif's example description
2018-06-23 14:06:30 -07:00
Anthony Sottile
1d55c49a9a Fix ImportWarning triggered by explicit relative imports 2018-06-23 07:55:49 -07:00
Bruno Oliveira
8cc210708c Improve changelog and change it to doc 2018-06-22 09:14:59 -03:00
AdamEr8
f883628939 Changelog mistake
Used pytest.fixture.skipif instead of pytest.mark.skipif
2018-06-22 08:51:26 +03:00
AdamEr8
40839b5a3a Rename prnum.trivial.rst to 3611.trivial.rst 2018-06-22 08:46:34 +03:00
AdamEr8
5e56d77542 Create prnum.trivial.rst
Added changelog file
2018-06-22 08:33:35 +03:00
Anthony Sottile
8b4c59e606 Silence usage of reduce warning in python 2 2018-06-21 13:27:00 -07:00
Ronny Pfannschmidt
e86fe38144 Merge pull request #3598 from nicoddemus/small-callspec2-cleanup
Remove unused attribute and parameter in CallSpec2
2018-06-20 18:04:34 +02:00
Bruno Oliveira
617a5fcf98 Preparing release version 3.6.2 2018-06-20 00:29:58 +00:00
Bruno Oliveira
93e55ad2fa Remove unused attribute and parameter in CallSpec2 2018-06-18 21:48:49 -03:00
Bruno Oliveira
2925f3057f Merge pull request #3584 from jwodder/fix-3583
Fix encoding error with `print` statements in doctests
2018-06-18 08:03:07 -03:00
Alex Barbato
561db95521 Add changelog file. 2018-06-16 12:44:19 -04:00
John T. Wodder II
d382f3e77f [#3583] Fix encoding error with print statements in doctests
This fix was suggested by Stack Overflow user phd in
<https://stackoverflow.com/a/50863820/744178>.
2018-06-15 17:23:54 +00:00
Bruno Oliveira
9a7c3a65f4 Improve CHANGELOG formatting 2018-06-12 11:07:42 -03:00
Ronny Pfannschmidt
37793d4cdb fix addmarker - extract mark from markdecorator 2018-06-12 15:50:58 +02:00
Bruno Oliveira
e0a1da4eb9 Remove changelog for #3554
This entry was removed in #3562
2018-06-11 23:17:11 -03:00
Anthony Sottile
ef88251573 Merge pull request #3570 from sangongs/fix_stack_finalizer
Continue to call finalizers in the stack when a finalizer raises an exception
2018-06-11 19:07:59 -07:00
Guoqiang Zhang
a888bf182e Continue to call finalizers in the stack when a finalizer in a former scope raises an exception 2018-06-11 18:01:18 -04:00
Michael Käufl
4a78711067 Fix typo in documentation 2018-06-11 13:28:09 +02:00
Bruno Oliveira
11705040ac Merge pull request #3563 from asottile/undetermined_location_none
Print <undetermined location> instead of None for warnings
2018-06-10 16:19:50 -03:00
Anthony Sottile
fe81de6150 git mv changelog/3554.bugfix{,.rst} 2018-06-10 10:53:15 -07:00
Anthony Sottile
49f621de76 Print <undetermined location> instead of None for warnings 2018-06-10 10:51:36 -07:00
Bruno Oliveira
198e993969 Format CHANGELOG 2018-06-09 21:31:32 -03:00
Alan Velasco
1a7dcd73cf Add a default value to CallInfo.result 2018-06-09 16:58:23 -07:00
Bruno Oliveira
97d48ba60d Add documentation blurb for --strict
Fix #3549
2018-06-09 12:02:21 -03:00
Anthony Sottile
4c01dd651e Add changelog entry for #3552 2018-06-08 06:20:57 -07:00
Bruno Oliveira
942d363c03 Improve changelog formatting 2018-06-07 18:55:50 -03:00
Daniel Hahler
c30c137a95 Improve display of hint about --fulltrace with KeyboardInterrupt
- display the location first
- display hint about --fulltrace in parenthesis
2018-06-07 23:50:24 +02:00
Bruno Oliveira
66ec0a50b6 Preparing release version 3.6.1 2018-06-05 01:11:27 +00:00
Bruno Oliveira
cc793a8575 Merge pull request #3522 from NiklasMM/fix/3461_factory-fixture-doc
Add factory fixture example to documentation.
2018-06-04 22:09:50 -03:00
Ronny Pfannschmidt
7f5cb46835 Merge pull request #3531 from hroncok/370b5
Module docstrings in 3.7 are not part of Module node anymore
2018-06-05 01:16:14 +02:00
Miro Hrončok
9a6fa33c69 Module docstrings in 3.7 are not part of Module node anymore
Fixes https://github.com/pytest-dev/pytest/issues/3530
2018-06-04 13:58:35 +02:00
Anthony Sottile
2f6555dfd3 Add changelog entry 2018-06-03 13:12:49 -07:00
Niklas Meinzer
08de3dad33 Add factory fixture example to documentation.
Close https://github.com/pytest-dev/pytest/issues/3461
2018-05-31 11:21:10 +02:00
Ronny Pfannschmidt
130f76f66e enable pip/pre-commit caching on travis and appveyor 2018-05-27 13:05:10 +02:00
Ronny Pfannschmidt
eaa882f3d5 switch to src layout 2018-05-26 09:10:38 +02:00
Bruno Oliveira
1d451c786d Merge pull request #3509 from nicoddemus/marshal-3503
Write rewritten code using file.write(marshal.dumps())
2018-05-25 21:24:45 -03:00
Bruno Oliveira
1b16d649f9 Fix formatting of merged files 2018-05-25 18:21:48 -03:00
Bruno Oliveira
6f8547cc1a Merge branch 'master' into pre-commit-hook 2018-05-25 18:14:43 -03:00
Bruno Oliveira
b5a94d8e6c Write rewritten code using file.write(marshal.dumps())
This works around the fact that some libraries might monkey patch
the file object, so the previous approach of marshal.dump(co, file)
breaks because file is not a built-in file object anymore.

Fix #3503
2018-05-25 17:24:23 -03:00