Commit graph

4308 commits

Author SHA1 Message Date
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
50e0b3df8b Merge pull request #1459 from xonsh/futamal
amalgamate handles time machine
2016-07-23 13:35:31 -04: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
Anthony Scopatz
505c6c5bb4 minor doc fix 2016-07-22 12:24:00 -04: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
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
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
Jamie Bliss
8c86ff1437 Improve help and handle the no-command case 2016-07-21 01:21:07 -04:00
Jamie Bliss
8f48d7e35b Added news item for the vox flags 2016-07-21 00:50:02 -04:00
Jamie Bliss
6bef10d019 I accidentally that sentence. 2016-07-21 00:47:29 -04:00
Jamie Bliss
19b483ded5 Some corrections to vox-related documentation 2016-07-21 00:44:10 -04:00
Jamie Bliss
ae0f745200 Fixed it all up, i think 2016-07-21 00:36:35 -04:00
Jamie Bliss
657d927aa7 First stab at argparse version. Doesn't actually work yet. 2016-07-21 00:26:13 -04:00
Anthony Scopatz
de432331c8 amalgamate handles time machine 2016-07-21 00:12:11 -04:00
Anthony Scopatz
aa8b7352fc version bump to 0.4.4 2016-07-20 21:42:28 -04:00
Anthony Scopatz
cd468a45ce 3 to 5 col 2016-07-20 21:41:29 -04:00
Anthony Scopatz
9b054c9ba2 docs fix 2016-07-20 21:39:00 -04:00
Anthony Scopatz
4766526616 Merge pull request #1458 from astronouth7303/vox_opts
Add options and methods to bring voxapi to feature parity with venv.
2016-07-20 20:32:50 -05:00
Jamie Bliss
fae7161041 Fix doc syntax 2016-07-20 21:31:10 -04:00
Anthony Scopatz
967424809b some minor doc fixes 2016-07-20 21:27:17 -04:00
Jamie Bliss
b6d1387916 Add options and methods to bring voxapi to feature parity with venv. 2016-07-20 21:23:35 -04:00
Anthony Scopatz
f7fd13ff12 Merge pull request #1455 from astronouth7303/patch-1
Publish avox
2016-07-20 18:21:38 -05:00
Anthony Scopatz
e655f4dd57 Merge pull request #1457 from astronouth7303/vox_api
Add sys import, and be more consistent about errors going to stderr.
2016-07-20 17:43:36 -05:00
Jamie Bliss
e2ac41d460 Add sys import, and be more consistent about errors going to stderr. 2016-07-20 18:32:44 -04:00
Leonardo Santagada
4c7ac84ab6 ignore vox.py undefined stuff 2016-07-21 00:16:03 +02:00
Leonardo Santagada
ec4c346b0b Merge branch 'master' into remove-flake8-exceptions 2016-07-21 00:05:17 +02:00
Anthony Scopatz
fc6ac3b87f Merge pull request #1456 from astronouth7303/vox_api
Vox API
2016-07-20 16:22:34 -05:00
Jamie Bliss
97c30dd19c Do more things globally.
I guess a little polution is ok.
2016-07-20 16:56:39 -04:00
Leonardo Santagada
ecf6beb735 fix new pep8 problems after merge 2016-07-20 22:28:27 +02:00
Jamie Bliss
50f34fa352 Refactor machinery into voxapi in order to minimize global namespace pollution. 2016-07-20 16:22:23 -04:00
Leonardo Santagada
51b3c98589 Merge remote-tracking branch 'upstream/master' into remove-flake8-exceptions 2016-07-20 22:15:56 +02:00
Leonardo Santagada
4337b1489b revert changes based on review 2016-07-20 22:07:45 +02:00