Bruno Oliveira
9af1f63ab6
Small typo in CHANGELOG
2016-02-14 23:36:17 -02:00
Bruno Oliveira
fb7bbf816c
Merge branch 'strict-xpass'
2016-02-14 23:35:03 -02:00
Bruno Oliveira
9aae4b782b
Add CHANGELOG entry for #1355
2016-02-14 23:31:31 -02:00
Ronny Pfannschmidt
1d190dc618
Merge pull request #1386 from nicoddemus/strict-xpass
...
Add a "strict" parameter to xfail
2016-02-15 02:29:43 +01:00
Bruno Oliveira
7823838e69
Add strict option to xfail, making tests which XPASS to actually fail the suite
...
Fix #1355
2016-02-14 20:52:27 -02:00
Bruno Oliveira
a965386b9e
Add bool type to addini
2016-02-14 20:52:27 -02:00
Bruno Oliveira
6f0d90cd5a
Merge pull request #1385 from RonnyPfannschmidt/release-process-update
...
update release process to ensure correct usage of base branches and p…
2016-02-14 00:54:25 -02:00
Ronny Pfannschmidt
48424a6bf6
update release process to ensure correct usage of base branches and propper finalization
2016-02-13 20:30:58 +01:00
holger krekel
2a8d58814a
Merge pull request #1384 from hpk42/master
...
trying to settle the new layout
2016-02-13 16:56:44 +01:00
holger krekel
fa601de5c4
update participants
2016-02-13 16:55:16 +01:00
holger krekel
8284d14ec4
re-introduce topics
2016-02-13 16:54:06 +01:00
holger krekel
238dcd8bae
some layout refinements
2016-02-13 14:30:10 +01:00
holger krekel
b95ff7104c
Merge branch 'master' of https://github.com/pytest-dev/pytest
...
removed doc/en/announce/sprint-funding-2016.txt
because /doc/en/announnce/sprint2016.txt is the one which
we published.
2016-02-13 14:18:05 +01:00
holger krekel
03f8b50c8a
Merge pull request #1383 from RonnyPfannschmidt/founding-header
...
give the founding header contrast
2016-02-13 14:10:44 +01:00
Ronny Pfannschmidt
dc7f76c276
adapt the header text based on a discussion with bruno
2016-02-13 13:40:59 +01:00
Ronny Pfannschmidt
20bd56f4b2
give the header contrast
2016-02-13 13:24:28 +01:00
Bruno Oliveira
89c75b2c91
Fix tox doc task
2016-02-13 02:09:25 -02:00
Bruno Oliveira
341bc33ff3
Merge pull request #1380 from biern/fix-utf8-explanation
...
Fix formatting utf-8 error explanation
2016-02-12 19:14:50 -02:00
Bruno Oliveira
fe10057c15
Merge pull request #1382 from RonnyPfannschmidt/founding-header
...
add links for the funding campaign in the header and sidebar
2016-02-12 18:45:32 -02:00
Ronny Pfannschmidt
48b62e4d89
add links for the funding campaign in the header and sidebar
2016-02-12 21:14:06 +01:00
Marcin Biernat
1b431d6644
fix formatting utf-8 error explanation
2016-02-12 20:28:06 +01:00
holger krekel
b1955c7f84
Merge pull request #1374 from RonnyPfannschmidt/fix-1366
...
fix issue #1366 by showing a note on the --fulltrace option
2016-02-11 10:45:12 +01:00
Ronny Pfannschmidt
bfa2fadac1
fix issue #1366 by showing a note on the --fulltrace option
2016-02-10 20:27:50 +01:00
holger krekel
48109b0e60
remove superflous file
2016-02-09 15:45:51 +01:00
holger krekel
fdce2306a7
fix names once again
2016-02-09 15:44:32 +01:00
Florian Bruhin
f00577f7c4
Also fix Brianna's name.
2016-02-09 15:37:45 +01:00
Florian Bruhin
569dbeb087
Fix names properly.
2016-02-09 15:36:59 +01:00
Bruno Oliveira
c6938221ab
Merge branch 'issue1290-at-operator'
2016-02-06 09:38:45 -02:00
Bruno Oliveira
2b764a0e73
Fix CHANGELOG entry to new format
2016-02-06 09:37:13 -02:00
Bruno Oliveira
51694b8295
Merge branch 'master' into issue1290-at-operator
2016-02-06 09:31:42 -02:00
Bruno Oliveira
2e04771893
Merge pull request #1358 from RonnyPfannschmidt/features
...
merge features into master to begin the 2.9 line
2016-02-06 00:26:30 -02:00
TomV
7d107018e8
Fix #1290 : Py3.5's @ operator/assertion rewriting.
2016-02-05 23:09:57 +00:00
holger krekel
05aad5c381
fix brianna's name once again
2016-02-05 14:12:35 +01:00
holger krekel
1e0088a949
fix EUR->USD
2016-02-05 14:11:30 +01:00
holger krekel
ba3b29e831
add a link to lieve indiegogo campaign in the pytest sprint page
2016-02-05 14:04:32 +01:00
holger krekel
6218e20e88
- preliminary sprint page, not yet linked through the header
...
- also removed plugins_index call from tox.ini "doc" env because it's not there
2016-02-05 11:34:40 +01:00
Ronny Pfannschmidt
190a52badb
correct merge misstake in appveyor.yml
2016-02-05 01:18:11 +01:00
Ronny Pfannschmidt
7b2956e10b
merge latest master into features as well
2016-02-05 00:13:48 +01:00
Ronny Pfannschmidt
de1a9f574c
merge from master
2016-02-05 00:10:28 +01:00
Ronny Pfannschmidt
05a26d995b
Merge pull request #1354 from gdyuldin/no_raise_message
...
Add expected exceptions to pytest.raises fail message
2016-02-03 13:54:24 +01:00
Georgy Dyuldin
79722ae89b
Add expected exceptions to 'DID NOT RAISE' msg
2016-02-03 14:12:41 +03:00
Bruno Oliveira
b5dc7d9be1
Merge pull request #1350 from pytest-dev/appveyor-pypy
...
Test with pypy and enable coveralls in AppVeyor
2016-02-01 19:31:48 -02:00
Bruno Oliveira
30e61f2777
Test with pypy and enable coveralls in AppVeyor
...
* Install pypy using chocolatey
* Enable coveralls test environment in AppVeyor
* Suggest maintaining build matrix in .travis.yml by using "tox --listenvs"
Fix #1254
2016-02-01 17:40:30 -02:00
holger krekel
58af604f82
Merge pull request #1346 from hpk42/master
...
merge sprint funding draft -- please feel free to commit directly.
2016-01-30 19:13:17 +01:00
holger krekel
c0024a723d
fixed name
2016-01-30 19:12:41 +01:00
holger krekel
545bf0d5a1
a few refinements
2016-01-29 15:43:15 +01:00
holger krekel
70b5d5aee9
sprint funding draft
2016-01-29 14:52:07 +01:00
Bruno Oliveira
fde44f4f30
Merge branch 'better_flag_names' of https://github.com/MichaelAquilina/pytest into features
2016-01-27 20:02:50 -02:00
Bruno Oliveira
fa4d832507
Merge branch 'better_flag_names' into features
2016-01-27 19:57:23 -02:00
Bruno Oliveira
74a68b5ec6
Add CHANGELOG and docs for #1345
2016-01-27 19:57:11 -02:00