Commit graph

7993 commits

Author SHA1 Message Date
Brian Skinn
85783ed2db Add news items for new prompt-controlling env vars 2019-01-31 00:26:38 -05:00
Brian Skinn
4b7944ceed Add documentation for env var effects on prompt
All are edits to tutorial.rst:

 - Expand ``{env_name}`` bullet
 - Add one paragraph each for $VIRTUAL_ENV_PROMPT and
   $VIRTUAL_ENV_DISABLE_PROMPT
2019-01-31 00:10:22 -05:00
Brian Skinn
192b31660a Add env.pop for CircleCI
Using conda on CircleCI, so need to also pop CONDA_DEFAULT_ENV
2019-01-30 22:56:25 -05:00
Brian Skinn
9bd4a78dca Add default value on env.pop attempt 2019-01-30 22:09:15 -05:00
Brian Skinn
02d46f7871 Add tests for prompt management of virtualenv name
Test that nothing shows when no env is active.

Test the new prefix/postfix composition (#2996).

Test whether `$VIRTUAL_ENV_DISABLE_PROMPT` *does* disable the prompt.

Test whether `$VIRTUAL_ENV_PROMPT` works to override the default
prompt composition.
2019-01-30 22:01:56 -05:00
Brian Skinn
13573079e8 Remove unused 'platform' import
Fixes linter error per discussion here:

https://github.com/xonsh/xonsh/pull/2998#issuecomment-458704041
2019-01-30 20:53:29 -05:00
Brian Skinn
9224a74bb7 Implement VIRTUAL_ENV_PROMPT and _DISABLE_PROMPT
Fully implements the suppression of virtualenv name display
when `$VIRTUAL_ENV_DISABLE_PROMPT` is defined and truthy.

Implements the xonsh-side "catch" of a custom prompt defined
via the `--prompt` argument to `virtualenv`. In order for this to
work, `activate.xsh` will need to be modified on the virtualenv
side to define `$VIRTUAL_ENV_PROMPT` during activate, if the
environment is created with `--prompt="foo"`.

Partially implements pypa/virtualenv#1299
2019-01-29 15:21:08 -05:00
Anthony Scopatz
b9594fa85d
Merge pull request #2969 from tamuhey/iss2698_wsl_pipe
Iss2698 wsl pipe
2019-01-29 13:52:09 -05:00
Gil Forsyth
e933bd3b8e
Merge pull request #2996 from xonsh/envprepost
env_prefix and env_postfix
2019-01-29 13:46:11 -05:00
Gil Forsyth
2e42a42f41
Merge pull request #2992 from xonsh/hsah
fixed eval aliases
2019-01-29 13:44:23 -05:00
Anthony Scopatz
bd3fd8cfc9 black 2019-01-29 13:39:38 -05:00
Anthony Scopatz
0ff0c39969 Merge branch 'iss2698_wsl_pipe' of https://github.com/tamuhey/xonsh into tamuhey-iss2698_wsl_pipe 2019-01-29 13:37:02 -05:00
Gil Forsyth
0590a6d011
Merge branch 'master' into hsah 2019-01-29 12:51:05 -05:00
Gil Forsyth
1154bca24f
Merge pull request #2993 from xonsh/broke-sym
Broken symlinks
2019-01-29 12:49:42 -05:00
Anthony Scopatz
9d086229ae some lookup fixes 2019-01-29 12:24:22 -05:00
Anthony Scopatz
1d3cadb532 let flake8 set the pyflakes version 2019-01-29 11:42:23 -05:00
Anthony Scopatz
a9babc7d6f env_prefix and env_postfix 2019-01-29 11:27:45 -05:00
Anthony Scopatz
fa302a75d5
Merge pull request #2994 from techtonik/patch-1
Document file extension and shebang
2019-01-29 07:39:47 -05:00
Anthony Scopatz
899f0be2cf
Merge pull request #2995 from techtonik/patch-2
https for github templates
2019-01-29 07:38:46 -05:00
anatoly techtonik
5d2ac95804
https for PR template 2019-01-29 13:48:07 +03:00
anatoly techtonik
4245356f9c
https 2019-01-29 13:46:48 +03:00
anatoly techtonik
b39922de35
Document file extensions and sheband
Fixes #2990
2019-01-29 13:44:49 +03:00
Anthony Scopatz
75dd8b652c
Merge pull request #2979 from 74th/feature/direnv
Adds xontrib which supports direnv to xontrib list
2019-01-28 22:30:22 -05:00
Anthony Scopatz
9bdae0c6d1 merge and fix conflict 2019-01-28 22:28:59 -05:00
Anthony Scopatz
57c8877bb3 turn off conda update 2019-01-28 22:19:51 -05:00
Anthony Scopatz
2ee9bf8ee7 Pin to conda=4.5.11 2019-01-28 22:15:17 -05:00
Anthony Scopatz
4adb4cda8d try updating conda 2019-01-28 22:06:27 -05:00
Anthony Scopatz
47117a12f1 try updating conda 2019-01-28 22:05:04 -05:00
Anthony Scopatz
e6ead988b6 added display names to azure 2019-01-28 21:54:54 -05:00
Anthony Scopatz
1102e1b8de fix broken symlink issue on windows 2019-01-28 18:07:55 -05:00
Anthony Scopatz
10f67def3c more CI test fixes 2019-01-28 18:04:15 -05:00
Anthony Scopatz
b38b433583 change req order for pip 2019-01-28 18:03:59 -05:00
Anthony Scopatz
59ce28710d more CI test fixes 2019-01-28 17:50:59 -05:00
Anthony Scopatz
e79df59103 change req order for pip 2019-01-28 17:27:56 -05:00
Anthony Scopatz
b359604c67 black 2019-01-28 17:20:04 -05:00
Anthony Scopatz
51f5002506 fixed eval aliases 2019-01-28 17:17:55 -05:00
Atsushi Morimoto
0fb5a8068d Merge remote-tracking branch 'origin/master' into feature/direnv 2019-01-24 10:01:34 +09:00
Gil Forsyth
d6d7fbee98
Merge pull request #2988 from techtonik/patch-1
https
2019-01-22 22:45:45 -05:00
anatoly techtonik
39620b8fbe
https 2019-01-22 22:02:27 +03:00
Chad Kennedy
1783f23631
Fix for #2982 2019-01-14 13:41:48 -06:00
74th
8eb26b50ab fix https://circleci.com/gh/xonsh/xonsh/4869 2019-01-07 23:20:22 +09:00
74th
bd6bdfe344 fix https://circleci.com/gh/xonsh/xonsh/4864 2019-01-07 21:25:55 +09:00
74th
ac38dd3fec Add xontrib direnv news 2019-01-05 18:20:19 +09:00
74th
766e8761b8 add xonsh-direnv 2019-01-05 17:58:32 +09:00
Anthony Scopatz
74ff3bdd8a Updated CHANGELOG for 0.8.8 2019-01-04 12:22:34 -05:00
Anthony Scopatz
3ac05c4299 bumped version to 0.8.8 2019-01-04 12:22:34 -05:00
Anthony Scopatz
b64a2126d3
Merge pull request #2968 from knowsuchagency/vox-virtualenvs
allow user to invoke specific interpreter for vox virtualenv creation
2019-01-02 19:02:13 -05:00
Anthony Scopatz
e4c6a2fd2c
remove empty args 2019-01-02 18:45:47 -05:00
Stephan Fitzpatrick
38da59fcc9 use list as opposed to shlex for command parsing 2018-12-30 03:15:39 -08:00
Anthony Scopatz
91438e56b0
Merge pull request #2973 from CJ-Wright/chain_db_type
Resolve types in ChainDB to input types if possible
2018-12-28 16:03:16 -05:00