Commit Graph

12761 Commits

Author SHA1 Message Date
Bruno Oliveira 2d680da78b
Merge pull request #7746 from nicoddemus/backport-7745
[6.0] Merge pull request #7745 from asottile/exec_globals_type_problem
2020-09-12 08:28:37 -03:00
Bruno Oliveira b3c444ddc1 Merge pull request #7745 from asottile/exec_globals_type_problem
Fix INTERNALERROR when accessing locals / globals with faulty `exec`
2020-09-12 08:10:34 -03:00
Ran Benita fe69bd5baf
Merge pull request #7720 from pytest-dev/release-6.0.2
Prepare release 6.0.2
2020-09-12 02:03:10 +03:00
pytest bot 09b1d7cc99 Prepare release version 6.0.2 2020-09-04 21:48:44 +00:00
Ran Benita ea65ea877e
Merge pull request #7717 from bluetech/backport-7614
[6.0.x] Properly remove log_print
2020-09-04 21:53:05 +03:00
Ran Benita f4f30d7073
Merge pull request #7716 from bluetech/backport-7697
[6.0.x] Add missing File reference to the docs
2020-09-04 21:52:51 +03:00
Ran Benita 309810ac2c
Merge pull request #7715 from bluetech/backport-7651
[6.0.x] capture: fix disabled()/global_and_fixture_disabled() enabling capturing when it was disabled
2020-09-04 21:52:29 +03:00
Bruno Oliveira e63fac3aec Merge pull request #7614 from The-Compiler/log-print
Properly remove log_print

(cherry picked from commit d688fefecb)
2020-09-04 21:28:41 +03:00
Bruno Oliveira cb91c5033e Merge pull request #7697 from nicoddemus/file-docs
(cherry picked from commit 21aa6c42b7)
2020-09-04 21:23:53 +03:00
Ran Benita 9a879ee23e Merge pull request #7651 from bluetech/capture-safe-disable
capture: fix disabled()/global_and_fixture_disabled() enabling capturing when it was disabled

(cherry picked from commit bb38ae9c52)
2020-09-04 21:16:07 +03:00
Bruno Oliveira e9d18bd8ac
Merge pull request #7711 from nicoddemus/backport-7708
[6.0] Merge pull request #7708 from nicoddemus/repr-line-7707
2020-09-04 12:41:17 -03:00
Bruno Oliveira 912870d33e Merge pull request #7708 from nicoddemus/repr-line-7707
Fix handle of exceptions in ReprEntry with tb=line
2020-09-04 12:06:38 -03:00
Bruno Oliveira 0115b716c0
Merge pull request #7688 from nicoddemus/backport-7687 2020-08-25 21:23:41 -03:00
Bruno Oliveira 9a91b67eeb Merge pull request #7687 from bluetech/idval-notset
python: fix empty parametrize() leading to "NotSetType.token" id
2020-08-25 19:57:06 -03:00
Ran Benita 79d0d3eff4
Merge pull request #7676 from bluetech/backport-7673
[6.0.x] logging: fix handler level restored incorrectly if caplog.set_level is called more than once
2020-08-23 12:24:50 +03:00
Ran Benita 834f55eddb Merge pull request #7673 from bluetech/logging-fix-handler-restore
logging: fix handler level restored incorrectly if caplog.set_level is called more than once
(cherry picked from commit 143e3ab846)
2020-08-23 12:07:24 +03:00
Bruno Oliveira 6110f84f78
Merge pull request #7588 from nicoddemus/backport-7557
Merge pull request #7557 from nicoddemus/announce-templates
2020-07-30 12:07:53 -03:00
Bruno Oliveira 5a339f0d74 Merge pull request #7557 from nicoddemus/announce-templates
(cherry picked from commit c7216ae0f6)
2020-07-30 12:04:36 -03:00
Bruno Oliveira 022bff27a7
Merge pull request #7584 from pytest-dev/release-6.0.1
Prepare release 6.0.1
2020-07-30 09:45:40 -03:00
pytest bot 92af2e22d2 Prepare release version 6.0.1 2020-07-30 11:50:12 +00:00
Ran Benita 0307213254
Merge pull request #7582 from bluetech/backport-7581
[6.0.x] Add missing changelog for issue 7569
2020-07-30 14:19:29 +03:00
Ran Benita df7b26704d Merge pull request #7581 from bluetech/logging-setlevel-handler-restore
Add missing changelog for issue 7569

