这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@kalefranz
Copy link
Contributor

@kalefranz kalefranz commented Apr 20, 2018

resolve #7194

also contains: fix #7126 export CONDA_EXE #7206

This PR changes activate to the behavior advocated for by @mingwandroid and others. Namely, if a conda environment is currently active, a subsequent conda activate will replace on PATH the old environment for the new one. The PR also adds a --stack flag to conda activate that supports the previous behavior.

To be clear, part of this PR is also removing the max_shlvl configuration parameter. It's no longer needed. It was originally introduced to keep users from unwittingly stacking many levels of environments beyond two. Now, with the --stack flag, stacking becomes very intentional. For users who have custom-configured max_shlvl in a .condarc, conda will now just ignore the configuration.

Signed-off-by: Kale Franz <kfranz@continuum.io>
@kalefranz kalefranz requested a review from a team as a code owner April 20, 2018 22:55
@kalefranz kalefranz added the ¡breaking! used to indicate that the code change will likely require a minor or major version bump label Apr 20, 2018
@kalefranz kalefranz added this to the 4.6.0 milestone Apr 20, 2018
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
@mingwandroid
Copy link
Contributor

Looks good apart from an issue with the old script when attempting to follow CONTRIBUTING.md and upgrading from the Miniconda installed via ./dev/start.sh:

. /Users/rdonnelly/conda/conda/devenv/bin/activate
'activate', 'deactivate', 'hook', or 'reactivate' command must be given

conda activate worked here instead but until we get the next Miniconda and Anaconda installers released we probably need the old stuff to work?

Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
…onda search'

Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>

win py2 init

Signed-off-by: Kale Franz <kfranz@continuum.io>

SAVEPOINT

try this

Signed-off-by: Kale Franz <kfranz@continuum.io>

basic errors

Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>

attempted fix for replace_prefix_in_path

Signed-off-by: Kale Franz <kfranz@continuum.io>
Signed-off-by: Kale Franz <kfranz@continuum.io>
Copy link
Contributor

@mingwandroid mingwandroid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks @kalefranz

Copy link
Contributor

@mingwandroid mingwandroid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Github needs to detect 'LGTM' and set Approve automatically!

@kalefranz kalefranz merged commit bdce603 into conda:master Apr 26, 2018
@kalefranz kalefranz deleted the max-shlvl-0 branch April 26, 2018 14:12
@kalefranz kalefranz changed the title resolve #7194 change default value of max_shlvl to 0 resolve #7194 add '--stack' flag to 'conda activate'; remove max_shlvl config Apr 26, 2018
@github-actions
Copy link

github-actions bot commented Sep 3, 2021

Hi there, thank you for your contribution to Conda!

This pull request has been automatically locked since it has not had recent activity after it was closed.

Please open a new issue or pull request if needed.

@github-actions github-actions bot added the locked [bot] locked due to inactivity label Sep 3, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

¡breaking! used to indicate that the code change will likely require a minor or major version bump locked [bot] locked due to inactivity

Projects

None yet

2 participants