mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-05 17:00:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4531 commits 40 branches 136 tags 39 MiB
Commit graph

4531 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Anthony Scopatz
493b4e745d comment update 2016-07-24 12:44:28 -04:00
Gil Forsyth
30e6626927 add news entry 2016-07-24 11:03:58 -04:00
Gil Forsyth
2ab99759fd update completion logic in jupyter kernel 2016-07-24 11:02:07 -04:00
Gil Forsyth
1c11adbe5e add missing quote-mark and disable flake8 E128 2016-07-24 10:05:23 -04:00
Gil Forsyth
9ac3d29e7d add 'skip if on conda' fixture to vox tests 2016-07-23 17:27:27 -04:00
Anthony Scopatz
6275710494 style fixes 2016-07-23 14:18:22 -04:00
laerus
d51ab29207 pep8 unused import, ty 2016-07-23 21:10:03 +03:00
laerus
5c78793a33 pep8 the sequel 2016-07-23 21:08:51 +03:00
Anthony Scopatz
c45d37329f relimps 2016-07-23 13:53:49 -04:00
laerus
016c403676 Merge branch 'master' into dev_amlg 2016-07-23 20:50:57 +03:00
laerus
75e9f319c1 news rst fix 2016-07-23 20:50:14 +03:00
laerus
233dd23711 manipulate path directly in funcs that need it 2016-07-23 20:48:34 +03:00
Gil Forsyth
50e0b3df8b Merge pull request #1459 from xonsh/futamal 
amalgamate handles time machine
 2016-07-23 13:35:31 -04:00
Gil Forsyth
dece1e55e3 reenable conda env inside travis 2016-07-23 11:55:26 -04:00
Gil Forsyth
cb87a5c9dc reenable nightly 2016-07-23 11:32:40 -04:00
Gil Forsyth
10d06dc78b skip vox tests for the moment 2016-07-23 11:21:41 -04:00