Skip to content

Commit 6a4c01b

Browse files
committed
setuptools<66; make flake8 and black play nicely
1 parent ac30123 commit 6a4c01b

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

.github/workflows/unit_tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ jobs:
6565
- name: Install dependencies
6666
run: |
6767
python -m pip install --upgrade pip
68-
python -m pip install wheel setuptools build
68+
python -m pip uninstall setuptools
69+
python -m pip install "setuptools<66.0.0"
70+
python -m pip install --upgrade wheel build
6971
7072
- uses: actions/checkout@v3
7173
- name: Build sdist

doc/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Required:
1515
* ``mne`` (>=1.3)
1616
* ``numpy`` (>=1.20.2)
1717
* ``scipy`` (>=1.6.3)
18-
* ``setuptools`` (>=46.4.0)
18+
* ``setuptools`` (<66.0.0)
1919

2020
Optional:
2121

doc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ numpydoc
77
matplotlib
88
pillow
99
pandas
10-
setuptools
10+
setuptools<66.0.0
1111
mne-nirs
1212
seaborn

mne_bids/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@
435435
"for different age groups (4.5–18.5 y.o., 4.5–8.5 y.o., "
436436
"7–11 y.o., 7.5–13.5 y.o., 10–14 y.o., 13–18.5 y.o. This "
437437
"template also comes in either -symmetric or -asymmetric flavor.",
438-
"oasis30antsoasisants": "See https://figshare.com/articles/ANTs_ANTsR_Brain_Templates/915436",
438+
"oasis30antsoasisants": "See https://figshare.com/articles/ANTs_ANTsR_Brain_Templates/915436", # noqa: E501
439439
"oasis30atropos": "See https://mindboggle.info/data.html",
440440
"talairach": "Piecewise linear scaling of the brain is implemented as "
441441
"described in TT88.",

setup.cfg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ install_requires =
3737
mne >= 1.3
3838
numpy >= 1.20.2
3939
scipy >= 1.6.3
40-
setuptools
40+
setuptools <66.0.0
4141
packages = find:
4242
include_package_data = True
4343

@@ -58,8 +58,10 @@ console_scripts =
5858
universal = true
5959

6060
[flake8]
61+
max-line-length = 88
6162
exclude = __init__.py
62-
ignore = W504,I101,I100,I201
63+
ignore = I101,I100,I201
64+
extend-ignore = W503,E203
6365
per-file-ignores =
6466
mne_bids/commands/tests/test_*.py:E402
6567
mne_bids/tests/test_*.py:E402

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
from setuptools import setup
66

7-
# Give setuptools a hint to complain if it's too old a version
8-
SETUP_REQUIRES = ["setuptools >= 46.4.0"]
9-
# This enables setuptools to install wheel on-the-fly
7+
SETUP_REQUIRES = ["setuptools <= 66.0.0"]
108
SETUP_REQUIRES += ["wheel"] if "bdist_wheel" in sys.argv else []
119

1210
version = None

0 commit comments

Comments
 (0)