Commit graph

4203 commits

Author SHA1 Message Date
Anthony Scopatz
3f206e0a56 newlines 2016-07-19 12:02:22 -04:00
Anthony Scopatz
af756eaae4 more news 2016-07-19 10:47:20 -04:00
Anthony Scopatz
fdaf724cab import fix 2016-07-19 10:36:01 -04:00
Anthony Scopatz
903ab95b89 news 2016-07-19 10:31:20 -04:00
Anthony Scopatz
0c5a03d21f some laziness 2016-07-19 10:28:23 -04:00
Anthony Scopatz
74c8782113 more completer amalgamations 2016-07-19 10:20:03 -04:00
Anthony Scopatz
202639ba54 Merge branch 'master' into amalcomp 2016-07-19 10:11:58 -04:00
Anthony Scopatz
aea07b7415 fixed tokenize 2016-07-19 10:09:43 -04:00
Gil Forsyth
749aead303 Merge pull request #1436 from xonsh/wt
potential fix for interactive answering
2016-07-19 10:06:05 -04:00
Anthony Scopatz
6e508dfc60 from xonsh.lazyimps import pygments, pyghooks 2016-07-19 09:52:01 -04:00
Anthony Scopatz
263cd4ac05 pretty fixes 2016-07-19 09:44:01 -04:00
Anthony Scopatz
2d08c2430f fix duplicate equals 2016-07-19 09:33:31 -04:00
Anthony Scopatz
6383aeb312 more skips 2016-07-19 09:21:47 -04:00
Anthony Scopatz
4aa6d67e7e Merge pull request #1450 from Kilte/thunar-custom-actions-doc
Docs: how to fix Thunar's "Open Terminal Here" action.
2016-07-19 07:03:54 -05:00
Kilte Leichnam
aa02205e6b Docs: how to fix Thunar's "Open Terminal Here" action. 2016-07-19 14:26:36 +03:00
Anthony Scopatz
053bdd2b33 more fixes 2016-07-19 00:09:23 -04:00
Anthony Scopatz
81b0a09939 amalgamate warnings 2016-07-18 23:46:33 -04:00
Gil Forsyth
f748b68062 Merge pull request #1449 from xonsh/rmflake8
don't run flake8 for all pytets
2016-07-18 21:32:06 -04:00
Anthony Scopatz
a6cb6b208c Merge branch 'rmflake8' into amalcomp 2016-07-18 21:29:04 -04:00
Anthony Scopatz
fce320334c platform fixes 2016-07-18 21:21:42 -04:00
Anthony Scopatz
059dfa5a8f Merge branch 'rmflake8' into wt 2016-07-18 21:17:29 -04:00
Anthony Scopatz
cf97e3a00d teepty windows fix 2016-07-18 21:15:49 -04:00
Anthony Scopatz
ace63d5920 build off 2016-07-18 21:11:01 -04:00
Anthony Scopatz
9b508f79e0 empty build script 2016-07-18 21:06:28 -04:00
Anthony Scopatz
df865f7387 Merge branch 'rmflake8' into wt 2016-07-18 20:17:08 -04:00
Anthony Scopatz
34c7dcfe10 don't run flake8 for all pytets 2016-07-18 20:16:41 -04:00
Anthony Scopatz
b9ff00cb03 Merge branch 'master' into wt 2016-07-18 19:16:53 -04:00
Anthony Scopatz
d0523700c0 pause resume 2016-07-18 19:16:50 -04:00
Gil Forsyth
cc0f103ab0 Merge pull request #1437 from xonsh/freebsd
Added FreeBSD support
2016-07-18 16:16:01 -04:00
Anthony Scopatz
8d1145c952 Merge pull request #1445 from mitnk/trim-git-sha
Trim the heading g in Git SHA of xonfig
2016-07-18 14:08:50 -04:00
Hugo Wang
7959a97718 small improves 2016-07-18 22:24:37 +08:00
Hugo Wang
6df5fbcf5e trim g in git hash 2016-07-18 22:23:27 +08:00
Hugo Wang
26d5e38ea3 trim heading g in Git SHA 2016-07-18 16:19:36 +08:00
Anthony Scopatz
d32819f7da Merge branch 'stockninja-crash' 2016-07-17 19:19:57 -04:00
Anthony Scopatz
6f33ca203c style news fix 2016-07-17 19:19:46 -04:00
Anthony Scopatz
aaa6db11b1 Merge branch 'crash' of https://github.com/stockninja/xonsh into stockninja-crash 2016-07-17 19:17:40 -04:00
Anthony Scopatz
b32492f39b Merge branch 'master' into amalcomp 2016-07-17 18:41:05 -04:00
Anthony Scopatz
161f3aa40a Merge pull request #1444 from laerus/ttest
test_partial_string ref
2016-07-17 18:40:03 -04:00
Konstantinos Tsakiltzidis
9cefe04c80 Merge pull request #1431 from santagada/flake8-cov
Better CI run
2016-07-18 01:38:22 +03:00
laerus
245b5f7120 test_partial_string ref 2016-07-18 00:35:50 +03:00
Leonardo Santagada
723ede5091 need to allow even longer lines to not break the build now. 2016-07-17 14:09:11 +02:00
Leonardo Santagada
e182a7332d add comment on conftest.py to why it exists 2016-07-17 01:21:11 +02:00
Justin Moen
01501aa5d6 Fix wrong name 2016-07-15 22:07:18 -07:00
Justin Moen
88442c6f62 Dummy commit to re-run CI 2016-07-15 21:55:57 -07:00
Justin Moen
322365ef6a Include news snippet 2016-07-15 21:31:55 -07:00
Justin Moen
370bf5668c Reset $XONSH_COLOR_STYLE on bad value
Without doing this, an error message is printed on every iteration
of the command loop.

Perhaps it might be better to reset to the previous value if it exists,
else 'default'?
2016-07-15 21:23:16 -07:00
Justin Moen
2a2669c955 Remove mysterious variable causing crash
When unrecognized value given to `$XONSH_COLOR_STYLE`, the mysterious
`DEFAULT_STYLE` variable causes an unhandled `NameError`, leading to
terminal crash.
2016-07-15 21:12:27 -07:00
Morten Enemark Lund
3796c4ba3b Merge pull request #1434 from xonsh/pspace
branch space fix
2016-07-16 06:06:44 +02:00
Anthony Scopatz
1ba19ca939 started completer amalgamation 2016-07-15 23:44:29 -04:00
Anthony Scopatz
38c051df4e Merge pull request #1438 from stockninja/env_name
Document prompt's `env_name` parameter
2016-07-15 20:47:26 -05:00