Commit Graph

21 Commits

Author SHA1 Message Date
Ronny Pfannschmidt de1a9f574c merge from master 2016-02-05 00:10:28 +01:00
Ronny Pfannschmidt 64d7d00218 Prepare 2.8.7 release 2016-01-24 17:59:48 +01:00
Bruno Oliveira ec597e81a4 Remove references to python pre-2.6 from docs 2015-12-16 16:16:22 -02:00
Bruno Oliveira 6ac31088c5 Merge branch 'master' into merge-master-into-features 2015-12-11 23:13:50 -02:00
Florian Bruhin 7d150c20cf Regenerate 2.8.5 docs. 2015-12-11 22:28:23 -02:00
Buck Golemon eabf2f9091 Merge branch 'master' into features
Conflicts:
	AUTHORS
	_pytest/__init__.py
	_pytest/hookspec.py
	_pytest/recwarn.py
	testing/test_recwarn.py
2015-12-07 14:28:59 -08:00
Ronny Pfannschmidt b920f09a95 doc regen for release 2.8.4 2015-12-06 16:14:23 +01:00
Bruno Oliveira 382efc6363 Fix same inconsistency in next example 2015-12-05 00:43:06 -02:00
Bruno Oliveira 1bed514eb6 Fix inconsistency in skipif example
Fix #1224
2015-12-05 00:35:31 -02:00
Ronny Pfannschmidt 063f90f0d2 run regendoc 2015-11-18 17:47:17 +01:00
Florian Bruhin 42937d4bb6 Prepare 2.8.2 release. 2015-10-06 21:06:25 +02:00
Michael Aquilina abc27f56fc Update skipping.rst with correct version marker 2015-10-03 16:42:15 +01:00
Michael Aquilina dc7153e33c Spelling and grammar fixes 2015-10-03 16:42:15 +01:00
Michael Aquilina 5ec08d3081 Delete trailing whitespace 2015-10-03 16:42:15 +01:00
Michael Aquilina 61b8443723 Update docs with new skip marker 2015-10-03 16:42:14 +01:00
holger krekel 95245b935c - fix a flaky test on py35-xdist by calling
importlib.invalidate_caches()

- bump version to 2.8.1

- regen docs

- amend changelog, authors
2015-09-29 13:10:59 +02:00
Ronny Pfannschmidt c3588b545f generate docs on python3.4 2015-09-22 16:52:35 +02:00
Ronny Pfannschmidt 89badfec0c update regendoc, substitutes PYTHON_PREFIX 2015-09-22 14:48:04 +02:00
Ronny Pfannschmidt 662d755974 fix documentation gegeneration, kill Makefile 2015-09-22 14:22:37 +02:00
Christian Theune 2174f3ce37 Fix accidental inversion in skip example. 2015-08-12 07:38:04 +02:00
Abhijeet Kasurde e79413acc4 Updated documentation from txt to rst
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2015-08-04 16:41:02 +05:30