Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Freya Bruhin <git@the-compiler.org>
Freya Bruhin <me@the-compiler.org>
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ faph
Felix Hofstätter
Felix Nieuwenhuizen
Feng Ma
Florian Bruhin
Florian Dahlitz
Floris Bruynooghe
Frank Hoffmann
Fraser Stark
Freya Bruhin
Gabriel Landau
Gabriel Reis
Garvit Shubham
Expand Down
8 changes: 4 additions & 4 deletions CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ BibLaTeX:

@software{pytest,
title = {pytest x.y},
author = {Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Florian Bruhin},
author = {Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Freya Bruhin},
year = {2004},
version = {x.y},
url = {https://github.com/pytest-dev/pytest},
note = {Contributors: Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Florian Bruhin and others}
note = {Contributors: Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Freya Bruhin and others}
}

BibTeX:

@misc{pytest,
author = {Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Florian Bruhin},
author = {Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Freya Bruhin},
title = {pytest x.y},
year = {2004},
howpublished = {\url{https://github.com/pytest-dev/pytest}},
note = {Version x.y. Contributors include Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin, and others.}
note = {Version x.y. Contributors include Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Freya Bruhin, and others.}
}
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ contacted individually:

- Brianna Laugher ([@pfctdayelise](https://github.com/pfctdayelise)): brianna@laugher.id.au
- Bruno Oliveira ([@nicoddemus](https://github.com/nicoddemus)): nicoddemus@gmail.com
- Florian Bruhin ([@the-compiler](https://github.com/the-compiler)): pytest@the-compiler.org
- Freya Bruhin ([@the-compiler](https://github.com/the-compiler)): pytest@the-compiler.org

## Attribution

Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-2.8.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Thanks to all who contributed to this release, among them:

Bruno Oliveira
Demian Brecht
Florian Bruhin
Freya Bruhin
Ionel Cristian Mărieș
Raphael Pierzina
Ronny Pfannschmidt
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-2.8.3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ As usual, you can upgrade from pypi via::
Thanks to all who contributed to this release, among them:

Bruno Oliveira
Florian Bruhin
Freya Bruhin
Gabe Hollombe
Gabriel Reis
Hartmut Goebel
Expand Down
6 changes: 3 additions & 3 deletions doc/en/announce/release-2.8.4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ As usual, you can upgrade from pypi via::
Thanks to all who contributed to this release, among them:

Bruno Oliveira
Florian Bruhin
Freya Bruhin
Jeff Widman
Mehdy Khoshnoody
Nicholas Chammas
Expand All @@ -43,10 +43,10 @@ The py.test Development Team
non-ascii characters. Thanks Bruno Oliveira for the PR.

- fix #1204: another error when collecting with a nasty __getattr__().
Thanks Florian Bruhin for the PR.
Thanks Freya Bruhin for the PR.

- fix the summary printed when no tests did run.
Thanks Florian Bruhin for the PR.
Thanks Freya Bruhin for the PR.

- a number of documentation modernizations wrt good practices.
Thanks Bruno Oliveira for the PR.
2 changes: 1 addition & 1 deletion doc/en/announce/release-2.8.6.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Thanks to all who contributed to this release, among them:
AMiT Kumar
Bruno Oliveira
Erik M. Bray
Florian Bruhin
Freya Bruhin
Georgy Dyuldin
Jeff Widman
Kartik Singhal
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-2.9.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Thanks to all who contributed to this release, among them:
Bruno Oliveira
Buck Golemon
David Vierra
Florian Bruhin
Freya Bruhin
Galaczi Endre
Georgy Dyuldin
Lukas Bednar
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-2.9.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Thanks to all who contributed to this release, among them:
Bruno Oliveira
Daniel Hahler
Dmitry Malinovsky
Florian Bruhin
Freya Bruhin
Floris Bruynooghe
Matt Bachmann
Ronny Pfannschmidt
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-2.9.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Thanks to all who contributed to this release, among them:
Adam Chainz
Benjamin Dopplinger
Bruno Oliveira
Florian Bruhin
Freya Bruhin
John Towler
Martin Prusse
Meng Jue
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Thanks to all who contributed to this release, among them:
Dmitry Dygalo
Edoardo Batini
Eli Boyarski
Florian Bruhin
Freya Bruhin
Floris Bruynooghe
Greg Price
Guyzmo
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.0.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Thanks to all who contributed to this release, among them:
Bruno Oliveira
Daniel Hahler
Dmitry Dygalo
Florian Bruhin
Freya Bruhin
Marcin Bachry
Ronny Pfannschmidt
matthiasha
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.0.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Thanks to all who contributed to this release, among them:

* Ahn Ki-Wook
* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Jordan Guymon
* Raphael Pierzina
* Ronny Pfannschmidt
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.0.3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The changelog is available at http://doc.pytest.org/en/stable/changelog.html.
Thanks to all who contributed to this release, among them:

* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Floris Bruynooghe
* Huayi Zhang
* Lev Maximov
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.0.4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Thanks to all who contributed to this release, among them:

* Bruno Oliveira
* Dan Wandschneider
* Florian Bruhin
* Freya Bruhin
* Georgy Dyuldin
* Grigorii Eremeev
* Jason R. Coombs
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.0.7.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Thanks to all who contributed to this release, among them:
* Anthony Sottile
* Barney Gale
* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Floris Bruynooghe
* Ionel Cristian Mărieș
* Katerina Koukiou
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.1.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Thanks to all who contributed to this release, among them:
* David Giese
* David Szotten
* Dmitri Pribysh
* Florian Bruhin
* Freya Bruhin
* Florian Schulze
* Floris Bruynooghe
* John Towler
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.1.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The full changelog is available at http://doc.pytest.org/en/stable/changelog.htm
Thanks to all who contributed to this release, among them:

* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Floris Bruynooghe
* Jason R. Coombs
* Ronny Pfannschmidt
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.1.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Thanks to all who contributed to this release, among them:
* Andreas Pelme
* ApaDoctor
* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Ronny Pfannschmidt
* Segev Finer

Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.2.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Thanks to all who contributed to this release, among them:
* Andras Tim
* Bruno Oliveira
* Daniel Hahler
* Florian Bruhin
* Freya Bruhin
* Floris Bruynooghe
* John Still
* Jordan Moldow
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.2.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Thanks to all who contributed to this release, among them:

* Alex Gaynor
* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Ronny Pfannschmidt
* Srinivas Reddy Thatiparthy

Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.2.4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Thanks to all who contributed to this release, among them:
* Christian Boelsen
* Christoph Buchner
* Daw-Ran Liou
* Florian Bruhin
* Freya Bruhin
* Franck Michea
* Leonard Lausen
* Matty G
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.3.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Thanks to all who contributed to this release, among them:
* Daniel Hahler
* Dirk Thomas
* Dmitry Malinovsky
* Florian Bruhin
* Freya Bruhin
* George Y. Kussumoto
* Hugo
* Jesús Espino
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.3.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Thanks to all who contributed to this release, among them:
* Bruno Oliveira
* Daniel Hahler
* Eugene Prikazchikov
* Florian Bruhin
* Freya Bruhin
* Roland Puntaier
* Ronny Pfannschmidt
* Sebastian Rahlf
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.3.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Thanks to all who contributed to this release, among them:
* Antony Lee
* Austin
* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Floris Bruynooghe
* Henk-Jaap Wagenaar
* Jurko Gospodnetić
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.4.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Thanks to all who contributed to this release, among them:
* Brian Maissy
* Bruno Oliveira
* Cyrus Maden
* Florian Bruhin
* Freya Bruhin
* Henk-Jaap Wagenaar
* Ian Lesperance
* Jon Dufresne
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.4.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Thanks to all who contributed to this release, among them:
* Andy Freeland
* Brian Maissy
* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Jason R. Coombs
* Marcin Bachry
* Pedro Algarvio
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.4.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Thanks to all who contributed to this release, among them:

* Allan Feldman
* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Jason R. Coombs
* Kyle Altendorf
* Maik Figura
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-3.5.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Thanks to all who contributed to this release, among them:
* Bruno Oliveira
* Carlos Jenkins
* Daniel Hahler
* Florian Bruhin
* Freya Bruhin
* Jason R. Coombs
* Jeffrey Rackauckas
* Jordan Speicher
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-5.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Thanks to all who contributed to this release, among them:
* Daniel Hahler
* Dirk Thomas
* Evan Kepner
* Florian Bruhin
* Freya Bruhin
* Hugo
* Kevin J. Foley
* Pulkit Goyal
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-5.0.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Thanks to all who contributed to this release, among them:
* Andreu Vallbona Plazas
* Anthony Sottile
* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Michael Moore
* Niklas Meinzer
* Thomas Grainger
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-5.1.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Thanks to all who contributed to this release, among them:
* Bruno Oliveira
* Daniel Hahler
* David Röthlisberger
* Florian Bruhin
* Freya Bruhin
* Ilya Stepin
* Jon Dufresne
* Kaiqi
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-5.1.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Thanks to all who contributed to this release, among them:
* Anthony Sottile
* Bruno Oliveira
* Daniel Hahler
* Florian Bruhin
* Freya Bruhin
* Hugo van Kemenade
* Ran Benita
* Ronny Pfannschmidt
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-5.2.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Thanks to all who contributed to this release, among them:

* Anthony Sottile
* Bruno Oliveira
* Florian Bruhin
* Freya Bruhin
* Hynek Schlawack
* Kevin J. Foley
* tadashigaki
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-5.2.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Thanks to all who contributed to this release, among them:
* Anthony Sottile
* Bruno Oliveira
* Daniel Hahler
* Florian Bruhin
* Freya Bruhin
* Nattaphoom Chaipreecha
* Oliver Bestwalter
* Philipp Loose
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-5.2.3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Thanks to all who contributed to this release, among them:
* Daniel Hahler
* Daniil Galiev
* David Szotten
* Florian Bruhin
* Freya Bruhin
* Patrick Harmon
* Ran Benita
* Zac Hatfield-Dodds
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-5.3.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Thanks to all who contributed to this release, among them:
* Bruno Oliveira
* Daniel Hahler
* Felix Yan
* Florian Bruhin
* Freya Bruhin
* Mark Dickinson
* Nikolay Kondratyev
* Steffen Schroeder
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-6.0.0rc1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Thanks to all who contributed to this release, among them:
* David Diaz Barquero
* Fabio Zadrozny
* Felix Nieuwenhuizen
* Florian Bruhin
* Freya Bruhin
* Florian Dahlitz
* Gleb Nikonorov
* Hugo van Kemenade
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-6.1.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Thanks to all of the contributors to this release:
* C. Titus Brown
* Drew Devereux
* Faris A Chugthai
* Florian Bruhin
* Freya Bruhin
* Hugo van Kemenade
* Hynek Schlawack
* Joseph Lucas
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-6.2.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Thanks to all of the contributors to this release:
* Cserna Zsolt
* Dominic Mortlock
* Emiel van de Laar
* Florian Bruhin
* Freya Bruhin
* Garvit Shubham
* Gustavo Camargo
* Hugo Martins
Expand Down
Loading