Revert "Remove hard coded mamba (mamba-org#3069)"

This reverts commit 212d1e9.
jchorl · Dec 26, 2023 · b5717e6 · b5717e6
1 parent 6bd785d
commit b5717e6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/.github/workflows/static_build.yml b/.github/workflows/static_build.yml
@@ -39,19 +39,14 @@ jobs:
           # Running a fork until we can merge the changes in micromamba-feedstock
           # https://github.com/conda-forge/micromamba-feedstock/pull/154
           repository: AntoinePrv/micromamba-feedstock
+          ref: tmp-mamba-ci
           path: micromamba-feedstock
+      - name: Clear micromamba-feedstock git directory
+        run: rm -rf "micromamba-feedstock/.git"
       - name: Checkout mamba branch
         uses: actions/checkout@v3
         with:
-          path: mamba
-      - name: Clear mamba git directory and link source
-        # `source` subfolder is the special location looked-up by our feedstock.
-        # Due to Docker, we can only put it as a subfolder of `micromamba-feedstock`,
-        run: |
-          rm -rf "mamba/.git"
-          mv mamba/ micromamba-feedstock/source
-          # Prevent irrelevant file permission error
-          git -C micromamba-feedstock/ config --local --add safe.directory '*'
+          path: micromamba-feedstock/source
       - uses: mamba-org/setup-micromamba@v1
         with:
           environment-name: mambabuild
@@ -82,8 +77,6 @@ jobs:
             apt-get install -y python3 docker.io
           run: |
             cd micromamba-feedstock/
-            # Prevent irrelevant file permission error
-            chown -R $(whoami) .
             # Special values for running the feedstock with a local source
             export FEEDSTOCK_ROOT="${PWD}"
             export CI="local"

diff --git a/Taskfile.dist.yml b/Taskfile.dist.yml
@@ -11,9 +11,6 @@ vars:
   CMAKE_PRESET: 'mamba-unix-shared-debug-dev'
   CACHE_DIR: '{{.BUILD_DIR}}/pkgs'
   DOCS_DIR: '{{.BUILD_DIR}}/docs'
-  MAMBA_NAME: 'mamba'  # Depend on preset...
-  TEST_MAMBA_EXE:
-    sh: 'realpath {{.CMAKE_BUILD_DIR}}/micromamba/{{.MAMBA_NAME}}'
   CPU_PERCENTAGE: 75
   CPU_TOTAL:
     sh: >-
@@ -150,9 +147,9 @@ tasks:
       An example run could look like:
 
           task micromamba -- create -n env -c conda-forge python=3.11
-    deps: [{task: '_build', vars: {target: '{{.MAMBA_NAME}}'}}]
+    deps: [{task: '_build', vars: {target: 'micromamba'}}]
     cmds:
-      - '"{{.TEST_MAMBA_EXE}}" {{.CLI_ARGS}}'
+      - '"{{.CMAKE_BUILD_DIR}}/micromamba/micromamba" {{.CLI_ARGS}}'
 
   _test-libmamba:
     internal: true
@@ -172,9 +169,10 @@ tasks:
 
   _test-micromamba:
     internal: true
-    deps: [{task: '_build', vars: {target: '{{.MAMBA_NAME}}'}}]
+    deps: [{task: '_build', vars: {target: 'micromamba'}}]
     env:
-      TEST_MAMBA_EXE: '{{.TEST_MAMBA_EXE}}'
+      TEST_MAMBA_EXE:
+        sh: 'realpath {{.CMAKE_BUILD_DIR}}/micromamba/micromamba'
     cmds:
       - >-
         {{.DEV_RUN}} python -m pytest micromamba/tests/
@@ -199,9 +197,10 @@ tasks:
 
   _test-reposerver:
     internal: true
-    deps: [{task: '_build', vars: {target: '{{.MAMBA_NAME'}}]
+    deps: [{task: '_build', vars: {target: 'micromamba'}}]
     env:
-      TEST_MAMBA_EXE: '{{.TEST_MAMBA_EXE}}'
+      TEST_MAMBA_EXE:
+        sh: 'realpath {{.CMAKE_BUILD_DIR}}/micromamba/micromamba'
     # Explicitly using this as var since env does not override shell environment
     vars:
       GNUPGHOME: '{{.BUILD_DIR}}/gnupg'

diff --git a/micromamba/tests/helpers.py b/micromamba/tests/helpers.py
@@ -71,7 +71,7 @@ def get_umamba(cwd=os.getcwd()):
             umamba_bin = "micromamba"
         umamba = os.path.join(cwd, "build", "micromamba", umamba_bin)
     if not Path(umamba).exists():
-        raise RuntimeError("Micromamba not found! Set TEST_MAMBA_EXE env variable")
+        print("MICROMAMBA NOT FOUND!")
     return umamba
 
 

diff --git a/micromamba/tests/test_shell.py b/micromamba/tests/test_shell.py
@@ -222,9 +222,8 @@ def test_init(tmp_home, tmp_root_prefix, shell_type, prefix_selector, multiple_t
 
 def test_dash(tmp_home, tmp_root_prefix):
     skip_if_shell_incompat("dash")
-    umamba = helpers.get_umamba()
-    subprocess.check_call(["dash", "-c", f"eval $({umamba} shell hook -s dash)"])
-    subprocess.check_call(["dash", "-c", f"eval $({umamba} shell hook -s posix)"])
+    subprocess.check_call(["dash", "-c", "eval $(micromamba shell hook -s dash)"])
+    subprocess.check_call(["dash", "-c", "eval $(micromamba shell hook -s posix)"])
 
 
 def test_implicitly_created_environment(tmp_home, tmp_root_prefix):