Commit graph

5979 commits

Author SHA1 Message Date
Gil Forsyth
582d9abf23 fix incorrect eventsbody generation in conf.py 2016-12-16 11:22:32 -05:00
Gil Forsyth
4a4076a0c2 add xompletions to api docs 2016-12-16 11:22:23 -05:00
Gil Forsyth
b7aa55413b Merge branch 'master' into xompletions 2016-12-16 11:01:27 -05:00
Gil Forsyth
a75003ba8e Merge pull request #2017 from xonsh/zombie
Zombie
2016-12-16 10:57:18 -05:00
Gil Forsyth
cc191c0403 lazyasd friendly import and add module docstring 2016-12-16 08:50:22 -05:00
Anthony Scopatz
7d3892d1f0 Merge pull request #2004 from xonsh/vox-fs
PEP 519 for Vox
2016-12-16 00:42:32 -08:00
Jamie Bliss
d2de666ac7 Merge remote-tracking branch 'upstream/master' into vox-fs 2016-12-15 22:21:33 -05:00
Anthony Scopatz
46c213cc03 Merge branch 'mitnk-debug-level-print' 2016-12-15 19:09:35 -08:00
Anthony Scopatz
06e6c449b2 Merge branch 'debug-level-print' of https://github.com/mitnk/xonsh into mitnk-debug-level-print 2016-12-15 19:08:49 -08:00
Anthony Scopatz
f04fc78765 Merge branch 'mitnk-unify-history' 2016-12-15 19:06:58 -08:00
Anthony Scopatz
bb45a6def8 Merge branch 'unify-history' of https://github.com/mitnk/xonsh into mitnk-unify-history 2016-12-15 18:53:38 -08:00
Jamie Bliss
7bc2642122 fs a module again and exclude from amalgamation 2016-12-15 21:36:23 -05:00
Jamie Bliss
44d570bfec Make 'fs' a package to avoid amalgamation and builtin smashing 2016-12-15 20:02:58 -05:00
Hugo Wang
c41a3512e4 code clean 2016-12-16 09:00:18 +08:00
Gil Forsyth
f34fb675d4 add news item 2016-12-15 18:11:20 -05:00
Gil Forsyth
10d458bd70 add stopiteration to both xompleters 2016-12-15 18:10:16 -05:00
Gil Forsyth
42cf419a5f fix pep8 and remove extra file 2016-12-15 17:31:25 -05:00
Anthony Scopatz
c55a379cc5 Merge branch 'master' into zombie 2016-12-15 13:25:35 -08:00
Anthony Scopatz
8ea683a492 fixed zombie processes from occuring 2016-12-15 13:24:39 -08:00
Gil Forsyth
01ad4c64f3 Merge pull request #2016 from xonsh/view
added view to unthreadable
2016-12-15 16:08:41 -05:00
Gil Forsyth
53ffa886bc Merge pull request #2015 from xonsh/gazing
Python-powered, cross-platform, Unix-gazing shell
2016-12-15 16:08:05 -05:00
Anthony Scopatz
8b892aa34a Merge pull request #2014 from xonsh/gforsyth-patch-1
stop travis if build fails
2016-12-15 11:20:13 -08:00
Anthony Scopatz
163d62d4bc more command 2016-12-15 11:18:50 -08:00
Anthony Scopatz
15b55d284a added view to unthreadable 2016-12-15 10:24:49 -08:00
Anthony Scopatz
d85dc753af index changes 2016-12-15 10:09:48 -08:00
Gil Forsyth
38c4a6b181 fix for shell_session_update error on travis
as per discussion in https://github.com/travis-ci/travis-ci/issues/6307 -- although that's old enough this might be a separate issue, but I'm trying it anyway.
2016-12-15 13:07:31 -05:00
Anthony Scopatz
cbb9c24959 Python-powered, cross-platform, Unix-gazing shell 2016-12-15 09:38:26 -08:00
Hugo Wang
afcd76a5ae added a news item 2016-12-15 22:59:07 +08:00
Hugo Wang
b47aabf654 updated for ut 2016-12-15 22:54:45 +08:00
Hugo Wang
31bf0a52d2 minor doc update 2016-12-15 22:41:06 +08:00
Hugo Wang
6926a21b9c updated XONSH_DEBUG debug levels 2016-12-15 22:30:26 +08:00
Hugo Wang
5d48c9419f Merge branch 'master' into unify-history 2016-12-15 21:33:57 +08:00
Jamie Bliss
c641d46879 Update __init__.py 2016-12-14 23:12:44 -05:00
Jamie Bliss
eaf33d1680 Merge branch 'vox-fs' of github.com:xonsh/xonsh into vox-fs 2016-12-14 21:27:58 -05:00
Jamie Bliss
3fbc929aae Allow non-fs arguments to open() 2016-12-14 21:27:42 -05:00
Gil Forsyth
53595218c3 update path to history_main in docs 2016-12-14 13:42:43 -05:00
Anthony Scopatz
0c075038a5 Merge pull request #1993 from xonsh/stdout_storage
Stdout storage
2016-12-14 09:54:35 -08:00
Gil Forsyth
1304257464 stop travis if build fails
@asmeurer reported that travis doesn't stop a build if the docs fail to build unless there's a `set -e` in there.  Adding it in so that we don't accidentally push broken docs, potentially deleting what we have.
2016-12-13 17:05:38 -05:00
Gil Forsyth
7faa2bcce6 pep8 fixes and remove bad ref in aliases docs 2016-12-12 13:05:52 -05:00
Hugo Wang
cfee7997fc update info print of debug level 2016-12-11 19:32:35 +08:00
Morten Enemark Lund
acce25886e Merge pull request #2006 from mitnk/ptk-prompt-crash
Prevent xonsh crash when ptk cli.run raises error
2016-12-11 10:29:09 +01:00
Hugo Wang
3fc91834ab prevent xonsh crash when ptk cli.run error 2016-12-11 17:18:14 +08:00
Hugo Wang
0cc6a8b4ff made json history buffer with all hists 2016-12-11 16:33:45 +08:00
Hugo Wang
00c29766b5 wip - update json history rtns 2016-12-10 22:45:21 +08:00
Jamie Bliss
dff1d9d3df Add news item 2016-12-09 23:18:49 -05:00
Jamie Bliss
5e5921802d add fspath support to vox 2016-12-09 23:14:41 -05:00
Jamie Bliss
72ffa7fb06 Ooops, pathlib doesn't implement it yet.... 2016-12-09 23:13:12 -05:00
Jamie Bliss
8418337930 Add fs backports 2016-12-09 22:41:15 -05:00
Gil Forsyth
e18487e275 flake8 fixes 2016-12-09 13:06:23 -05:00
Gil Forsyth
b1527b8e01 don't nuke existing stored stdout on json dump 2016-12-09 10:43:38 -05:00