From 22293c074400558a4d4fdd950a4dec1e2db80db1 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sun, 23 Feb 2025 12:58:40 +0100 Subject: [PATCH 1/3] docs: Mention add_pip_as_python_dependency in compatibility mode --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 010b2495..5f09c89b 100644 --- a/README.md +++ b/README.md @@ -181,3 +181,11 @@ conda env create -p ./env --file environment.yml > [!NOTE] > The `environment.yml` and `repodata.json` files are only for this use case, `pixi-pack unpack` does not use them. + +> [!NOTE] +> Both `conda` and `mamba` are always installing pip as a side effect when they install python, see [`conda`'s documentation](https://docs.conda.io/projects/conda/en/25.1.x/user-guide/configuration/settings.html#add-pip-as-python-dependency-add-pip-as-python-dependency). +> This is not different from how `pixi` works and can lead to solver errors when using `pixi-pack`'s compatibility mode since `pixi-pack` doesn't include `pip` by default. +> You can fix this issues in two ways: +> +> - Add `pip` to your `pixi.lock` file using `pixi add pip`. +> - Configuring `conda` (or `mamba`) to not install `pip` by default by running `conda config --set add_pip_as_python_dependency false` (or by adding `add_pip_as_python_dependency: False` to your `~/.condarc`) From 4409087b758dfdd710365fa0992d0ff7fb5a78a8 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sun, 23 Feb 2025 13:08:20 +0100 Subject: [PATCH 2/3] adjust pr template --- .github/PULL_REQUEST_TEMPLATE.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3fa37b7a..1a882bd4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,3 +5,9 @@ # Changes + +--- + +If updating documentation: + +- [ ] Updated documentation in https://github.com/prefix-dev/pixi/blob/main/docs/advanced/production_deployment.md as well From b25700022b9b38fcc7bbcc5937a2b758a371e50a Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sun, 23 Feb 2025 13:21:01 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Daniel Elsner --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f09c89b..60cf2c34 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ conda env create -p ./env --file environment.yml > [!NOTE] > Both `conda` and `mamba` are always installing pip as a side effect when they install python, see [`conda`'s documentation](https://docs.conda.io/projects/conda/en/25.1.x/user-guide/configuration/settings.html#add-pip-as-python-dependency-add-pip-as-python-dependency). > This is not different from how `pixi` works and can lead to solver errors when using `pixi-pack`'s compatibility mode since `pixi-pack` doesn't include `pip` by default. -> You can fix this issues in two ways: +> You can fix this issue in two ways: > > - Add `pip` to your `pixi.lock` file using `pixi add pip`. > - Configuring `conda` (or `mamba`) to not install `pip` by default by running `conda config --set add_pip_as_python_dependency false` (or by adding `add_pip_as_python_dependency: False` to your `~/.condarc`)