Skip to content

Commit 14938b9

Browse files
github-actions[bot]larsonerpre-commit-ci[bot]
authored
MAINT: Update code credit [circle deploy] (#13038)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Eric Larson <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 41dbdd5 commit 14938b9

File tree

11 files changed

+135
-10
lines changed

11 files changed

+135
-10
lines changed

‎azure-pipelines.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ stages:
171171
python -m pip install --progress-bar off --upgrade pip
172172
python -m pip install --progress-bar off --upgrade --pre --only-binary=\"numpy,scipy,matplotlib,vtk\" numpy scipy matplotlib vtk
173173
python -c "import vtk"
174-
# Bug on 2.5.13 https://github.com/openmeeg/openmeeg/issues/700
175-
python -m pip install --progress-bar off --upgrade -ve .[full,test_extra] "openmeeg==2.5.12"
174+
python -m pip install --progress-bar off --upgrade -ve .[full,test_extra]
176175
displayName: 'Install dependencies with pip'
177176
- bash: |
178177
set -e

‎doc/sphinxext/prs/13031.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"merge_commit_sha": "5b06ca4bb8f9138bf4af85ea3171d95df07462c5",
3+
"authors": [
4+
{
5+
"n": "github-actions[bot]",
6+
"e": "41898282+github-actions[bot]@users.noreply.github.com"
7+
},
8+
{
9+
"n": "Eric Larson",
10+
"e": "[email protected]"
11+
}
12+
],
13+
"changes": {
14+
".github/workflows/credit.yml": {
15+
"a": 2,
16+
"d": 2
17+
},
18+
"doc/documentation/cited.rst": {
19+
"a": 3,
20+
"d": 3
21+
},
22+
"doc/sphinxext/prs/13029.json": {
23+
"a": 91,
24+
"d": 0
25+
},
26+
"doc/sphinxext/prs/6915.json": {
27+
"a": 43,
28+
"d": 0
29+
},
30+
"tools/dev/update_credit_json.py": {
31+
"a": 3,
32+
"d": 1
33+
}
34+
}
35+
}

‎doc/sphinxext/prs/13032.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"merge_commit_sha": "b38385ef90d0fd8214d54b15c5fd91333c3bc032",
3+
"authors": [
4+
{
5+
"n": "pre-commit-ci[bot]",
6+
"e": "66853113+pre-commit-ci[bot]@users.noreply.github.com"
7+
}
8+
],
9+
"changes": {
10+
".pre-commit-config.yaml": {
11+
"a": 2,
12+
"d": 2
13+
}
14+
}
15+
}

‎doc/sphinxext/prs/13035.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"merge_commit_sha": "dcd26258c5fd83fd3974d73ba2b1e2773c33bc3d",
3+
"authors": [
4+
{
5+
"n": "Mathieu Scheltienne",
6+
"e": "[email protected]"
7+
},
8+
{
9+
"n": "Eric Larson",
10+
"e": "[email protected]"
11+
}
12+
],
13+
"changes": {
14+
"environment.yml": {
15+
"a": 1,
16+
"d": 1
17+
},
18+
"mne/io/ant/ant.py": {
19+
"a": 14,
20+
"d": 12
21+
},
22+
"mne/io/ant/tests/test_ant.py": {
23+
"a": 1,
24+
"d": 1
25+
},
26+
"mne/preprocessing/tests/test_fine_cal.py": {
27+
"a": 1,
28+
"d": 1
29+
},
30+
"mne/utils/check.py": {
31+
"a": 23,
32+
"d": 24
33+
},
34+
"mne/utils/tests/test_check.py": {
35+
"a": 7,
36+
"d": 0
37+
},
38+
"pyproject.toml": {
39+
"a": 1,
40+
"d": 1
41+
},
42+
"tools/circleci_dependencies.sh": {
43+
"a": 1,
44+
"d": 6
45+
},
46+
"tutorials/intro/70_report.py": {
47+
"a": 4,
48+
"d": 5
49+
}
50+
}
51+
}

