Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Persistant shell manifests #1080

Merged
merged 11 commits into from
Apr 5, 2024
Merged

feat: Persistant shell manifests #1080

merged 11 commits into from
Apr 5, 2024

Commits on Mar 28, 2024

  1. feat: Persistant shell manifests 

    fixes: prefix-dev#1038

Using `Project::discover` to detect if Pixi's manifest path has been set by an environment variable in another `pixi shell` instance. `PIXI_IN_SHELL` is also set to be explicit that this should be an activated environment.

A warning is emitted before a command when the project is loaded if the discovered path is different from the one given by the environment variable, along with a warning after most commands in case their outputs are longer and scroll the initial warning off the terminal.

This is an alternate take on prefix-dev#1055
    @abkfenris
    abkfenris committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    186b9ee View commit details
    Browse the repository at this point in the history

  2. Lets Windows borrow the shell environment

    @abkfenris
    abkfenris committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    7ec06e9 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/main' into manifest-in-shell

    @abkfenris
    abkfenris committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    eac80f2 View commit details
    Browse the repository at this point in the history

  4. Move shell env var to activation

    @abkfenris
    abkfenris committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f32d67c View commit details
    Browse the repository at this point in the history

  5. Load environment from env vars when in shell 

    fixes: prefix-dev#893

Currently doesn't work for `pixi run <task>`.
    @abkfenris
    abkfenris committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    7e983fa View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Merge branch 'main' into manifest-in-shell

    @ruben-arts
    ruben-arts authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    2dbf2b8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into manifest-in-shell

    @abkfenris
    abkfenris authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    81e4b71 View commit details
    Browse the repository at this point in the history

  3. Update tree to use EnvironmentName::from_arg_or_env_var

    @abkfenris
    abkfenris committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3af938e View commit details
    Browse the repository at this point in the history

  4. Warn after tree as well

    @abkfenris
    abkfenris committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d12c7e8 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Merge remote-tracking branch 'upstream/main' into manifest-in-shell

    @abkfenris
    abkfenris committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    deb3c1f View commit details
    Browse the repository at this point in the history

  2. Make sure that discover can use a manifest from the shell when there … 

    …is no local manifest
    @abkfenris
    abkfenris committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    e692605 View commit details
    Browse the repository at this point in the history