Skip to content

Commit a8fefdf

Browse files
committed
test
1 parent eda83d9 commit a8fefdf

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.github/scripts/install.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@ fi
1414
if [ "$USE_CONDA" = "true" ]; then
1515

1616
# Install Python and main dependencies
17-
mamba install python=$PYTHON_VERSION -q -y
18-
mamba env update --file requirements/main.yml
17+
#mamba install python=$PYTHON_VERSION -q -y
1918

2019
# Install dependencies per operating system
2120
if [ "$OS" = "win" ]; then
2221
mamba env update --file requirements/windows.yml
2322
elif [ "$OS" = "macos" ]; then
23+
mamba install python=$PYTHON_VERSION -q -y
24+
mamba env update --file requirements/main.yml
2425
mamba env update --file requirements/macos.yml
2526
else
27+
mamba install python=$PYTHON_VERSION -q -y
28+
mamba env update --file requirements/main.yml
2629
mamba env update --file requirements/linux.yml
2730
fi
2831

.github/workflows/test-win.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,12 @@ jobs:
9191
key: ${{ runner.os }}-cachepip-install${{ matrix.INSTALL_TYPE }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('setup.py') }}
9292
- name: Install Conda
9393
if: env.RUN_BUILD == 'true'
94-
uses: conda-incubator/setup-miniconda@v2
94+
uses: mamba-org/provision-with-micromamba@main
9595
with:
96-
activate-environment: test
97-
auto-update-conda: false
98-
auto-activate-base: false
99-
python-version: ${{ matrix.PYTHON_VERSION }}
100-
channels: conda-forge,defaults
101-
channel-priority: strict
102-
miniforge-variant: Mambaforge
96+
environment-file: requirements/main.yml
97+
environment-name: test
98+
extra-specs: |
99+
python=${{ matrix.PYTHON_VERSION }}
103100
- name: Create test environment
104101
if: env.RUN_BUILD == 'true'
105102
shell: bash -l {0}

spyder/plugins/maininterpreter/widgets/tests/test_status.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from spyder.plugins.maininterpreter.widgets.status import InterpreterStatus
2323

2424

25+
@pytest.mark.order(1)
2526
@pytest.mark.skipif(not is_anaconda(), reason="Requires conda to be installed")
2627
@pytest.mark.skipif(not running_in_ci(), reason="Only meant for CIs")
2728
def test_conda_interpreter_status(status_bar, qtbot):

0 commit comments

Comments
 (0)