Skip to content

Commit 41aa302

Browse files
vcunatvcunat
committedSep 26, 2017
Merge branch 'master' into staging
·
branch-off-24.1118.03-beta
2 parents ef35406 + 1e066db commit 41aa302

File tree

519 files changed

+9191
-4775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

519 files changed

+9191
-4775
lines changed
 

‎doc/languages-frameworks/python.md

+14-1
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,20 @@ example of such a situation is when `py.test` is used.
785785

786786
#### Common issues
787787

788-
- Non-working tests can often be deselected. In the case of `py.test`: `py.test -k 'not function_name and not other_function'`.
788+
- Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`.
789+
Most python modules follows the standard test protocol where the pytest runner can be used instead.
790+
`py.test` supports a `-k` parameter to ignore test methods or classes:
791+
792+
```nix
793+
buildPythonPackage {
794+
# ...
795+
# assumes the tests are located in tests
796+
checkInputs = [ pytest ];
797+
checkPhase = ''
798+
py.test -k 'not function_name and not other_function' tests
799+
'';
800+
}
801+
```
789802
- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`.
790803
- Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
791804

‎lib/maintainers.nix

+11-5
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
choochootrain = "Hurshal Patel <hurshal@imap.cc>";
108108
chris-martin = "Chris Martin <ch.martin@gmail.com>";
109109
chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>";
110+
chrisrosset = "Christopher Rosset <chris@rosset.org.uk>";
110111
christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
111112
ciil = "Simon Lackerbauer <simon@lackerbauer.com>";
112113
ckampka = "Christian Kampka <christian@kampka.net>";
@@ -192,12 +193,14 @@
192193
erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
193194
ertes = "Ertugrul Söylemez <esz@posteo.de>";
194195
ethercrow = "Dmitry Ivanov <ethercrow@gmail.com>";
196+
etu = "Elis Hirwing <elis@hirwing.se>";
195197
exi = "Reno Reckling <nixos@reckling.org>";
196198
exlevan = "Alexey Levan <exlevan@gmail.com>";
197199
expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";
198200
fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
199-
fare = "Francois-Rene Rideau <fahree@gmail.com>";
200201
falsifian = "James Cook <james.cook@utoronto.ca>";
202+
fare = "Francois-Rene Rideau <fahree@gmail.com>";
203+
fgaz = "Francesco Gazzetta <francygazz@gmail.com>";
201204
florianjacob = "Florian Jacob <projects+nixos@florianjacob.de>";
202205
flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
203206
fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
@@ -289,12 +292,12 @@
289292
jonafato = "Jon Banafato <jon@jonafato.com>";
290293
jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>";
291294
jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>";
292-
jyp = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
293295
jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
294296
jtojnar = "Jan Tojnar <jtojnar@gmail.com>";
295297
juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>";
296298
jwiegley = "John Wiegley <johnw@newartisans.com>";
297299
jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
300+
jyp = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
298301
jzellner = "Jeff Zellner <jeffz@eml.cc>";
299302
kaiha = "Kai Harries <kai.harries@gmail.com>";
300303
kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
@@ -334,6 +337,7 @@
334337
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
335338
lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
336339
lsix = "Lancelot SIX <lsix@lancelotsix.com>";
340+
ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>";
337341
lucas8 = "Luc Chabassier <luc.linux@mailoo.org>";
338342
ludo = "Ludovic Courtès <ludo@gnu.org>";
339343
lufia = "Kyohei Kadota <lufia@lufia.org>";
@@ -496,6 +500,7 @@
496500
renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
497501
retrry = "Tadas Barzdžius <retrry@gmail.com>";
498502
rht = "rht <rhtbot@protonmail.com>";
503+
richardipsum = "Richard Ipsum <richardipsum@fastmail.co.uk>";
499504
rick68 = "Wei-Ming Yang <rick68@gmail.com>";
500505
rickynils = "Rickard Nilsson <rickynils@gmail.com>";
501506
ris = "Robert Scott <code@humanleg.org.uk>";
@@ -505,6 +510,7 @@
505510
robberer = "Longrin Wischnewski <robberer@freakmail.de>";
506511
robbinch = "Robbin C. <robbinch33@gmail.com>";
507512
roberth = "Robert Hensing <nixpkgs@roberthensing.nl>";
513+
robertodr = "Roberto Di Remigio <roberto.diremigio@gmail.com>";
508514
robgssp = "Rob Glossop <robgssp@gmail.com>";
509515
roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>";
510516
roconnor = "Russell O'Connor <roconnor@theorem.ca>";
@@ -578,10 +584,9 @@
578584
taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>";
579585
tari = "Peter Marheine <peter@taricorp.net>";
580586
tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
581-
ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>";
582587
teh = "Tom Hunger <tehunger@gmail.com>";
583-
teto = "Matthieu Coudron <mcoudron@hotmail.com>";
584588
telotortium = "Robert Irelan <rirelan@gmail.com>";
589+
teto = "Matthieu Coudron <mcoudron@hotmail.com>";
585590
thall = "Niclas Thall <niclas.thall@gmail.com>";
586591
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
587592
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
@@ -610,6 +615,7 @@
610615
#urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012
611616
uwap = "uwap <me@uwap.name>";
612617
vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>";
618+
valeriangalliat = "Valérian Galliat <val@codejam.info>";
613619
vandenoever = "Jos van den Oever <jos@vandenoever.info>";
614620
vanschelven = "Klaas van Schelven <klaas@vanschelven.com>";
615621
vanzef = "Ivan Solyankin <vanzef@gmail.com>";
@@ -626,7 +632,6 @@
626632
vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
627633
vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
628634
vmchale = "Vanessa McHale <tmchale@wisc.edu>";
629-
valeriangalliat = "Valérian Galliat <val@codejam.info>";
630635
volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>";
631636
volth = "Jaroslavas Pocepko <jaroslavas@volth.com>";
632637
vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
@@ -648,6 +653,7 @@
648653
xvapx = "Marti Serra <marti.serra.coscollano@gmail.com>";
649654
xwvvvvwx = "David Terry <davidterry@posteo.de>";
650655
yarr = "Dmitry V. <savraz@gmail.com>";
656+
yegortimoshenko = "Yegor Timoshenko <yegortimoshenko@gmail.com>";
651657
yochai = "Yochai <yochai@titat.info>";
652658
yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";
653659
yuriaisaka = "Yuri Aisaka <yuri.aisaka+nix@gmail.com>";

0 commit comments

Comments
 (0)
Please sign in to comment.