Avoid use of mambaforge in response to deprecation warning

lanl · Sep 5, 2024 · b923298 · b923298
1 parent 4a06cca
commit b923298
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml
@@ -27,14 +27,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      # Set up conda/mamba environment
-      - name: Set up mambaforge
+      # Set up conda environment
+      - name: Set up miniconda
         uses: conda-incubator/setup-miniconda@v3
         with:
-            miniforge-variant: Mambaforge
             miniforge-version: latest
             activate-environment: test-env
-            use-mamba: true
             python-version: "3.12"
       # Configure conda environment cache
       - name: Set up conda environment cache
@@ -54,15 +52,15 @@ jobs:
       - name: Install dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          mamba install -c conda-forge pytest pytest-cov
+          conda install -c conda-forge pytest pytest-cov
           python -m pip install --upgrade pip
           pip install pytest-split
           pip install -r requirements.txt
           pip install -r dev_requirements.txt
           # Temporarily disabled due to svmbir failure with numpy 2.x under Python 3.12
-          # mamba install -c conda-forge svmbir>=0.3.3
-          mamba install -c astra-toolbox astra-toolbox
-          mamba install -c conda-forge pyyaml
+          # conda install -c conda-forge svmbir>=0.3.3
+          conda install -c astra-toolbox astra-toolbox
+          conda install -c conda-forge pyyaml
           pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version
           pip install bm3d>=4.0.0
           pip install bm4d>=4.0.0

diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml
@@ -27,14 +27,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      # Set up conda/mamba environment
-      - name: Set up mambaforge
+      # Set up conda environment
+      - name: Set up miniconda
         uses: conda-incubator/setup-miniconda@v3
         with:
-            miniforge-variant: Mambaforge
             miniforge-version: latest
             activate-environment: test-env
-            use-mamba: true
             python-version: "3.12"
       # Configure conda environment cache
       - name: Set up conda environment cache
@@ -57,14 +55,14 @@ jobs:
       - name: Install dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          mamba install -c conda-forge pytest pytest-cov
+          conda install -c conda-forge pytest pytest-cov
           python -m pip install --upgrade pip
           pip install pytest-split
           pip install -r requirements.txt
           pip install -r dev_requirements.txt
-          mamba install -c conda-forge svmbir>=0.3.3
-          mamba install -c conda-forge astra-toolbox
-          mamba install -c conda-forge pyyaml
+          conda install -c conda-forge svmbir>=0.3.3
+          conda install -c conda-forge astra-toolbox
+          conda install -c conda-forge pyyaml
           pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version
           pip install bm3d>=4.0.0
           pip install bm4d>=4.2.2

diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml
@@ -25,14 +25,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      # Set up conda/mamba environment
-      - name: Set up mambaforge
+      # Set up conda environment
+      - name: Set up miniconda
         uses: conda-incubator/setup-miniconda@v3
         with:
-            miniforge-variant: Mambaforge
             miniforge-version: latest
             activate-environment: test-env
-            use-mamba: true
             python-version: "3.12"
       # Configure conda environment cache
       - name: Set up conda environment cache
@@ -55,12 +53,12 @@ jobs:
       - name: Install dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          mamba install -c conda-forge pytest pytest-cov
+          conda install -c conda-forge pytest pytest-cov
           python -m pip install --upgrade pip
           pip install -r requirements.txt
           pip install -r dev_requirements.txt
-          mamba install -c conda-forge astra-toolbox
-          mamba install -c conda-forge pyyaml
+          conda install -c conda-forge astra-toolbox
+          conda install -c conda-forge pyyaml
           pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version
           pip install -r examples/examples_requirements.txt
       # Install package to be tested