floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,164 Commits 32 Branches 205 Tags
6639d6c7d86eef06331f3a29df73b0b5bd7de9a4
Commit Graph

14164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ran Benita
6639d6c7d8 Merge pull request #9532 from bluetech/getdir-cache 
config: avoid stat storm in _getconftestmodules

(cherry picked from commit 5c69eced6c)

Conflicts:
	src/_pytest/config/__init__.py
 2022-01-25 18:46:16 +02:00
Ran Benita
5c49dea989 Merge pull request #9513 from pytest-dev/backport-9512-to-7.0.x 
[7.0.x] testing: avoid private pluggy attributes in test
 2022-01-14 18:30:33 +02:00
Ran Benita
a1635ca49a [7.0.x] testing: avoid private pluggy attributes in test 2022-01-14 16:10:54 +00:00
Bruno Oliveira
46c06e7560 Merge pull request #9508 from pytest-dev/backport-9495-to-7.0.x 2022-01-13 17:11:22 -03:00
Olga Matoula
94bcd2ce0f [7.0.x] Add docs on pytest.warns(None) deprecation 2022-01-13 19:51:06 +00:00
Bruno Oliveira
4967a0d084 Merge pull request #9507 from nicoddemus/backport-9506 
[7.0.x] Improve on configuration file docs section
 2022-01-13 15:14:32 -03:00
Bruno Oliveira
efa02cffdd Merge pull request #9506 from eamanu/fix-9505 2022-01-13 13:55:08 -03:00
Ran Benita
b5a6e30dae Merge pull request #9499 from pytest-dev/backport-9494-to-7.0.x 
[7.0.x] python: add back `instance` accessor to all python nodes, not just Function
 2022-01-10 21:28:12 +02:00
Ran Benita
d0ae12ca76 [7.0.x] python: add back instance accessor to all python nodes, not just Function 2022-01-10 19:09:14 +00:00
Ran Benita
0c5fc61610 Merge pull request #9485 from pytest-dev/backport-9484-to-7.0.x 
[7.0.x] config: fix incorrect cache hit check in _getconftestmodules
 2022-01-07 13:44:58 +02:00
Ran Benita
41cb93b549 [7.0.x] config: fix incorrect cache hit check in _getconftestmodules 2022-01-07 11:28:12 +00:00
Bruno Oliveira
7381ce2d83 Merge pull request #9474 from pytest-dev/backport-9400-to-7.0.x 2022-01-04 11:28:51 -03:00
Bruno Oliveira
5d151c0e7c Merge pull request #9476 from pytest-dev/backport-9464-to-7.0.x 2022-01-04 11:27:48 -03:00
Dan Alvizu
f988e070c6 [7.0.x] Doc update: clarify -W syntax 2022-01-04 14:04:18 +00:00
Bruno Oliveira
1a04121f2f [7.0.x] Ensure Config.inifile is available during pytest_cmdline_main 2022-01-04 13:24:11 +00:00
Ran Benita
8542eb47c4 Merge pull request #9453 from bluetech/backport-9451 
[7.0.x] Backport "doc: document {Code,TracebackEntry}.path changes as breaking"
 2021-12-28 10:55:24 +02:00
Ran Benita
4f79cea72d Merge pull request #9451 from bluetech/code-path-changelog 
doc: document {Code,TracebackEntry}.path changes as breaking
(cherry picked from commit 1131f23e04)
 2021-12-27 17:01:04 +02:00
Ran Benita
c76989352f Merge pull request #9450 from bluetech/backport-9438 
[7.0.x] Backport "pytest: bring back direct imports of TempdirFactory, Testdir"
 2021-12-27 16:54:01 +02:00
Ran Benita
74f4aad708 Merge pull request #9449 from bluetech/backport-9447 
[7.0.x] Backport "code: accept any `os.PathLike[str]` in `Traceback.cut`"
 2021-12-27 15:55:37 +02:00
Ran Benita
5171327e3b Merge pull request #9438 from bluetech/pytest-legacypath-imports 
pytest: bring back direct imports of TempdirFactory, Testdir
(cherry picked from commit 69da199f6e)
 2021-12-27 15:11:45 +02:00
Ran Benita
9274fa5610 Merge pull request #9447 from bluetech/code-cut-pathlike 
code: accept any `os.PathLike[str]` in `Traceback.cut`
(cherry picked from commit fcef7e49fd)
 2021-12-27 15:10:13 +02:00
