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

4434 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Gil Forsyth
1793527e70 use the right miniconda installer 2016-07-23 10:49:58 -04:00
Gil Forsyth
6888a21788 unstringify version numbers 2016-07-23 10:22:09 -04:00
laerus
7dde6a69b3 typos/news entry 2016-07-23 15:44:43 +03:00
laerus
fcbb911b9b set_path contextmanager, no amalg on develop 2016-07-23 15:33:41 +03:00
Gil Forsyth
32b9d9d027 Merge pull request #1472 from xonsh/enc 
Various Encoding Fixes
 2016-07-23 00:05:53 -04:00
Anthony Scopatz
5de9799b2c enc news 2016-07-22 20:58:04 -04:00
Anthony Scopatz
347517821c check encodings in xon.sh 2016-07-22 20:55:30 -04:00
Anthony Scopatz
591086c04b some minor updates 2016-07-22 20:37:10 -04:00
Gil Forsyth
343c774b96 remove install.sh 2016-07-22 16:42:21 -04:00
Gil Forsyth
f1ea7a08db don't use conda envs because vox will get angry 2016-07-22 16:40:40 -04:00
Gil Forsyth
4bea89c575 i may have innumeracy 2016-07-22 13:02:57 -04:00
Gil Forsyth
a9c998e8ed oh that's right, bash is terrible 2016-07-22 12:57:04 -04:00
Gil Forsyth
92359287c3 use miniconda for all travis except nightly 2016-07-22 12:44:51 -04:00
Anthony Scopatz
505c6c5bb4 minor doc fix 2016-07-22 12:24:00 -04:00
Leonardo Santagada
405b74915a pre install doesn't work 2016-07-22 15:50:55 +02:00
Leonardo Santagada
9b8a7d403e use proper bash variables 2016-07-22 15:48:28 +02:00
Gil Forsyth
0093640664 Merge pull request #1466 from santagada/contribute 
Improve first set of "Developer's Guide" instructions [updated]
 2016-07-22 09:43:56 -04:00
Leonardo Santagada
63baeb1818 use brew only for osx 2016-07-22 15:38:16 +02:00
Leonardo Santagada
f1a41f2b1c reformat paragraph and remove trailing whitespace 2016-07-22 11:47:36 +02:00
Leonardo Santagada
6454e4c3d6 Merge branch 'contribute' of github.com:stockninja/xonsh into contribute 2016-07-22 11:40:28 +02:00
Leonardo Santagada
0060265bfa on error exit 2016-07-22 11:28:49 +02:00
Leonardo Santagada
063f9dea88 Merge branch 'multi-os' of github.com:stockninja/xonsh into multi-os 2016-07-22 11:09:50 +02:00
Anthony Scopatz
84501037eb Merge pull request #1460 from astronouth7303/vox_opts 
Use real options for Vox
 2016-07-21 14:48:43 -05:00
Jamie Bliss
0cc7741d05 Fix up some missed refactorings. 
(I'm getting sloppy...)
 2016-07-21 15:26:37 -04:00
Jamie Bliss
9eadf2707f It would help if I did it properly. >.> 2016-07-21 15:18:44 -04:00
Jamie Bliss
5b2ac9ba27 Missed a thing. 2016-07-21 15:15:53 -04:00
Jamie Bliss
fa48f29f26 flake8 2016-07-21 14:36:46 -04:00
Jamie Bliss
9c0584b9b9 Some tweaking for the xonsh bdfl 2016-07-21 14:25:32 -04:00
Anthony Scopatz
3ffe99e428 Merge branch 'master' into futamal 2016-07-21 14:12:48 -04:00
Jamie Bliss
ed5c1c7cd5 Lazy load pretty much everything 2016-07-21 13:54:58 -04:00
Jamie Bliss
49ea0eee15 It's 'new', not 'create'. 
(I'm adding it as an alias because I've mis-typed it about 500 times now.)
 2016-07-21 11:03:15 -04:00
Jamie Bliss
8a89d5195e Merge remote-tracking branch 'upstream/master' into vox_opts 2016-07-21 10:54:14 -04:00
Anthony Scopatz
fbab91da77 Merge pull request #1446 from santagada/remove-flake8-exceptions 
Remove flake8 exceptions
 2016-07-21 05:25:04 -05:00
Leonardo Santagada
a33a71259e fix pep8 once more 2016-07-21 09:48:59 +02:00
Leonardo Santagada
3f955da3e4 Merge remote-tracking branch 'upstream/master' into remove-flake8-exceptions 2016-07-21 09:34:49 +02:00
Anthony Scopatz
7f1a8874a1 Merge pull request #1461 from astronouth7303/vox_docs 
Some corrections to vox-related documentation
 2016-07-21 01:14:58 -05:00