Commit graph

2699 commits

Author SHA1 Message Date
Morten Enemark Lund
8f2c700bf5 Merge pull request #881 from moigagoo/master
Docs: Python Virtual Environments Guide Added.
2016-05-13 15:06:19 +02:00
Morten Enemark Lund
7675468c47 Merge pull request #877 from scopatz/keptk
fix for key error when completing __xonsh_shell__.shell.<TAB>
2016-05-13 13:52:09 +02:00
Morten Enemark Lund
281b29f8d7 Merge pull request #859 from Will-W/master
Fix overriding of user environment with windows fixes
2016-05-13 13:48:57 +02:00
Konstantin Molchanov
b8dd7b08ab Docs: Python Virtual Environments Guide Added. 2016-05-13 14:19:43 +04:00
Will Wykeham
82657ad120 Handle PROMPT not present under Windows
This doesn't happen normally, but can depending how the prompt is launched
2016-05-13 10:40:43 +01:00
Will Wykeham
3faea65153 Update CHANGLOG for Windows env fixups 2016-05-13 09:40:52 +01:00
Will Wykeham
9a5b828f86 Delete PROMPT var rather than override it, on Windows 2016-05-13 09:40:09 +01:00
Anthony Scopatz
2121210d26 fix for key error when completing __xonsh_shell__.shell.<TAB> 2016-05-13 02:05:06 -04:00
Anthony Scopatz
f8aff83f4d Merge pull request #874 from adqm/errors
Add different error message for PermissionError on redirect
2016-05-12 23:46:48 -04:00
Gil Forsyth
520140f2e3 Merge pull request #873 from scopatz/cachever
cache which_version() to prevent excessive subproc calls
2016-05-12 21:16:13 -04:00
adam j hartz
4ccc5646aa better error reporting on redirect 2016-05-12 20:55:56 -04:00
adam j hartz
88d4852bf5 add different error message for PermissionError on redirect 2016-05-12 20:50:57 -04:00
Anthony Scopatz
dd3613f44c cache which_version() to prevent excessive subproc calls 2016-05-12 20:38:16 -04:00
Anthony Scopatz
c0931fe5fd Merge branch 'gforsyth-fixwhich' 2016-05-12 20:31:25 -04:00
Anthony Scopatz
0801fd0453 Merge branch 'fixwhich' of https://github.com/gforsyth/xonsh into gforsyth-fixwhich 2016-05-12 20:29:38 -04:00
Gil Forsyth
8dc7e7bbb6 add potential fix for which ails 2016-05-12 19:36:57 -04:00
Anthony Scopatz
520fb2dcab Merge branch 'adqm-cache' 2016-05-12 19:18:43 -04:00
Anthony Scopatz
7ab23504bd Merge branch 'cache' of https://github.com/adqm/xonsh into adqm-cache 2016-05-12 18:58:52 -04:00
adam j hartz
402a8f3f8c re-introduce, refactor xontribs logic 2016-05-12 18:25:00 -04:00
Anthony Scopatz
ae6bd3344a Merge pull request #869 from gforsyth/fixwhich
update which to be compatible with python3.4
2016-05-12 18:08:31 -04:00
Gil Forsyth
68bb911864 remove redundant subprocess calls 2016-05-12 17:58:50 -04:00
Gil Forsyth
601c641bdf update which to be compatible with python3.4
and one other, small change
2016-05-12 17:48:27 -04:00
Anthony Scopatz
83bf607862 Merge pull request #861 from GuillaumeLeclerc/fix-846
fix #846 (compatibility with ptk 1.0)
2016-05-12 15:33:46 -04:00
Guillaume Leclerc
f0bb43f656 finer grain import 2016-05-12 21:25:14 +02:00
Anthony Scopatz
f1e03be011 Merge pull request #863 from Carreau/a-which
SCOPATZ: What makes you think it is a which?
GFORSYTH: Oh, it turned me into a GNUwt!
SCOPATZ: A GNUwt?
[Silence]
GFORSYTH: Well, I got better.
CROWD: Burn it anyway!
2016-05-12 13:53:43 -04:00
Matthias Bussonnier
f49b40042f An commit which fixes #833
CROWD:  A `which`!  A `which`!  A `which`!  We've got a `which`!  A `which`!
GFORSYTH:  We have found a `which`, might we burn it?
CROWD:  Burn it!  Burn!
SCOPATZ:  How do you know it is a `which`?
CARREAU:  It looks like one.
SCOPATZ:  Bring it forward.
WITCH:  I'm not a `gnu-which`.  I'm not a `gnu-which`.
SCOPATZ:  But you have a `-v` flag.
WITCH:  They monkey patched me.
CROWD:  No, we didn't... no.
WITCH:  And this isn't my source code, it's a false one.
SCOPATZ:  Well?
GFORSYTH:  Well, we did do the `-v` flag.
SCOPATZ:  The source code?
GFORSYTH:  And the function signature -- but it is a `which`!
CROWD:  Burn it!  `which`!  `which`!  Burn it!
SCOPATZ:  Did you dress it up like this?
CROWD:  No, no... no ... yes.  Yes, yes, a bit, a bit.
2016-05-12 10:34:21 -07:00
Guillaume Leclerc
e0866df6bb cleaner if and avoid exception 2016-05-12 19:12:05 +02:00
Guillaume Leclerc
89bb5c4e39 use if instead of exception 2016-05-12 18:47:59 +02:00
Anthony Scopatz
6395a783a0 Merge pull request #860 from ngoldbaum/history-parsing
lower-case xonsh history string specs before parsing
2016-05-12 12:40:16 -04:00
Guillaume Leclerc
d0ed660640 fix #846 (compatibility with ptk 1.0) 2016-05-12 18:16:15 +02:00
Nathan Goldbaum
d756fa686b lower-case xonsh history string specs before parsing 2016-05-12 11:14:54 -05:00
adam j hartz
933d2e09e9 rebase mistakes 2016-05-12 12:00:16 -04:00
Will Wykeham
1c7c1ca96f Fix overriding of user environment with windows fixes
Fixes #857
2016-05-12 16:57:54 +01:00
adam j hartz
78d923ec74 add arg undoers 2016-05-12 11:53:15 -04:00
adam j hartz
821fcf452b different code cache filenames 2016-05-12 11:53:15 -04:00
adam j hartz
a2285fd916 documentation 2016-05-12 11:53:15 -04:00
adam j hartz
8eb3d92f60 update base shell actually to do something when caching everything 2016-05-12 11:51:45 -04:00
adam j hartz
f246466547 update environ and main to use new code cache location 2016-05-12 11:50:57 -04:00
adam j hartz
143e1ceafc move code caching to new module 2016-05-12 11:49:40 -04:00
adam j hartz
456cfb92d4 fix for test case 2016-05-12 11:49:40 -04:00
adam j hartz
3a3d4026d1 use the cache everywhere 2016-05-12 11:49:40 -04:00
Gil Forsyth
fc056034c9 Merge pull request #845 from scopatz/fix_anaconda
Fix Anaconda check.
2016-05-12 11:49:26 -04:00
Gil Forsyth
e4465aed6c Merge pull request #856 from scopatz/rpart
rsplit to rpartition
2016-05-12 11:48:19 -04:00
adam j hartz
c765122499 move script caching code to xonsh/tools.py 2016-05-12 11:47:27 -04:00
Anthony Scopatz
5ea311cfaa rsplit to rpartition 2016-05-12 10:58:30 -04:00
Morten Enemark Lund
bb6f21ff8b Fix Anaconda check. It also seemed python from the anaconda distribution does not always write 'Anaconda' as part of the sys.version string.
Also the check has been moved to xonsh.tools as ON_ANACONDA
2016-05-12 10:19:58 +02:00
Morten Enemark Lund
4ebeac7d6f Merge pull request #842 from scopatz/pyeval
Fix for balancing parens in subproc wrapping.
2016-05-12 08:09:13 +02:00
Anthony Scopatz
08c5b8f43d more tests 2016-05-11 23:41:14 -04:00
Anthony Scopatz
fbb2adccb4 start of wrapping 2016-05-11 23:24:58 -04:00
Gil Forsyth
17916b884a Merge pull request #841 from scopatz/permission_error
Handle PermissionError thrown by yield_executables* functions
2016-05-11 19:46:59 -04:00