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
Michael Aquilina
e35ce98f89
Add explicit flag names for failed first and last failed
2016-01-27 21:28:38 +00:00
Bruno Oliveira
dd0062c177
Dummy change to test readthedocs hook
2016-01-27 08:59:26 -02:00
Bruno Oliveira
6c37a51f95
Fix version at the top of the CHANGELOG
2016-01-27 08:28:18 -02:00
Ronny Pfannschmidt
52ac6cd7a9
Merge pull request #1199 from nicoddemus/move-pycode-to-pytest
...
Copy py.code code to py.test
2016-01-26 23:29:09 +01:00
Bruno Oliveira
4825678e1a
Add CHANGELOG entry for py.code merge
2016-01-26 20:24:08 -02:00
Bruno Oliveira
e43eaffd93
Remove unused import
2016-01-25 23:30:53 -02:00
Bruno Oliveira
9f85d4c952
mark test_comments as xfail on pypy
...
while migrating this code it was noticed that this test was failing even
on the original py repository, so it was decided to xfail it and investigate
later
2016-01-25 23:18:04 -02:00
Bruno Oliveira
7a6f902f6f
Drop assertionnew and assertionold from _pytest._code
2016-01-25 23:18:04 -02:00
Bruno Oliveira
a912d3745b
Moved py.code code over to py.test
...
Fix #103
2016-01-25 23:18:04 -02:00
Ronny Pfannschmidt
f23307b06d
Merge release branch into mater
2016-01-25 00:01:43 +01:00
Ronny Pfannschmidt
6c3e6401d4
begin 2.8.8 cycle
2016-01-24 23:56:56 +01:00
Ronny Pfannschmidt
3315b3a12f
finalize changelog for 2.8.7
2016-01-24 23:23:15 +01:00
Ronny Pfannschmidt
64d7d00218
Prepare 2.8.7 release
2016-01-24 17:59:48 +01:00
Ronny Pfannschmidt
7c747c97ec
Merge pull request #1339 from RonnyPfannschmidt/fix-1338
...
Fix 1338
2016-01-24 17:51:00 +01:00
Ronny Pfannschmidt
56c5db6e12
add requests dependency to tox.ini to ensure all monkeypatch tests run
2016-01-24 12:30:38 +01:00
Ronny Pfannschmidt
2d05f831fe
monkeypatch: unnest handling code
...
this avoid python3 nested exceptions
2016-01-24 12:28:14 +01:00