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

Allow micromamba provisioning in Linux too #2097

Merged
merged 5 commits into from
Oct 17, 2024
Merged

Allow micromamba provisioning in Linux too #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af40c25
add support for micromamba provisioning
jaimergp Oct 17, 2024
93b78a7
update docs
jaimergp Oct 17, 2024
e969052
install to /opt/conda, do not pin python
jaimergp Oct 17, 2024
cb2edb9
clean up
jaimergp Oct 17, 2024
952899e
amend news
jaimergp Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conda_smithy/data/conda-forge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1777,7 +1777,7 @@
}
],
"default": "micromamba",
"description": "Use this option to choose which tool is used to provision the tooling in your\nfeedstock. Defaults to micromamba.\n\nIf conda or mamba are chosen, the latest Miniforge will be used to\nprovision the base environment. If micromamba is chosen, Miniforge\nis not involved; the environment is created directly by micromamba.\n\nNote: micromamba is only used on macOS and Windows for now.\nOn Linux, mamba (as provided in the Docker images) will still be used\neven if micromamba is chosen.",
"description": "Use this option to choose which tool is used to provision the tooling in your\nfeedstock. Defaults to micromamba.\n\nIf conda or mamba are chosen, the latest Miniforge will be used to\nprovision the base environment. If micromamba is chosen, Miniforge\nis not involved; the environment is created directly by micromamba.",
"title": "Conda Install Tool"
},
"conda_forge_output_validation": {
Expand Down
4 changes: 0 additions & 4 deletions conda_smithy/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,6 @@ class ConfigModel(BaseModel):
If conda or mamba are chosen, the latest Miniforge will be used to
provision the base environment. If micromamba is chosen, Miniforge
is not involved; the environment is created directly by micromamba.

Note: micromamba is only used on macOS and Windows for now.
On Linux, mamba (as provided in the Docker images) will still be used
even if micromamba is chosen.
"""
),
)
Expand Down
15 changes: 11 additions & 4 deletions conda_smithy/templates/build_steps.sh.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ solver: {{ conda_solver }}
{%- endif %}

CONDARC

{%- if conda_install_tool == "micromamba" %}
mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S)
echo > /opt/conda/conda-meta/history
Comment on lines +38 to +39
Copy link
Member

Choose a reason for hiding this comment

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

Why is this needed?

micromamba install --root-prefix ~/.conda --prefix /opt/conda \
--yes --override-channels --channel conda-forge --strict-channel-priority \
pip {{ conda_install_tool_deps }} {{ conda_build_tool_deps }} {{ " ".join(remote_ci_setup) }}
{%- endif %}

{%- if conda_build_tool == "mambabuild" %}
{%- set BUILD_CMD="conda-mambabuild" %}
{%- elif conda_build_tool == "conda-build+conda-libmamba-solver" %}
Expand All @@ -47,12 +56,10 @@ CONDARC
{%- if conda_solver == "libmamba" %}
export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
{%- endif %}
{%- if conda_install_tool == "micromamba" %}
{%- set conda_install_tool = "mamba" %}
{%- endif %}

{%- if conda_install_tool in ("conda", "mamba") %}
{{ conda_install_tool }} install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
pip {{ conda_install_tool_deps }} {{ conda_build_tool_deps }} {{ " ".join(remote_ci_setup) }}
{%- endif %}
{%- if conda_install_tool == "mamba" and (conda_build_tool_deps != "" or conda_install_tool_deps != "") %}
{{ conda_install_tool }} update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
pip {{ conda_install_tool_deps }} {{ conda_build_tool_deps }} {{ " ".join(remote_ci_setup_update) }}
Expand Down
2 changes: 1 addition & 1 deletion news/gh2075-micromamba-install-tool.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
**Added:**

* Added ``micromamba`` as the default install tool on macOS and Windows. (#2075)
* Added ``micromamba`` as the default install tool on Linux, macOS and Windows. (#2075, #2097)

**Changed:**

Expand Down
Loading