Skip to content

Commit 3d4544e

Browse files
committed
FIX: Names
1 parent 13b6382 commit 3d4544e

2 files changed

Lines changed: 2 additions & 20 deletions

File tree

.github/workflows/tests.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -123,26 +123,6 @@ jobs:
123123
with:
124124
python-version: ${{ matrix.python }}
125125
if: startswith(matrix.kind, 'pip')
126-
# Python (if conda)
127-
- name: Fixes for conda
128-
run: |
129-
# For some reason on Linux we get crashes
130-
if [[ "$RUNNER_OS" == "Linux" ]]; then
131-
sed -i "/numba/d" environment.yml
132-
fi
133-
# And on Windows and macOS PySide6.9.0 segfaults
134-
if [[ "$RUNNER_OS" == "macOS" ]]; then
135-
sed -i "" "s/ - PySide6 .*/ - PySide6 =6.9.2/g" environment.yml
136-
sed -i "" "s/ - vtk .*/ - vtk =9.5.1/g" environment.yml
137-
138-
else
139-
sed -i "s/ - PySide6 .*/ - PySide6 =6.9.2/g" environment.yml
140-
sed -i "s/ - vtk .*/ - vtk =9.5.1/g" environment.yml
141-
if [[ "$RUNNER_OS" == "Windows" ]]; then
142-
echo "MNE_IS_OSMESA=true" | tee -a $GITHUB_ENV
143-
fi
144-
fi
145-
if: matrix.kind == 'conda' || matrix.kind == 'mamba'
146126
- uses: mamba-org/setup-micromamba@v3
147127
with:
148128
environment-file: ${{ env.CONDA_ENV }}

doc/sphinxext/credit_tools.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
"Hansuja ": "Hansuja Budhiraja", # 13765
8383
"jwelzel": "Julius Welzel", # 11118
8484
"Katia": "Katia Al-Amir", # 13225
85+
"Lifeng": "Lifeng Qiu Lin", # 13797
8586
"Martin": "Martin Billinger", # 8099, TODO: Check
8687
"Mats": "Mats van Es", # 11068
8788
"Michael": "Michael Krause", # 3304
@@ -281,6 +282,7 @@ def generate_credit_rst(app=None, *, verbose=False):
281282
and "dependabot[bot]" not in email
282283
and "github-actions[bot]" not in email
283284
and "50266005+mne-bot" not in email
285+
and "copilot@github.com" not in email
284286
)
285287
what = "Unknown emails, consider adding to .mailmap:\n"
286288
assert len(unknown_emails) == 0, what + "\n".join(sorted(unknown_emails))

0 commit comments

Comments
 (0)