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

1.x -- Use __conda_activate reactivate #277

Closed
wants to merge 2 commits into from
Closed

1.x -- Use __conda_activate reactivate #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67ffb0c
Use __conda_activate reactivate
hmaarrfk Dec 29, 2024
c0a6b01
MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and c…
Dec 29, 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
6 changes: 3 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
fmt:
- '11'
libarchive:
Expand Down
6 changes: 1 addition & 5 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- conda
channel_sources:
Expand All @@ -17,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
fmt:
- '11'
libarchive:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
fmt:
- '11'
libarchive:
Expand Down
5 changes: 3 additions & 2 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions recipe/3702_use_conda_activate_reactivate.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 7019dcb30bfdf9929332e73a928aee2b854348ba Mon Sep 17 00:00:00 2001
From: Mark Harfouche <[email protected]>
Date: Thu, 19 Dec 2024 09:28:00 -0500
Subject: [PATCH] use __conda_activate reactivate instead of __conda_reactivate

The work in https://github.com/mamba-org/mamba/pull/3643 was deleted

this is really hurting users at conda-forge (myself included)
https://github.com/conda-forge/miniforge/issues/700#issuecomment-2554272743
---
mamba/mamba/shell_templates/mamba.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mamba/mamba/shell_templates/mamba.sh b/mamba/mamba/shell_templates/mamba.sh
index 6b1c1640a7..a3659358d5 100644
--- a/mamba/mamba/shell_templates/mamba.sh
+++ b/mamba/mamba/shell_templates/mamba.sh
@@ -17,7 +17,7 @@ mamba() {
;;
install|update|upgrade|remove|uninstall)
__mamba_exe "$@" || \return
- __conda_reactivate
+ __conda_activate reactivate
;;
*)
__mamba_exe "$@"
4 changes: 3 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ package:
source:
url: https://github.com/mamba-org/mamba/archive/refs/tags/{{ release }}.tar.gz
sha256: 0791f5eac09611983bdd7c63dbfa046f7fb464525fa6c7967c40805093199d91
patches:
- 3702_use_conda_activate_reactivate.patch

build:
number: 0
number: 1

outputs:
- name: libmamba
Expand Down