Skip to content

Commit 9bab071

Browse files
committed
FIX: Simplify
1 parent 58dc371 commit 9bab071

3 files changed

Lines changed: 12 additions & 21 deletions

File tree

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
- uses: actions/setup-python@v6
123123
with:
124124
python-version: ${{ matrix.python }}
125-
if: startswith(matrix.kind, 'pip')
125+
if: startswith(matrix.kind, 'pip') || matrix.kind == 'minimal'
126126
id: setup-python
127127
# Workaround macOS path behavior with login shells (which puts system Python first)
128128
- run: echo "export PATH=\"$(dirname ${{ steps.setup-python.outputs.python-path }}):$PATH\"" | tee -a ~/.bash_profile # zizmor: ignore[template-injection]
@@ -136,7 +136,7 @@ jobs:
136136
create-args: >-
137137
python=${{ env.PYTHON_VERSION }}
138138
-v
139-
if: matrix.kind == 'conda' || matrix.kind == 'mamba' || matrix.kind == 'minimal'
139+
if: matrix.kind == 'conda' || matrix.kind == 'mamba'
140140
timeout-minutes: 20
141141
# Python (if old)
142142
- uses: astral-sh/setup-uv@v8.1.0

tools/environment_minimal.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

tools/github_actions_dependencies.sh

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,22 @@ INSTALL_ARGS="-e"
99
if [ ! -z "$CONDA_ENV" ]; then
1010
echo "Uninstalling MNE for CONDA_ENV=${CONDA_ENV}"
1111
echo "::group::Uninstalling MNE"
12-
conda remove -c conda-forge --force -yq mne-base
12+
conda remove -c conda-forge --force -y mne-base
1313
echo "::endgroup::"
1414
# If using bare environment.yml and not on windows, do a non-editable install
1515
if [[ "${RUNNER_OS}" != "Windows" ]] && [[ "${CONDA_ENV}" != "environment_"* ]]; then
1616
INSTALL_ARGS=""
1717
fi
1818
# If on minimal, just install testing deps
19-
if [[ "${MNE_CI_KIND}" == "minimal" ]]; then
20-
GROUP="test"
21-
EXTRAS=""
22-
STD_ARGS="--progress-bar off ${MNE_QT_BACKEND}"
23-
echo "::group::Upgrading pip installation"
24-
python -m pip install --upgrade pip # upgrade pip to support --group
25-
echo "::endgroup::"
26-
else
27-
GROUP="test_extra"
28-
EXTRAS="[hdf5]"
29-
fi
19+
GROUP="test_extra"
20+
EXTRAS="[hdf5]"
21+
elif [[ "${MNE_CI_KIND}" == "minimal" ]]; then
22+
GROUP="test"
23+
EXTRAS=""
24+
STD_ARGS="--progress-bar off ${MNE_QT_BACKEND}"
25+
echo "::group::Upgrading pip installation"
26+
python -m pip install --upgrade pip # upgrade pip to support --group
27+
echo "::endgroup::"
3028
elif [[ "${MNE_CI_KIND}" == "old" ]]; then
3129
GROUP="" # group "test" already included when pylock file generated
3230
EXTRAS=""

0 commit comments

Comments
 (0)