‎doc/sphinxext/prs/13036.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"merge_commit_sha": "41dbdd55eaff77314440ebc8700e0e58b1183113",
3+
"authors": [
4+
{
5+
"n": "Daniel McCloy",
6+
"e": null
7+
},
8+
{
9+
"n": "autofix-ci[bot]",
10+
"e": "114827586+autofix-ci[bot]@users.noreply.github.com"
11+
}
12+
],
13+
"changes": {
14+
"doc/changes/devel/13036.bugfix.rst": {
15+
"a": 1,
16+
"d": 0
17+
},
18+
"mne/time_frequency/tests/test_spectrum.py": {
19+
"a": 26,
20+
"d": 0
21+
},
22+
"mne/viz/utils.py": {
23+
"a": 3,
24+
"d": 1
25+
}
26+
}
27+
}

‎environment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies:
3030
- nilearn
3131
- numba
3232
- numpy >=1.23,<3
33-
- openmeeg =2.5.12=*_1
33+
- openmeeg >=2.5.5
3434
- packaging
3535
- pandas
3636
- pillow

‎mne/conftest.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def pytest_configure(config):
119119
# we should remove them from here.
120120
# - This list should also be considered alongside reset_warnings in
121121
# doc/conf.py.
122-
if os.getenv("MNE_IGNORE_WARNINGS_IN_TESTS", "") != "true":
122+
if os.getenv("MNE_IGNORE_WARNINGS_IN_TESTS", "") not in ("true", "1"):
123123
first_kind = "error"
124124
else:
125125
first_kind = "always"
@@ -180,6 +180,8 @@ def pytest_configure(config):
180180
ignore:The 'copy' argument in Quantity is deprecated.*:
181181
# debugpy uses deprecated matplotlib API
182182
ignore:The (non_)?interactive_bk attribute was deprecated.*:
183+
# SWIG (via OpenMEEG)
184+
ignore:.*builtin type swigvarlink has no.*:DeprecationWarning
183185
""" # noqa: E501
184186
for warning_line in warning_lines.split("\n"):
185187
warning_line = warning_line.strip()

‎tools/azure_dependencies.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
55
STD_ARGS="--progress-bar off --upgrade"
66
python -m pip install $STD_ARGS pip setuptools wheel
77
if [ "${TEST_MODE}" == "pip" ]; then
8-
python -m pip install $STD_ARGS --only-binary="numba,llvmlite,numpy,scipy,vtk,dipy,openmeeg" -e .[test,full] "openmeeg==2.5.12"
8+
python -m pip install $STD_ARGS --only-binary="numba,llvmlite,numpy,scipy,vtk,dipy,openmeeg" -e .[test,full]
99
elif [ "${TEST_MODE}" == "pip-pre" ]; then
1010
${SCRIPT_DIR}/install_pre_requirements.sh
1111
python -m pip install $STD_ARGS --pre -e .[test_extra]

‎tools/circleci_dependencies.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ python -m pip install --upgrade --progress-bar off \
88
"git+https://github.com/sphinx-gallery/sphinx-gallery.git" \
99
"git+https://github.com/mne-tools/mne-bids.git" \
1010
\
11-
"openmeeg<2.5.13" \
1211
alphaCSC autoreject bycycle conpy emd fooof meggie \
1312
mne-ari mne-bids-pipeline mne-faster mne-features \
1413
mne-icalabel mne-lsl mne-microstates mne-nirs mne-rsa \

‎tools/hooks/update_environment_file.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ def split_dep(dep):
5656
# `environment.yaml` breaks the solver
5757
if package_name == "PySide6":
5858
version_spec = version_spec.replace("!=6.7.0,", "")
59-
# openmeeg 2.5.12=*_2 is broken, so pin to 2.5.12=*_1
60-
if package_name == "openmeeg":
61-
version_spec = "=2.5.12=*_1"
6259
# rstrip output line in case `version_spec` == ""
6360
line = f" - {package_name} {version_spec}".rstrip()
6461
# use pip for packages needing e.g. `platform_system` or `python_version` triaging

0 commit comments

Comments
 (0)