(cherry picked from commit 645cbc91fc)
2020-07-30 13:41:54 +03:00
Bruno Oliveira 1516780829
Merge pull request #7578 from nicoddemus/backport-7555
[6.0.x] Warn about --basetemp removing the entire directory (#7555)
2020-07-29 12:13:16 -03:00
Bruno Oliveira b945b39b0b
Merge pull request #7577 from nicoddemus/backport-7427
[6.0.x] Fix --help crash on add_ini(.., help='') and improve message on help=None (#7427)
2020-07-29 12:10:42 -03:00
Mattreex 2d5b8a85c2 Warn about --basetemp removing the entire directory (#7555)
Co-authored-by: mattreex <mattreex.9@gail.com>
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
(cherry picked from commit 1e66ed0b1c)
2020-07-29 11:58:52 -03:00
hp310780 8963644da3 Fix --help crash on add_ini(.., help='') and improve message on help=None (#7427) 2020-07-29 11:49:09 -03:00
Bruno Oliveira e8761576cd
Merge pull request #7574 from nicoddemus/backport-7561
[6.0.x] Merge pull request #7561 from nicoddemus/longreprtext-7559
2020-07-29 10:30:21 -03:00
Bruno Oliveira 3d2c114883
Merge pull request #7573 from nicoddemus/backport-7571
[6.0.x] logging: fix capture handler level not reset on teardown after caplog.set_level()
2020-07-29 10:30:00 -03:00
Bruno Oliveira fe252848c5 Merge pull request #7561 from nicoddemus/longreprtext-7559 2020-07-29 09:47:31 -03:00
Bruno Oliveira f9d5f6e60a Merge pull request #7571 from bluetech/logging-setlevel-handler-restore
logging: fix capture handler level not reset on teardown after caplog.set_level()
2020-07-29 09:38:33 -03:00
Ran Benita d46fe88ec3
Merge pull request #7566 from bluetech/pylint-callable-2-6.0.x
[6.0.x] mark: fix pylint not-callable error on pytest.mark.parametrize(...), again
2020-07-29 13:04:23 +03:00
Ran Benita bec1bdaa2c mark: fix extraneous spaces in dummy type-checking marks
(cherry picked from commit 54e08b7230)
2020-07-29 12:41:02 +03:00
Ran Benita edb6211e36 Merge pull request #7565 from bluetech/pylint-callable-2
mark: fix pylint not-callable error on pytest.mark.parametrize(...), again
(cherry picked from commit f9837f953c)
2020-07-29 11:51:08 +03:00
Bruno Oliveira 5d606e9c40
Merge pull request #7550 from pytest-dev/release-6.0.0 2020-07-28 16:59:46 -03:00
Bruno Oliveira 41a4539594
Add link to 6.0.0rc1 changelog 2020-07-28 14:15:45 -03:00
Bruno Oliveira 45ced1dc05
Update doc/en/announce/release-6.0.0.rst
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
2020-07-28 10:46:03 -03:00
pytest bot 1e4b8d447c Prepare release version 6.0.0 2020-07-28 11:44:27 +00:00
Bruno Oliveira 38029828d1
Support generating major releases using issue comments (#7548) 2020-07-28 13:40:14 +02:00
Anthony Sottile c2c0b7a542
Merge pull request #7545 from asottile/pylib_in_docs
remove usage of pylib in docs
2020-07-27 09:36:58 -07:00
Anthony Sottile 9818899df4 remove usage of pylib in docs 2020-07-26 17:57:25 -07:00
Zac Hatfield-Dodds 3a060b77e8
Revert change to traceback repr (#7535)
* Revert change to traceback repr

* Add test and changelog entry

* Restore *exact* prev output

Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
2020-07-24 13:30:38 +02:00
Bruno Oliveira 7ec6401ffa
Change pytest deprecation warnings into errors for 6.0 release (#7362)
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
2020-07-22 21:36:51 -03:00
Bruno Oliveira a9799f0b35
Merge pull request #7531 from bluetech/changelog-mypy-version
doc: mention mypy<0.750 doesn't work in typing changelog
2020-07-22 16:21:11 -03:00
Ran Benita 102360b490
Merge pull request #7519 from hroncok/pytest_warning_captured_deprecated
List pytest_warning_captured in deprecated things for 6.0.0rc1
2020-07-22 20:50:52 +03:00
Ran Benita 1a18dfd651 doc: mention mypy<0.750 doesn't work in typing changelog 2020-07-22 20:48:24 +03:00
Bruno Oliveira 2a8dcc9728
Merge pull request #7526 from bluetech/win-bash-2
testing: improve bash check
2020-07-21 23:02:05 -03:00
Kelton Bassingthwaite dbc50a7061
Clarify usage of usefixtures mark in hooks
Fix #7512

Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
2020-07-21 23:00:47 -03:00
Ran Benita 0709305953 testing: improve bash check 2020-07-21 21:21:09 +03:00
Anthony Sottile 6ecb8f53d0
Merge pull request #7521 from asottile/newlines_unaffected
Preserve newlines when captured with capfd
2020-07-20 11:48:08 -07:00
Ran Benita 2294f109b6
Merge pull request #7522 from garrettthomaskth/patch-1
Fix "A xfail" typo
2020-07-20 21:43:35 +03:00