6c170201d6
Merge branch 'master' into features
2016-01-02 23:56:01 +01:00
bf4de4bd68
Merge pull request #1294 from nicoddemus/doctest-bytes-literals
...
Doctest bytes literals
2016-01-01 18:18:08 +01:00
80d6d94635
Merge pull request #1298 from aktech/patch-1
...
Update copyright in README
2016-01-01 12:06:21 -02:00
63cba1ed0d
Update copyright in README
2016-01-01 18:52:56 +05:30
71ab6b8b05
Merge pull request #1295 from nicoddemus/monkeypatch-perf
...
Make monkeypatch calls O(1)
2015-12-30 22:21:16 +01:00
c367180ab2
Merge pull request #1297 from nicoddemus/multi-doctest-glob
...
Multiple --doctest-glob arguments
2015-12-30 22:18:46 +01:00
1bdf71730a
Complement #1255 by adding tests and docs
...
Fix #1242
2015-12-30 18:24:59 -02:00
0ea8dc0d40
make --doctest-glob multi-allowed
2015-12-30 17:32:14 -02:00
638b3f5e39
Make monkeypatch calls O(1)
...
Fix #1292
2015-12-29 22:04:35 -02:00
309ecf7ab3
Rename "BugFixes/Adjustments" to just "Bug Fixes" as commented elsewhere
2015-12-29 21:09:15 -02:00
719d63085d
Add CHANGELOG entry for ALLOW_BYTES doctest option
2015-12-29 21:08:25 -02:00
5a5b732fe1
Add docs for ALLOW_BYTES doctest option
...
Fix #1287
2015-12-29 21:05:11 -02:00
a0edbb75a4
Implement ALLOW_BYTES doctest option
...
Fix #1287
2015-12-29 20:55:19 -02:00
0ef73ed3e0
Small typo on README
2015-12-28 18:56:14 -02:00
7cfb750d7f
Small wording on README
2015-12-28 18:55:20 -02:00
70f72229c6
Merge pull request #1291 from ulope/master
...
Make monkeypatch differentiate ImportError sources
2015-12-28 13:18:25 -02:00
2e02579437
Add CHANGELOG entry for #900 fix
2015-12-28 10:53:38 +01:00
8d49abb0d1
Make monkeypatch differentiate ImportError sources
...
Previously `monkeypatch` assumed that any `ImportError` was caused by
a mistake in the specified import path. However this assumption is false
in case the import target itself causes an `ImportError`.
Fixes : #900
2015-12-27 22:44:23 +01:00
c5631b6567
Merge pull request #1284 from nicoddemus/pyversions-badge
...
Add badge of supported python versions to README
2015-12-27 16:05:43 +01:00
522224ee7c
Merge pull request #1285 from nicoddemus/readme-changes-logo
...
Add logo and some readme changes
2015-12-27 15:47:29 +01:00
015e8e574a
Merge pull request #1289 from WoLpH/patch-1
...
Updated out of date link
2015-12-27 07:22:41 -02:00
87ff7ee232
Updated out of date link
2015-12-27 02:35:02 +01:00
b5490b289d
Add logo and update readme
...
* Show pytest logo
* Show assertion introspection in the example
* Use separate sections for change-log, docs, license, etc.
2015-12-26 12:47:22 -02:00
46039f8687
Merge pull request #1286 from nicoddemus/changelog-sections
...
Separate 2.9.0 CHANGELOG into sections
2015-12-26 11:09:45 +01:00
6b25fb4d64
Separate 2.9.0 CHANGELOG into sections
...
Fix #1275
2015-12-25 20:44:03 -02:00
99a5067edb
Merge branch 'pyreadline-workaround'
2015-12-25 18:03:25 -02:00
5afb61ad26
Fix trailing white-space
2015-12-25 17:51:55 -02:00
fbfab6778c
Give proper thanks for the PR in the CHANGELOG
2015-12-25 17:48:03 -02:00
57bc14caa0
Apply readline workaround during initial conftest loading
2015-12-25 17:46:19 -02:00
df3f21afb6
Add badge of supported python versions to README
2015-12-25 16:28:50 -02:00
1a87bb2416
Merge pull request #1280 from nicoddemus/del-index-from-overview
...
Remove "index" entry from overview.rst
2015-12-25 07:33:15 +01:00
6e170a4a1c
* Moved workaround to its own function, mostly for the sake of adding
...
a more descriptive docstring (the workaround itself is just to import
readline earlier). I removed the conditional on targetfd from the
workaround since it doesn't really matter.
* Added # noqa marker.
* Added changelog entry, and self to authors.
2015-12-24 16:43:34 -05:00
924a9667e1
Make sure readline has been imported before duping any stdio handles--otherwise pyreadline fails to connect to the correct handle for the console's stdout/in.
2015-12-24 14:56:57 -05:00
319f6310f8
Remove "index" entry from overview.rst
...
"index" is already displayed in the main docs, repeating it here breaks the reading flow
2015-12-24 16:08:43 -02:00
cd3a441304
Merge pull request #1277 from peterdemin/patch-1
...
doc typo
2015-12-24 15:57:01 -02:00
8180165229
doc typo
2015-12-24 08:56:54 -05:00
ec5a429c77
junitxml tests: extend with extra items
2015-12-17 22:30:27 +01:00
713069ebd4
implement review comments for #1266
2015-12-17 22:27:01 +01:00
f7af08d309
Merge pull request #1268 from nicoddemus/merge-newinterpret
...
Merge newinterpret.py into reinterpret.py
2015-12-17 07:10:47 +01:00
943099ddd1
Merge newinterpret into reinterpret.py
2015-12-16 18:31:43 -02:00
379562107e
Merge pull request #1267 from nicoddemus/remove-pre-2.6
...
Remove pre-2.6 support code and docs (including obsolete oldinterpret module)
2015-12-16 18:30:53 -02:00
25c392196f
Mention #1226 in the CHANGELOG
2015-12-16 16:48:49 -02:00
ec597e81a4
Remove references to python pre-2.6 from docs
2015-12-16 16:16:22 -02:00
81588d7f63
Remove obsolete "oldinterpret" module
2015-12-16 16:16:22 -02:00
af893aab26
Remove code related to support python <= 2.5
...
Fix #1226
2015-12-16 16:16:22 -02:00
8bf7e7cc4b
fixes #1259 - take finalized nodes out of the mapping
...
this allows double node id usage for file based items
2015-12-16 19:09:44 +01:00
7b20288c2b
Merge pull request #1264 from nicoddemus/exception-interact-deprecated
...
Remove experimental status from pytest_exception_interact
2015-12-16 18:32:58 +01:00
2b2bec6b97
Remove experimental status from pytest_exception_interact
2015-12-16 14:29:39 -02:00
fcc20d4181
Merge pull request #1257 from nicoddemus/merge-master-into-features
...
Merge master into features after 2.8.5
2015-12-12 08:15:55 +01:00
6ac31088c5
Merge branch 'master' into merge-master-into-features
2015-12-11 23:13:50 -02:00
Ronny Pfannschmidt
Bruno Oliveira
AMiT Kumar
jab
Ulrich Petri
Rick van Hattem
Erik M. Bray
Peter Demin