Commit graph

2622 commits

Author SHA1 Message Date
Anthony Scopatz
72ff4e4f29 fixed merge conflict 2016-05-08 17:41:16 -04:00
Gil Forsyth
f41c4d5e32 Merge pull request #789 from scopatz/andor-merge
Even more and/or
2016-05-08 15:37:07 -04:00
Anthony Scopatz
cb37421e66 fixed merge conflict with master 2016-05-08 15:10:42 -04:00
Anthony Scopatz
7cf0a0d8bc removed print 2016-05-08 14:41:04 -04:00
Anthony Scopatz
54f8c6905b many fixes 2016-05-08 14:38:46 -04:00
Anthony Scopatz
ef64a8001a resolved conflicts from master 2016-05-08 12:05:18 -04:00
Anthony Scopatz
bebe6c38f4 Merge pull request #822 from scopatz/ply
Bundle PLY with xonsh
2016-05-08 11:40:36 -04:00
Anthony Scopatz
c3ce38d02a updates for cmd.exe 2016-05-08 11:36:26 -04:00
Anthony Scopatz
08d8bcf149 prev/post for seterr 2016-05-07 17:13:18 -04:00
Anthony Scopatz
6c2940d8cf set error on exit for foriegn shelles 2016-05-07 16:29:48 -04:00
Morten Enemark Lund
f453f9b000 Merge pull request #823 from scopatz/translation
more docs
2016-05-07 21:59:07 +02:00
Morten Enemark Lund
1cc00938a1 Removed accidental indent 2016-05-07 21:55:05 +02:00
Morten Enemark Lund
8f3f62939c Added ply back as a dependency for tests and the conda recipe. 2016-05-07 21:50:59 +02:00
Morten Enemark Lund
6f79cde88d Added the ply dependency back into docs ( with a note that it is optional) 2016-05-07 21:50:17 +02:00
Morten Enemark Lund
e08f3dfacf Add try-except block to ply imports 2016-05-07 21:34:19 +02:00
Anthony Scopatz
33785dd9b0 Merge pull request #813 from lucasicf/issue_763
#763 fixed ';' input on tools.subproc_toks()
2016-05-07 14:05:44 -04:00
Anthony Scopatz
5f638b38c2 more docs 2016-05-07 13:40:55 -04:00
Anthony Scopatz
14da56a18b Merge pull request #818 from scopatz/add_rtn_code_to_source_commands
Add return code to source_foreign functions
2016-05-07 13:22:42 -04:00
Morten Enemark Lund
b0d6abe7e0 Update CHANGELOG.rst 2016-05-07 12:00:51 +02:00
Morten Enemark Lund
dcb10581ab Remove PLY from requirements and dependencies 2016-05-07 11:49:56 +02:00
Morten Enemark Lund
e901b483b0 Update imports to use internal PLY 2016-05-07 11:49:11 +02:00
Morten Enemark Lund
98ff8669ba Add ply LICENSE file 2016-05-07 11:33:35 +02:00
Morten Enemark Lund
169204d48f Add ply 3.8 source files 2016-05-07 11:32:59 +02:00
Anthony Scopatz
38545e0145 Merge pull request #820 from gforsyth/prompt_toolkit-1.0.0
add support for prompt_toolkit-1.0.0 and preserve support for previous versions
2016-05-06 21:55:15 -04:00
Gil Forsyth
6e2a9ed7f2 fix PEP8 and add changelog entry 2016-05-06 08:40:05 -04:00
Morten Enemark Lund
ef3546a077 Updated source-cmd to always if there is an error in the command 2016-05-06 10:10:27 +02:00
Gil Forsyth
9fd9377926 add support for prompt_toolkit-1.0.0
hat tip and congratulations to @jonathanslenders
2016-05-05 16:37:52 -04:00
Gil Forsyth
399bd947fa Merge pull request #821 from Carreau/ptk_1
support ptk_1.x
2016-05-05 16:36:27 -04:00
Matthias Bussonnier
14ba5de519 'support ptk_1.x' 2016-05-05 13:30:00 -07:00
Morten Enemark Lund
39eec8265e Also make xexec return a non-zero return var on failure 2016-05-05 14:14:44 +02:00
Morten Enemark Lund
d836be53da Add return code to source_foreign functions 2016-05-05 13:59:06 +02:00
Burak Yiğit Kaya
65cffc4e18 Merge pull request #798 from scopatz/fix_deadlock
Fix deadlock on windows
2016-05-05 00:45:28 +03:00
Morten Enemark Lund
942b395240 Merge pull request #812 from Siecje/hg_branch
Prevented hg branch call for default branch
2016-05-03 08:30:24 +02:00
Cody Scott
605dfb5563 Prevented hg branch call when .hg/branch file does not exist. It will be the 'default' branch 2016-05-02 21:31:54 -04:00
Morten Enemark Lund
474c6f5d59 Fix for deadlock on windows when running subprocs that generate enough data to fill the os pipe 2016-05-02 19:59:41 +02:00
Anthony Scopatz
f2fa550184 Merge pull request #734 from Carreau/glob
Improve double-star globing.
2016-05-02 10:58:17 -04:00
Anthony Scopatz
348a4edda3 Merge pull request #810 from gforsyth/alias_which
Alias for `which` to support alias lookups
2016-05-02 10:53:33 -04:00
Gil Forsyth
905d61cb3e remove which=where alias for windows users 2016-04-30 17:27:22 -04:00
Gil Forsyth
48b43ccb14 remove defunct failed workaround from argparse 2016-04-30 16:50:34 -04:00
Gil Forsyth
f0c752c341 use argparse instead of random set stuff 2016-04-30 16:46:39 -04:00
Matthias Bussonnier
a9423760ab 'docs' 2016-04-29 08:52:31 -07:00
Gil Forsyth
bc8373fcd5 update changelog 2016-04-29 11:49:43 -04:00
Gil Forsyth
d5bcc36b19 add which wrapper to support xonsh aliases
it's a bit clunky, but it supports most of the which command line flags
that make sense in xonsh.
2016-04-29 11:47:29 -04:00
Matthias Bussonnier
f21ece6984 Improve double-star globing.
Not as advance as using a package like glob2, but allow simple use of
double start to match recursively in subdirectory.

e.g:
    $ ls -1 **p.py
    docs/cmdhelp.py
    setup.py

Which match both in CWD and Subdirectory.

See #451,

Also consolidate `globpath` and `globpath` (see #733)
2016-04-29 08:35:22 -07:00
Anthony Scopatz
bec1bfa24c Merge pull request #808 from scopatz/conda_jupyter
Update jupyter install mechanism
2016-04-27 17:18:22 -04:00
Morten Enemark Lund
38505508be fix typo bug in setup.py 2016-04-27 21:29:12 +02:00
Morten Enemark Lund
621ac6a8ce Update recipe to match the one used on conda-forge 2016-04-27 21:28:37 +02:00
Morten Enemark Lund
16e14058a8 Update setup.py with too use default jupyter kernel install mechanism on conda 2016-04-25 11:59:48 +02:00
Lucas Inojosa
5aa97def72 #763 fixed ';' input on tools.subproc_toks() 2016-04-23 16:08:17 -03:00
Anthony Scopatz
6a61bfcc4f Merge pull request #805 from scopatz/activate_bugfix
quote arguments for cmd.exe
2016-04-22 15:02:45 -04:00