38 commits

Author	SHA1	Message	Date
Anthony Scopatz	b33770869e	cached, aliased import fix	2016-07-28 04:47:39 -04:00
Anthony Scopatz	63549c7301	fixed amalgamate bug	2016-07-28 04:38:28 -04:00
Anthony Scopatz	6275710494	style fixes	2016-07-23 14:18:22 -04:00
Anthony Scopatz	c45d37329f	relimps	2016-07-23 13:53:49 -04:00
Anthony Scopatz	3ffe99e428	Merge branch 'master' into futamal	2016-07-21 14:12:48 -04:00
Anthony Scopatz	de432331c8	amalgamate handles time machine	2016-07-21 00:12:11 -04:00
Leonardo Santagada	51b3c98589	Merge remote-tracking branch 'upstream/master' into remove-flake8-exceptions	2016-07-20 22:15:56 +02:00
Anthony Scopatz	74c8782113	more completer amalgamations	2016-07-19 10:20:03 -04:00
Anthony Scopatz	6383aeb312	more skips	2016-07-19 09:21:47 -04: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
Leonardo Santagada	61099aab10	small style changes	2016-07-18 11:30:57 +02:00
Leonardo Santagada	52aae3f173	unused imports and var	2016-07-18 10:07:30 +02:00
Anthony Scopatz	c5ad065b60	some amalgamate updates from @yaroslavvb	2016-07-01 11:36:06 -04:00
Anthony Scopatz	502f1a6627	seems to work	2016-06-26 14:41:53 -04:00
Anthony Scopatz	9415b4cde0	newline fix	2016-06-25 12:44:08 -04:00
Anthony Scopatz	2838aef596	more unicode escapes in amagamate for anaconda	2016-06-18 16:32:36 -04:00
Anthony Scopatz	1fad151450	more unicode amalgamate fixes	2016-06-17 16:05:46 -04:00
Anthony Scopatz	4948b51a84	feedback	2016-06-16 20:20:10 -04:00
Anthony Scopatz	c1fb942f2b	switched to xonsh debug	2016-06-16 11:03:43 -04:00
Anthony Scopatz	d2784efc0a	imports where I need	2016-06-15 22:11:17 -04:00
Anthony Scopatz	6f9c442dbc	more laziness	2016-06-15 00:44:01 -04:00
Anthony Scopatz	80339f5dc4	lazy and self destructive	2016-06-14 23:46:13 -04:00
Anthony Scopatz	90dac354ca	lazy imports	2016-06-13 22:55:02 -04:00
Anthony Scopatz	6b618c4f9d	lazy integration	2016-06-13 22:39:14 -04:00
Anthony Scopatz	075d17056c	lazy module	2016-06-13 22:12:41 -04:00
Anthony Scopatz	99f0f1b726	fixed typo bug	2016-06-13 11:52:45 -04:00
Anthony Scopatz	38c07b1772	some changes	2016-06-13 03:02:24 -04:00
Anthony Scopatz	5f416ff390	new msg	2016-06-13 02:40:40 -04:00
Anthony Scopatz	db8d0d2f53	another test	2016-06-13 02:37:54 -04:00
Anthony Scopatz	2f55e29035	lazyjson	2016-06-13 01:47:43 -04:00
Anthony Scopatz	73aa30263b	amalgam	2016-06-13 01:28:27 -04:00
Anthony Scopatz	556522621d	first try	2016-06-13 01:23:11 -04:00
Anthony Scopatz	cc1092cdd3	more work	2016-06-13 00:46:35 -04:00
Anthony Scopatz	e32341cd90	more changes	2016-06-12 13:26:59 -04:00
Anthony Scopatz	66598aafd0	have dependency oridering	2016-06-12 13:18:50 -04:00
Anthony Scopatz	3dd9fda01a	parser	2016-06-12 12:31:50 -04:00
Anthony Scopatz	574efae5e8	start amal	2016-06-12 11:07:09 -04:00