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
7eea6b3b02
Add 2.8.6.dev1 to CHANGELOG
2015-12-11 23:11:36 -02:00
e87facfb22
Bump master to 2.8.6.dev1
2015-12-11 23:07:30 -02:00
855b115dab
Remove plugins_index generation from HOWTORELEASE
2015-12-11 22:35:44 -02:00
4263b8b407
Restore regen-doc result
2015-12-11 22:34:16 -02:00
7d150c20cf
Regenerate 2.8.5 docs.
2015-12-11 22:28:23 -02:00
a124163425
Prepare for 2.8.5: bump version, CHANGELOG, announce
2015-12-11 19:20:07 -02:00
2382546112
Merge pull request #1252 from nicoddemus/optimize-app-veyor
...
Optimize appveyor build
2015-12-11 16:10:45 +01:00
946bb08da5
Tyding up the CHANGELOG
2015-12-11 00:36:26 -02:00
85d1f0404a
Merge pull request #1243 from aselus-hub/master
...
Update python.py
2015-12-11 00:33:46 -02:00
1d60f61ba8
Optimize appveyor build
...
- AppVeyor does not run matrix builds in parallel, so creating a matrix with the intent to
speed up the build will actually result in longer build times, as each matrix will execute
in a brand new VM.
- tox does not detect 64 bit installations in AppVeyor, it always installs interpreters
from C:\PythonX.Y, so there's no point to have 64bit builds
- No need for the auxiliary script "install.ps1" because all python versions we are interested
in are already pre-installed in AppVeyor
2015-12-11 00:20:20 -02:00
ad05cbe6da
fixed meesage.
2015-12-10 15:39:31 -08:00
1216a27b44
added docstrign to inection collection test.
2015-12-10 15:19:08 -08:00
2b2240e904
added myself to authors, added changelog entry.
2015-12-10 15:15:09 -08:00
74f7efd2a3
added line comparison that is pytest-sugar agnostic.
2015-12-10 15:10:55 -08:00
34db8aed34
added verification that test actually passed.
2015-12-10 15:02:57 -08:00
926c6028bb
Merge pull request #1250 from nicoddemus/merge-master-into-features
...
Merge master into features
2015-12-10 20:56:10 -02:00
af54e09759
nit: fixed newline
2015-12-10 14:46:51 -08:00
dfaeefd692
added test to verify injection.
2015-12-10 14:45:36 -08:00
86b6ce5042
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2015-12-10 19:41:14 -02:00
8f880e1625
Fix CHANGELOG merge
2015-12-10 19:40:45 -02:00
46c85bc352
Merge pull request #1249 from nicoddemus/remove-plugins-index
...
Remove plugins_index from the docs
2015-12-10 19:11:32 -02:00
8b61a332ba
Merge remote-tracking branch 'bukzor/features-merge-master' into features
2015-12-10 19:03:55 -02:00
139c97930b
Remove plugins_index from the docs
...
Fix #1229
2015-12-10 19:00:01 -02:00
9cfee82f9b
Merge pull request #1247 from alex/patch-1
...
Use https for images in readme
2015-12-10 00:02:47 +01:00
c0a5f3df10
Use https for images in readme
2015-12-09 18:01:36 -05:00
Bruno Oliveira
Ronny Pfannschmidt
Erik M. Bray
Peter Demin
Florian Bruhin
aselus-hub
Alex Gaynor