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

Add mamba and conda-libmamba-solver to Miniforge (Mambaforge is now identical) #277

Merged
merged 7 commits into from
Aug 20, 2023
Merged

Add mamba and conda-libmamba-solver to Miniforge (Mambaforge is now identical) #277

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d32a293
update to 4.12.0 and add conda-libmamba-solver
isuruf Mar 21, 2022
87e9c1f
git:// -> https://
isuruf Mar 21, 2022
22862f1
Merge branch 'main' of github.com:conda-forge/miniforge into 4.12.0
jaimergp Aug 10, 2023
9fb930f
require constructor 3.4.5
jaimergp Aug 10, 2023
14c209e
upgrade cls
jaimergp Aug 10, 2023
efce991
use cls 23.3.0
jaimergp Aug 10, 2023
adb2cad
Always check for boa compatibility
hmaarrfk Aug 20, 2023
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
4 changes: 3 additions & 1 deletion Miniforge3/construct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = os.environ.get("MINIFORGE_VERSION", "4.10.1-0") %}
{% set version = os.environ.get("MINIFORGE_VERSION", "4.12.0-0") %}
{% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}

name: {{ name }}
Expand Down Expand Up @@ -28,6 +28,8 @@ specs:

{% if name.startswith("Mambaforge") %}
- mamba 0.22.1
{% else %}
- conda-libmamba-solver 22.3.0
Copy link
Member

Choose a reason for hiding this comment

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

This will pull libmambapy plus its deps so I wonder if just the presence of mamba as a command is enough to justify the existence of Mambaforge. Like, if we merge, Miniforge and Mambaforge are almost the same. IIRC, Mambaforge was provided separately because it shipped more deps.

{% endif %}
- conda {{ version.split("-")[0] }}

Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fi
if [[ "${TARGET_PLATFORM}" == win-* ]]; then
conda install -y "nsis=3.01" -c conda-forge --override-channels
fi
pip install git+git://github.com/chrisburr/constructor@64ebd6d34f0f18684c76c0bebcfab41c38d55083#egg=constructor --force --no-deps
Copy link
Contributor

Choose a reason for hiding this comment

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

This is probably why the last tag was failing.

Copy link
Member

Choose a reason for hiding this comment

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

If we merge conda-forge/constructor-feedstock#61 we don't need this pip install override, right?

pip install git+https://github.com/conda/constructor@3.3.1#egg=constructor --force --no-deps
Copy link
Member

Choose a reason for hiding this comment

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

conda-forge/constructor-feedstock#61 was merged, so we can remove this in a couple hours.

Suggested change
pip install git+https://github.com/conda/[email protected]#egg=constructor --force --no-deps

conda list

echo "***** Make temp directory *****"
Expand Down