Commit Graph

13269 Commits

Author SHA1 Message Date
Bruno Oliveira f0e12d4d61
Merge pull request #8755 from nicoddemus/backport-8754
[6.2.x] Merge pull request #8754 from nicoddemus/fix-deprecation-docs
2021-06-12 13:56:55 -03:00
Bruno Oliveira 3293758545 Merge pull request #8754 from nicoddemus/fix-deprecation-docs 2021-06-12 13:45:50 -03:00
Anthony Sottile 4c41b7e88b
Merge pull request #8746 from haugenj/patch-1
Fix typo in fixture.rst
2021-06-09 14:56:28 -07:00
Jason Haugen 74495a2b7f
Fix typo in fixture.rst
Example referenced the wrong function name
2021-06-09 13:48:16 -05:00
Florian Bruhin a5e67a26b0
Switch to irc.libera.chat (#8723)
(cherry picked from commit 06ff9c3a97)
2021-06-01 18:04:47 +02:00
Anthony Sottile 8e0b08d5da
Merge pull request #8702 from The-Compiler/remove-training-2-6.2.x
[6.2.x] doc: Remove training sidebar
2021-05-28 07:59:34 -07:00
MapleCCC 5ad0d1acb9
Update index.rst (#8708) 2021-05-27 21:44:33 +02:00
Florian Bruhin 89b6b2ee2b doc: Remove training sidebar
(cherry picked from commit 54e4aad88f)
2021-05-26 14:15:58 +02:00
Bruno Oliveira ddf7d88a51
Merge pull request #8689 from bluetech/backport-8681
[6.2.x] ci: few security/permissions improvements
2021-05-18 20:23:29 -03:00
Ran Benita 733f8027d2 Merge pull request #8681 from bluetech/ci-permissions
ci: few security/permissions improvements
(cherry picked from commit ff6d29717c)

Conflicts:
      .github/workflows/main.yml
      .github/workflows/prepare-release-pr.yml
      .github/workflows/update-plugin-list.yml
      scripts/prepare-release-pr.py
      scripts/report-coverage.sh
2021-05-18 22:26:28 +03:00
Bruno Oliveira 8317542c9e
Merge pull request #8639 from mgorny/backport-8494-8555 2021-05-06 16:01:16 -03:00
Michał Górny 48f78f9ba0 Update setup-cfg-fmt to 1.17.0 2021-05-06 16:49:09 +02:00
Florian Bruhin 1e1955dbb7 Merge pull request #8555 from The-Compiler/py310-fix
Fix Python 3.10 test issues

(cherry picked from commit adc197424d)
2021-05-05 22:33:57 +02:00
Bruno Oliveira ca68875eab Merge pull request #8494 from nicoddemus/python-3.10
(cherry picked from commit c1bdff9e69)
2021-05-05 22:30:20 +02:00
Anthony Sottile 15a45388fa
Merge pull request #8632 from pytest-dev/release-6.2.4
Prepare release 6.2.4
2021-05-04 09:23:48 -07:00
pytest bot 017dd1ccd6 Prepare release version 6.2.4 2021-05-04 08:33:43 -07:00
Anthony Sottile 18569f44c1
Merge pull request #8629 from asottile/backport_8540
[6.2.x] Merge pull request #8540 from hauntsaninja/assert310
2021-05-04 08:13:02 -07:00
Bruno Oliveira d8d6812bdf Merge pull request #8540 from hauntsaninja/assert310
(cherry picked from commit af31c60db1)
2021-05-04 07:52:27 -07:00
Bruno Oliveira a5061484d4
Merge pull request #8607 from cmaurer/patch-1
Update fixture.rst
2021-04-28 09:54:22 -03:00
Christian Maurer 69ea076d55
Update fixture.rst
Availability was misspelled.  It was `availabiility`
2021-04-28 07:01:45 -05:00
Florian Bruhin 40cb2f5b54
Backport training update (#8557) 2021-04-15 20:02:50 +02:00
Ran Benita 724e22cb00
Merge pull request #8519 from pytest-dev/release-6.2.3
Prepare release 6.2.3
2021-04-04 00:43:05 +03:00
pytest bot 3a2fd96305 Prepare release version 6.2.3 2021-04-03 21:41:18 +00:00
Ran Benita 138b19a930
Merge pull request #8517 from bluetech/backport-mktmp
[6.2.x] Fix minor temporary directory security issue
2021-04-04 00:34:15 +03:00
Ran Benita 822686e880 tmpdir: prevent using a non-private root temp directory
pytest uses a root temp directory named `/tmp/pytest-of-<username>`. The
name is predictable, and the directory might already exists from a
previous run, so that's allowed.

This makes it possible for my_user to pre-create
`/tmp/pytest-of-another_user`, thus giving my_user control of
another_user's tempdir.

Prevent this scenario by adding a couple of safety checks. I believe
they are sufficient.

Testing the first check requires changing the owner, which requires
root permissions, so can't be unit-tested easily, but I checked it
manually.
2021-04-04 00:04:50 +03:00
Ran Benita 9dc54f79b0 tmpdir: fix temporary directories created with world-readable permissions
(Written for a Unix system, but might be applicable to Windows as well).

pytest creates a root temporary directory under /tmp, named
`pytest-of-<username>`, and creates tmp_path's and other under it.
/tmp is shared between all users of the system.

This root temporary directory was created with 0o777&~umask permissions,
which usually becomes 0o755, meaning any user in the system could list
and read the files, which is undesirable.

Use 0o700 permissions instead. Also for subdirectories, because the root
dir is adjustable.
2021-04-04 00:00:42 +03:00
Ran Benita 93dbae24e1 pathlib: inline ensure_reset_dir()
This is only used in TempPathFactory.getbasetemp(). We'll be wanting
further control/care there, so move it into there.
2021-04-03 23:39:37 +03:00
Ran Benita 02fdbe2e76 pathlib: remove useless temporary variable 2021-04-03 23:39:32 +03:00
Bruno Oliveira 12e7db85af
Merge pull request #8285 from nicoddemus/backport-8280
[6.2.x] Doc: Move the module declaration to index.rst
2021-01-27 09:13:27 -03:00
Bruno Oliveira 56e4392444 Merge pull request #8280 from xuhdev/module
Doc: Move the module declaration to index.rst
2021-01-27 09:07:33 -03:00
Bruno Oliveira 8220eca963
Merge pull request #8275 from pytest-dev/release-6.2.2
Prepare release 6.2.2
2021-01-25 11:52:23 -03:00
pytest bot b9c98762f5 Prepare release version 6.2.2 2021-01-25 12:30:53 +00:00
Bruno Oliveira 8003fd23b9
Merge pull request #8259 from nicoddemus/backport-8250
[6.2.x] Fix faulthandler for Twisted Logger when used with "--capture=no"
2021-01-20 10:14:34 -03:00
Bruno Oliveira 8d605b9b26 Merge pull request #8250 from daq-tools/fix-twisted-capture 2021-01-20 09:47:10 -03:00
Bruno Oliveira 14e0c3e105
Merge pull request #8225 from The-Compiler/training-update (#8226)
doc: Add note about training early bird discount
2021-01-05 20:49:50 +01:00
Bruno Oliveira 45facc16c8
Merge pull request #8224 from nicoddemus/backport-8220
[6.2.x] DOC: Mark pytest module
2021-01-05 13:31:19 -03:00
Bruno Oliveira 99fe887d7c Merge pull request #8220 from xuhdev/module-doc
DOC: Mark pytest module
2021-01-05 13:26:19 -03:00
Bruno Oliveira 8dbf9dc1aa
Merge pull request #8167 from nicoddemus/backport-8166
[6.2.x] Add Changelog to setup.cfg (#8166)
2020-12-17 13:59:14 -03:00
Adam Johnson baaee2148d Add Changelog to setup.cfg (#8166)
Co-authored-by: Thomas Grainger <tagrain@gmail.com>
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
2020-12-17 13:56:18 -03:00
Bruno Oliveira f7d1ab870f
Merge pull request #8163 from bluetech/backport-8152
[6.2.x] terminal: fix "(<Skipped instance>)" skip reason in test status line
2020-12-17 08:31:53 -03:00
Ran Benita b8201c280e Merge pull request #8152 from bluetech/empty-skip
terminal: fix "(<Skipped instance>)" skip reason in test status line
(cherry picked from commit 02e69e5cdc)
2020-12-17 12:59:01 +02:00
Bruno Oliveira 1f0c50b475
Merge pull request #8160 from nicoddemus/backport-7381
[6.2.x] Clarify fixture execution order and provide visual aids (#7381)
2020-12-16 14:02:02 -03:00
Chris NeJame da82e1853c Clarify fixture execution order and provide visual aids (#7381)
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
Co-authored-by: Ran Benita <ran@unusedvar.com>
2020-12-16 13:54:52 -03:00
Bruno Oliveira a566eb9c70
Merge pull request #8149 from pytest-dev/release-6.2.1
Prepare release 6.2.1
2020-12-15 12:39:06 -03:00
pytest bot d3971c30f4 Prepare release version 6.2.1 2020-12-15 13:06:34 +00:00
Bruno Oliveira 780044b64a
Merge pull request #8147 from nicoddemus/backport-8137
[6.2.x] python_api: handle array-like args in approx() #8137
2020-12-15 09:08:58 -03:00
Jakob van Santen 8354995abc python_api: handle array-like args in approx() (#8137) 2020-12-15 08:50:11 -03:00
Bruno Oliveira 8b8b1214f4
Merge pull request #8135 from nicoddemus/backport-8123
[6.2] Merge pull request #8123 from nicoddemus/import-mismatch-unc
2020-12-13 10:50:49 -03:00
Bruno Oliveira f854cf66f4 Merge pull request #8123 from nicoddemus/import-mismatch-unc
Compare also paths on Windows when considering ImportPathMismatchError
2020-12-13 10:35:59 -03:00
Ran Benita c475106f12
Merge pull request #8130 from pytest-dev/release-6.2.0
Prepare release 6.2.0
2020-12-12 23:21:28 +02:00