From 9c00dd8c4d2bdf9650756ec0068a9bbfbd4c2b71 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Mon, 21 Oct 2024 12:34:58 -0700 Subject: [PATCH] Install Miniconda. Update hard-coded CI miniconda base location --- .github/workflows/test-mac.yml | 5 +++++ spyder/utils/tests/test_programs.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml index d7cdfc1e573..ef830498bcc 100644 --- a/.github/workflows/test-mac.yml +++ b/.github/workflows/test-mac.yml @@ -106,6 +106,11 @@ jobs: with: path: ~/Library/Caches/pip key: ${{ runner.os }}-cachepip-install${{ matrix.INSTALL_TYPE }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('setup.py') }} + - name: Install Miniconda + uses: conda-incubator/setup-miniconda@v3 + with: + auto-activate-base: false + python-version: ${{ matrix.PYTHON_VERSION }} - name: Create conda test environment uses: mamba-org/setup-micromamba@v1 with: diff --git a/spyder/utils/tests/test_programs.py b/spyder/utils/tests/test_programs.py index 439c77b940f..15b04f4b2ef 100644 --- a/spyder/utils/tests/test_programs.py +++ b/spyder/utils/tests/test_programs.py @@ -34,7 +34,7 @@ if sys.platform.startswith('linux'): home_dir = '/usr/share/miniconda/' else: - home_dir = '/usr/local/miniconda/' + home_dir = "/Users/runner/miniconda3" VALID_INTERPRETER = os.path.join(home_dir, 'bin', 'python') VALID_W_INTERPRETER = os.path.join(home_dir, 'bin', 'pythonw')