1294 commits

Author	SHA1	Message	Date
adam j hartz	e2999b8497	some tests	2017-02-25 22:39:10 -05:00
Anthony Scopatz	4dbbcf56e8	CI fixes	2017-02-25 21:45:32 -05:00
Anthony Scopatz	4b304b1763	fixed replay tests	2017-02-25 21:28:28 -05:00
Anthony Scopatz	d1341af9bd	integration tests work	2017-02-25 21:19:56 -05:00
Anthony Scopatz	b389c99399	added greedy subproc_toks	2017-02-25 20:15:02 -05:00
Anthony Scopatz	f7adc8b136	raw toks for the win	2017-02-25 17:58:35 -05:00
Anthony Scopatz	784dcbb959	yuk	2017-02-25 16:45:33 -05:00
Anthony Scopatz	14acf7ac99	fix tests	2017-02-25 12:15:56 -05:00
Anthony Scopatz	a116eff72b	fixed merge conflicts	2017-02-25 12:04:54 -05:00
Anthony Scopatz	230a61193c	Fixed del (x, y)	2017-02-25 00:50:56 -05:00
Anthony Scopatz	f4112cf0b1	some more qtoue fixes	2017-02-24 23:55:12 -05:00
Anthony Scopatz	bf75fe8a14	dotall	2017-02-24 23:18:31 -05:00
Anthony Scopatz	d7196ca7fa	more working	2017-02-24 23:00:06 -05:00
Anthony Scopatz	f056fe01c3	more	2017-02-24 22:39:36 -05:00
Morten Enemark Lund	8acaa3f88d	Merge pull request #2225 from xonsh/ie ... Import Events and Matplotlib Interactive Fixes	2017-02-21 05:18:56 +01:00
Anthony Scopatz	4030ed8050	addes split() method to lexer	2017-02-19 20:48:26 -05:00
Anthony Scopatz	2ed0445a74	first pass at import event hooks	2017-02-19 13:22:01 -05:00
Anthony Scopatz	67527baa6e	summy styler must provide str to pygments, not none.	2017-02-18 20:34:40 -05:00
Anthony Scopatz	65385ff544	some bug fixes	2017-02-18 19:43:48 -05:00
Anthony Scopatz	67d61ed0c2	Merge branch 'master' into linecont	2017-02-17 02:00:16 -05:00
Anthony Scopatz	0cb619468a	line continuation fixes	2017-02-15 00:58:38 -05:00
Hugo Wang	c28504a152	Merge branch 'master' into tcgrp	2017-02-15 12:04:23 +08:00
Hugo Wang	e63c57acd5	update test cases	2017-02-15 12:01:04 +08:00
Morten Enemark Lund	e78b0448a7	Don't import xonsh.built_ins	2017-02-14 21:29:44 +01:00
Morten Enemark Lund	88abaf6348	Fix skip_if_on_conda decorator	2017-02-14 21:17:43 +01:00
Morten Enemark Lund	8877188cb5	Explicitly instantiate Excer() in test_imphooks.py. ... Using the Excer fixture from conftest.py does not instantiate builtins. And calling load_builtins won't work since it is monkeypatched from the fixture.	2017-02-14 21:14:18 +01:00
Morten Enemark Lund	4f09829fd6	Fix monkeypath load_builins	2017-02-14 21:02:04 +01:00
Anthony Scopatz	3d20fc04de	no history	2017-02-13 01:04:56 -05:00
Anthony Scopatz	419984beca	new ctx	2017-02-13 00:50:31 -05:00
Anthony Scopatz	773069c4f5	Xonsh startup loading refactor	2017-02-13 00:25:38 -05:00
Konstantinos Tsakiltzidis	672e0c617c	Merge pull request #2181 from xonsh/file ... Added __file__ and __name__ to xonsh scripts	2017-02-13 02:06:18 +02:00
Anthony Scopatz	5e1babbc65	Some fixes	2017-02-12 17:18:57 -05:00
Anthony Scopatz	a695c78e64	is -> in	2017-02-12 17:09:51 -05:00
Anthony Scopatz	cbc7282707	ws	2017-02-12 13:36:33 -05:00
Anthony Scopatz	8225731142	some comments	2017-02-12 13:24:53 -05:00
Anthony Scopatz	cb2f071d37	ugg	2017-02-12 13:21:13 -05:00
Anthony Scopatz	2e6946d5a7	pytest is thge worst	2017-02-12 13:15:34 -05:00
Anthony Scopatz	9823b465cf	separate tests	2017-02-12 13:11:29 -05:00
Anthony Scopatz	633cce8e95	xfail	2017-02-12 13:01:15 -05:00
Anthony Scopatz	6df10233dc	stupid message	2017-02-12 12:59:40 -05:00
Anthony Scopatz	e223c9e7b7	_bad_case	2017-02-12 12:55:51 -05:00
Anthony Scopatz	75afffc54b	merge cases	2017-02-12 12:52:13 -05:00
Anthony Scopatz	a9e48b04be	try this	2017-02-12 12:32:50 -05:00
Anthony Scopatz	489b4b460e	try inner	2017-02-12 12:27:00 -05:00
Anthony Scopatz	7f59cfc998	uggh more	2017-02-12 12:17:17 -05:00
Anthony Scopatz	8641e44b93	err	2017-02-12 11:59:51 -05:00
Anthony Scopatz	03646b987e	skip on travis	2017-02-12 11:50:34 -05:00
Anthony Scopatz	ec174a3b44	no xonsh	2017-02-12 11:42:44 -05:00
Hugo Wang	5368d720fe	moved unthreadable etc decorators to tools	2017-02-12 11:01:24 +08:00
Anthony Scopatz	0fbb522712	mac test fixes	2017-02-11 19:22:30 -05:00