Commit graph

4526 commits

Author SHA1 Message Date
Hugo Wang
4de79e59c9 update flake8 version in deps 2016-07-27 17:29:29 +08:00
Anthony Scopatz
5fa0de5b15 start on lazy completers 2016-07-27 04:47:10 -04:00
Anthony Scopatz
a55b760516 more 2016-07-27 04:42:24 -04:00
Hugo Wang
57abceb865 Merge branch 'master' of http://github.com/mitnk/xonsh into update-version-fmt 2016-07-27 16:35:04 +08:00
Hugo Wang
358d1c7ede typo 2016-07-27 14:51:36 +08:00
Hugo Wang
2b4ed2e2f1 updated msg 2016-07-27 10:07:38 +08:00
Anthony Scopatz
e6ef990dae Merge pull request #1488 from xonsh/multi-os
* small bash syntax fix

* remove unused os import

* run coverage build first so flake errors early
2016-07-26 12:34:23 -07:00
Gil Forsyth
d68858ae29 run coverage build first so flake errors early 2016-07-26 14:16:23 -04:00
Gil Forsyth
fc3956c3fd remove unused os import 2016-07-26 14:05:01 -04:00
Gil Forsyth
1cb1417988 small bash syntax fix 2016-07-26 12:54:30 -04:00
Anthony Scopatz
85f37ecaa9 some xexec optimizations 2016-07-26 12:40:20 -04:00
Anthony Scopatz
60aafcfb16 Merge pull request #1468 from xonsh/multi-os
Updates to #1465 using miniconda everywhere
2016-07-26 09:10:34 -07:00
Gil Forsyth
24de66c055 don't install coverage dependencies on non-nightly 2016-07-26 10:15:46 -04:00
Gil Forsyth
f283b6fef8 only run coverage on nightly 2016-07-26 10:11:30 -04:00
Gil Forsyth
afea01aefc better on_conda check that doesn't rely on which 2016-07-26 10:09:09 -04:00
Gil Forsyth
750b1e4903 Merge branch 'master' into multi-os 2016-07-26 10:01:23 -04:00
Hugo Wang
13eb15844b misc 2016-07-26 19:25:49 +08:00
Hugo Wang
342e5aa5b4 base version should keep unchanged 2016-07-26 18:53:36 +08:00
Anthony Scopatz
5574efb91e indent fix 2016-07-26 03:52:33 -04:00
Anthony Scopatz
ff092c5ec4 Merge branch 'master' into lazyloop 2016-07-26 03:39:54 -04:00
Anthony Scopatz
415d858f71 Merge pull request #1485 from santagada/fix-build
Fix build
2016-07-26 00:38:16 -07:00
Leonardo Santagada
b1616ff170 don't update on install and set package versions 2016-07-26 09:07:59 +02:00
Leonardo Santagada
3d49746bfe Merge remote-tracking branch 'upstream/master' 2016-07-26 09:02:17 +02:00
Gil Forsyth
ef588e1cab flake8 fix - bad indentation 2016-07-26 09:01:16 +02:00
metamind
ec5e7d3cd9 typos 2016-07-26 09:01:16 +02:00
Anthony Scopatz
f89c1d4703 blank line 2016-07-26 09:01:16 +02:00
Anthony Scopatz
3b68cb248a comment update 2016-07-26 09:01:16 +02:00
Gil Forsyth
c6b4b7db71 add news entry 2016-07-26 09:01:16 +02:00
Gil Forsyth
c86701e625 update completion logic in jupyter kernel 2016-07-26 09:01:16 +02:00
laerus
8d2ace5408 pep8 unused import, ty 2016-07-26 09:01:16 +02:00
laerus
0a0e8dee33 news rst fix 2016-07-26 09:01:16 +02:00
laerus
95ce8c52ee manipulate path directly in funcs that need it 2016-07-26 09:01:16 +02:00
laerus
2c2539ad4b typos/news entry 2016-07-26 09:01:16 +02:00
laerus
c6835d01bc set_path contextmanager, no amalg on develop 2016-07-26 09:01:16 +02:00
Anthony Scopatz
d6fe5ce87b enc news 2016-07-26 09:01:16 +02:00
Anthony Scopatz
84721c39d2 check encodings in xon.sh 2016-07-26 09:01:16 +02:00
Anthony Scopatz
6a8d4f4428 some minor updates 2016-07-26 09:01:16 +02:00
Anthony Scopatz
093cce731f minor doc fix 2016-07-26 09:01:16 +02:00
Leonardo Santagada
29be1fa147 reformat paragraph and remove trailing whitespace 2016-07-26 09:01:16 +02:00
Anthony Scopatz
a74f8cc371 amalgamate handles time machine 2016-07-26 09:01:16 +02:00
Justin Moen
72abe8e9d7 Improve first set of dev instructions 2016-07-26 09:01:16 +02:00
Anthony Scopatz
b499a5202f more intuitive blocking loop 2016-07-25 13:53:55 -04:00
Gil Forsyth
cb8ecdc440 hacky workaround for appveyor (for the moment) 2016-07-25 10:16:32 -04:00
laerus
0560d7674e Merge branch 'master' into hist_ref 2016-07-25 02:05:35 +03:00
Anthony Scopatz
2ae1c16358 Merge pull request #1475 from laerus/dev_amlg
no amalgmation on setup develop
2016-07-24 13:10:35 -07:00
Gil Forsyth
4cf610bd81 add psutil to install list
hoping that this will speed up the first OSX build since it seems to be
stalling because of this (briefly)
2016-07-24 15:34:45 -04:00
Anthony Scopatz
0f130b22d9 Merge pull request #1479 from xonsh/jupyter_completion
Jupyter completion
2016-07-24 12:32:09 -07:00
Gil Forsyth
5079e671dc flake8 fix - bad indentation 2016-07-24 14:52:10 -04:00
metamind
7e17a49622 typos 2016-07-24 17:26:43 +00:00
Anthony Scopatz
dc0c3c8290 blank line 2016-07-24 12:59:38 -04:00