Bruno Oliveira
161841d38e Fix typos (#9424) (#9448) 
Co-authored-by: Kian Meng, Ang <kianmeng.ang@gmail.com>
 2021-12-27 10:02:26 -03:00
Kian Meng, Ang
e62daed8c4 Fix typos (#9424) 2021-12-27 09:26:25 -03:00
Ran Benita
764f90351a Merge pull request #9446 from bluetech/backport-9443 
[7.0.x] Backport "doc/reference: add 4 missing hooks to reference"
 2021-12-27 12:11:44 +02:00
Ran Benita
50bf3625c9 Merge pull request #9445 from bluetech/backport-9441 
[7.0.x] Backport "python: skip nose setup/teardown fixtures if non-callable"
 2021-12-27 11:41:02 +02:00
Ran Benita
0002597ddd Merge pull request #9443 from bluetech/undocumented-hooks 
doc/reference: add 4 missing hooks to reference

(cherry picked from commit 7a42db2bf0)
 2021-12-27 11:14:58 +02:00
Ran Benita
41e424b172 Merge pull request #9441 from bluetech/nose-setup-callable 
python: skip nose setup/teardown fixtures if non-callable
(cherry picked from commit 7fc2cf51c2)
 2021-12-27 11:13:12 +02:00
Ran Benita
839ca90c0e Merge pull request #9439 from bluetech/backport-9416 
[7.0.x] Backport "doc: fix a reference in "Writing hook functions""
 2021-12-25 13:00:34 +02:00
Ran Benita
8f1a8800c8 Merge pull request #9416 from bluetech/doc-stash-fix 
doc: fix a reference in "Writing hook functions"
(cherry picked from commit 443aa0219c)
 2021-12-25 10:50:36 +02:00
Bruno Oliveira
045713ac2e Merge pull request #9418 from nicoddemus/backport-9417 
[7.0.x] Fix test_errors_in_xfail_skip_expressions for Python 3.10.1
 2021-12-16 10:57:49 -03:00
Bruno Oliveira
f094355401 Merge pull request #9417 from nicoddemus/fix-py3.10.1-9413 2021-12-16 10:38:43 -03:00
Bruno Oliveira
378baab126 Merge pull request #9409 from bluetech/backport-9401 2021-12-12 13:30:54 -03:00
Ran Benita
74b9f46e40 Merge pull request #9401 from bluetech/doc-hooks-ref 
doc: add a `hook` crossref type
(cherry picked from commit 8040cfd965)
 2021-12-12 18:05:19 +02:00
Bruno Oliveira
bf913eb4e7 Merge pull request #9398 from The-Compiler/backport-9390 
[7.0.x] fix python version in changelog message (#9390)
 2021-12-08 07:50:19 -03:00
Bruno Oliveira
813e1e5b54 Merge pull request #9399 from The-Compiler/backport-9394 
[7.0.x] Hide internal stack when using pytest.approx() in bool context (#9394)
 2021-12-08 07:50:11 -03:00
Bruno Oliveira
3587d6b526 Merge pull request #9397 from The-Compiler/backport-9389 
[7.0.x] fix typo
 2021-12-08 07:50:00 -03:00
Bruno Oliveira
76e108d06c Hide internal stack when using pytest.approx() in bool context (#9394) 
This makes the error traceback point directly to the offending usage, rather
than to the internal `Approx.__bool__` method.

(cherry picked from commit 3ba9c01f9b)
 2021-12-08 10:54:47 +01:00
Anthony Sottile
5f70fcba2e fix python version in changelog message (#9390) 
(cherry picked from commit 7ae23ff8ae)
 2021-12-08 10:54:19 +01:00
Éric
39028fac00 fix typo 
(cherry picked from commit b691d31897)
 2021-12-08 10:53:30 +01:00
Florian Bruhin
ac0870ebad scripts: Use release branch for changelog URL (#9380) (#9383) 
* scripts: Use release branch for changelog URL

With a prerelease, /stable won't show the correct changelog.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
(cherry picked from commit 21a186bbda)
 2021-12-07 19:19:42 +01:00
Florian Bruhin
871533322b Fix changelog URL in 7.0.0rc1 announcement (#9379) (#9382) 
The changelog does not exist at /stable because an rc isn't stable...

(cherry picked from commit 5cb50fa13c)
 2021-12-07 11:44:19 +01:00
Bruno Oliveira
df2c59c07e Merge pull request #9381 from nicoddemus/backport-9359 2021-12-07 07:20:38 -03:00
Yuval Shimon
9bfa02ea07 Fixed error message prints function decorators when using assert in Python 3.9 and above. (#9359) 2021-12-07 07:08:48 -03:00
github-actions[bot]
85897eddc6 Prepare release version 7.0.0rc1 (#9375) 
Co-authored-by: pytest bot <pytestbot@gmail.com>
 2021-12-07 09:37:18 +01:00
Florian Bruhin
fbf64d2529 Don't thank pytest bot (#9372) 2021-12-06 22:55:18 +01:00
Florian Bruhin
3a479db126 Fix hook param name in nonpython example (#9373) 
Follow up to #9363
 2021-12-06 22:55:06 +01:00
Bruno Oliveira
70d3d0f390 Drop readline workaround introduced in #1281 (#8848) 
Fix #8733
Closes #8847
 2021-12-06 19:50:11 +01:00
Florian Bruhin
b3ed595f52 Revert "Fix Dead link in README for 'assert statements' " (#9369) 
This reverts commit 15989ddc8f.

Reverts #8945, thus reintroducing #8926 temporarily, but we should be close to
the 7.0.0 release now, where this is the correct URL to use.

Closes #8831 as follow-up to #8858.
 2021-12-06 17:56:39 +00:00
Ran Benita
5c55e91d77 Merge pull request #9368 from pytest-dev/dependabot/pip/testing/plugins_integration/pytest-django-4.5.1 
build(deps): Bump pytest-django from 4.4.0 to 4.5.1 in /testing/plugins_integration
 2021-12-06 15:39:37 +02:00
Florian Bruhin
663be09723 Improve reference and path/fspath docs (#9341) 
* Improve reference and path/fspath docs

Closes #9283

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixups

* Add explanation

* Update wording after #9363

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2021-12-06 11:25:05 +01:00