floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,297 Commits 32 Branches 205 Tags 46 MiB
Commit Graph

13297 Commits

Author SHA1 Message Date
Ran Benita 981ca24d40 ci: remove linting job - covered be pre-commit.ci (#9247) 
(cherry picked from commit 69b0a7b306)
 2022-01-29 07:58:00 +01:00
Ran Benita cca9b90905
Merge pull request #9180 from dybi/patch-3 
Further fixes in fixtures' examples
 2021-10-09 19:14:29 +03:00
Piotr Dybowski 2476da4445
Further fixes in fixtures' examples 2021-10-08 15:45:23 +02:00
Piotr Dybowski c642e6d550
Fix example in fixture documentation (`sending_user`, `receiving_user`) (#9179) 2021-10-08 11:41:40 +03:00
Bruno Oliveira 2cf78187a8
Merge pull request #9085 from The-Compiler/remove-workshoptage-6.2 
[6.2] Remove finished open training
 2021-09-10 08:26:25 -03:00
Florian Bruhin 8f9779d43c Remove finished open training 
(cherry picked from commit 1c1dcf27c8)
 2021-09-09 22:32:13 +02:00
Bruno Oliveira 16664a1b72
Merge pull request #9057 from pytest-dev/release-6.2.5 2021-08-30 14:40:59 -03:00
Bruno Oliveira 1569fac603 Fix CHANGELOG header 2021-08-29 11:09:45 -03:00
pytest bot a3599cacb5 Prepare release version 6.2.5 2021-08-29 14:05:45 +00:00
Bruno Oliveira 27613b8d70
Merge pull request #9056 from nicoddemus/backport-9053 
[6.2.x] Merge pull request #9053 from nicoddemus/change-8494-to-trivial
 2021-08-29 11:00:28 -03:00
Bruno Oliveira cef74be094 Merge pull request #9053 from nicoddemus/change-8494-to-trivial 2021-08-29 10:52:35 -03:00
Bruno Oliveira 83dc953669
Merge pull request #9051 from nicoddemus/backport-9047 2021-08-27 14:59:44 -03:00
Bruno Oliveira fb38e8d097 Merge pull request #9047 from nicoddemus/changelog-9040 
Add changelog for #9040 (pluggy 1.0)
 2021-08-27 14:58:55 -03:00
Bruno Oliveira d74baf4a52
Merge pull request #9042 from nicoddemus/backport-9040 2021-08-27 09:04:50 -03:00
Miro Hrončok d9b8f7cf0a Backport #8896 2021-08-27 07:43:30 -03:00
Ronny Pfannschmidt 69212d15fa Merge pull request #8425 from RonnyPfannschmidt/main-fixes 
reconfigure everything for main
 2021-08-26 18:07:13 -03:00
Bruno Oliveira 44d3282bb7 Merge pull request #9040 from nicoddemus/bump-pluggy 2021-08-26 14:56:00 -03:00
Bruno Oliveira fafe00aaee
Merge pull request #9024 from pytest-dev/raining-update-2-6.4.x 
[6.2.x] doc: Update trainings
 2021-08-19 14:30:26 -03:00
Florian Bruhin 477225c18a doc: Update trainings 
(cherry picked from commit e643385399)
 2021-08-19 18:55:52 +02:00
Bruno Oliveira 4e51b9200f
Merge pull request #8932 from guettli/patch-1 
contact.rst: Added github discussions.
 2021-07-23 07:08:28 -03:00
Thomas Güttler b0fb02297e
contact.rst: Added github discussions. 2021-07-22 10:28:53 +02:00
Brylie Christopher Oxley e47a352c49
Fix "external plugins" link (#8806) 2021-06-28 14:32:31 +02:00
Bruno Oliveira 767b3b2cc0
Merge pull request #8794 from The-Compiler/6.2.x-open-trainings 2021-06-24 16:02:02 -03:00
Florian Bruhin 4eae23a633 doc: Add new open trainings 
(cherry picked from commit 61336bb385)
 2021-06-24 20:22:09 +02:00
Bruno Oliveira 6989435490
Merge pull request #8774 from hroncok/6.2.x-setuptools-typo 
[6.2] Remove duplicate '>=' in setup.cfg
 2021-06-17 11:11:04 -03:00
Sylvain Bellemare b178175e95 Remove duplicate '>=' in setup.cfg 
Cherrypicked from 3d831225bb
 2021-06-17 12:56:59 +02:00
Bruno Oliveira de7c19a373
Merge pull request #8762 from asztalosdani/patch-1 
Typo fixed
 2021-06-14 10:55:21 -03:00
Daniel Asztalos 82611bdc1e
Typo fixed 2021-06-14 15:48:06 +02:00
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