Commit graph

789 commits

Author SHA1 Message Date
Anthony Scopatz
ecf27710e6 ignore docs/conf.py 2015-03-25 18:44:45 -05:00
Anthony Scopatz
402e393ad1 some test improvements 2015-03-25 18:32:10 -05:00
Anthony Scopatz
588fa2b377 Merge branch 'wrywerytwreywery-master' 2015-03-25 18:10:55 -05:00
Anthony Scopatz
fd3f828081 Merge branch 'master' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-master 2015-03-25 18:05:22 -05:00
adam j hartz
7202815f53 stop SEMIs from screwing up subprocess mode 2015-03-25 18:40:54 -04:00
Anthony Scopatz
cfb031b827 Merge pull request #145 from javValverde/master
Use landscape.io
2015-03-25 15:56:00 -05:00
javValverde
1e9d0bb223 Use landscape account from scopatz 2015-03-25 20:17:55 +01:00
javValverde
7ab952c41f Added landscape configuration 2015-03-25 20:13:23 +01:00
javValverde
29f8871433 Added landscape batch to README 2015-03-25 20:10:19 +01:00
adam j hartz
3be729c4cf attempt to fix potential issue with WS token 2015-03-25 13:31:24 -04:00
adam j hartz
bf9a1801ff replace return statements with break statements 2015-03-25 13:28:24 -04:00
adam j hartz
3b4175a758 execer.py: pep8 2015-03-25 12:22:48 -04:00
adam j hartz
0b6ea767aa IndentationError from tokenizer shouldn't kill everything 2015-03-25 12:19:43 -04:00
adam j hartz
7127698dc0 more cleanup 2015-03-25 12:13:46 -04:00
adam j hartz
dfcedd14d5 one more small refactoring 2015-03-25 11:07:24 -04:00
adam j hartz
fcea45b361 refactoring of lexer and parser 2015-03-25 11:03:35 -04:00
adam j hartz
66292854ec refactoring per suggestions 2015-03-25 03:58:28 -04:00
Anthony Scopatz
7f597eef9c shortened conda install 2015-03-25 01:59:38 -05:00
Anthony Scopatz
22c61e8dcb fork me on github ribbon 2015-03-25 01:58:03 -05:00
adam j hartz
667c3695e4 lexer: pep8 fixes 2015-03-24 23:29:09 -04:00
adam j hartz
bf8283a74c remove unreachable parser state 2015-03-24 22:56:27 -04:00
adam j hartz
4f2b92ad65 revert formatting changes 2015-03-24 22:46:11 -04:00
adam j hartz
61b944c353 revert seemingly unneccesary small change 2015-03-24 22:43:51 -04:00
adam j hartz
d289163b5f add complicated tests from reported issues 2015-03-24 22:38:29 -04:00
adam j hartz
a5ae2ca4db remove superfluous print 2015-03-24 22:32:25 -04:00
adam j hartz
e918420616 comment handling bug 2015-03-24 22:30:07 -04:00
adam j hartz
5cad88e0f0 tools.py: don't need trailing whitespace on subproc commands? 2015-03-24 22:25:41 -04:00
adam j hartz
3e3d7c3c04 True, False, None should be NameConstants 2015-03-24 22:24:40 -04:00
adam j hartz
0c9d1bd5f3 add ellipsis 2015-03-24 22:24:23 -04:00
adam j hartz
7a636430a6 lexer tests 2015-03-24 22:09:50 -04:00
adam j hartz
393d00964a Merge branch 'master' of https://github.com/scopatz/xonsh 2015-03-24 21:15:35 -04:00
adam j hartz
3fc4d759d2 fix embarrassing bug 2015-03-24 21:11:39 -04:00
adam j hartz
aa343facfd some cleanup 2015-03-24 20:55:07 -04:00
adam j hartz
3b1527048c handling comments 2015-03-24 20:53:27 -04:00
adam j hartz
34d2367768 improved error handling, and some cleanup 2015-03-24 20:23:50 -04:00
adam j hartz
7ad7d81420 improved error handling 2015-03-24 20:23:24 -04:00
adam j hartz
01ae82bf77 fix with dollar name 2015-03-24 20:05:19 -04:00
adam j hartz
1ce86b62ed small bugfix 2015-03-24 19:44:23 -04:00
adam j hartz
991bec3e66 working lexer/parser, before tests and cleanup 2015-03-24 18:55:36 -04:00
adam j hartz
ed897c813a parser working except subprocess mode 2015-03-24 16:36:27 -04:00
Anthony Scopatz
40ba8e5fe2 Merge pull request #143 from wrywerytwreywery/version
Version
2015-03-24 15:18:00 -05:00
adam j hartz
bea87727ab changing version variable name 2015-03-24 16:07:37 -04:00
adam j hartz
5df63ba3e8 Merge branch 'master' of https://github.com/scopatz/xonsh into version 2015-03-24 15:09:11 -04:00
adam j hartz
492c29dd3d updates dealing with version number 2015-03-24 15:09:04 -04:00
adam j hartz
37e61cb96a first go at using Python's tokenizer to help with parsing 2015-03-24 14:04:47 -04:00
Anthony Scopatz
1e76fd0765 attempt to get Ctrl-c behaviour right 2015-03-23 21:36:25 -05:00
Anthony Scopatz
bac6bfbc58 run non-PATH commands 2015-03-23 20:43:49 -05:00
Anthony Scopatz
bfbf256b03 Merge branch 'mbollmann-norc' 2015-03-23 11:35:29 -05:00
Anthony Scopatz
b2545b4dce Merge branch 'norc' of https://github.com/mbollmann/xonsh into mbollmann-norc 2015-03-23 11:33:57 -05:00
Anthony Scopatz
6f53240ae1 Merge branch 'wrywerytwreywery-xonshrc' 2015-03-23 11:00:39 -05:00