Skip to content

Commit

Permalink
setuptools<66; make flake8 and black play nicely
Browse files Browse the repository at this point in the history
  • Loading branch information
sappelhoff committed May 30, 2023
1 parent ac30123 commit 026cf7b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install wheel setuptools build
python -m pip uninstall setuptools --yes
python -m pip install "setuptools<66.0.0"
python -m pip install --upgrade wheel build
- uses: actions/checkout@v3
- name: Build sdist
Expand Down
2 changes: 1 addition & 1 deletion doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Required:
* ``mne`` (>=1.3)
* ``numpy`` (>=1.20.2)
* ``scipy`` (>=1.6.3)
* ``setuptools`` (>=46.4.0)
* ``setuptools`` (<66.0.0)

Optional:

Expand Down
2 changes: 1 addition & 1 deletion doc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ numpydoc
matplotlib
pillow
pandas
setuptools
setuptools<66.0.0
mne-nirs
seaborn
2 changes: 1 addition & 1 deletion mne_bids/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@
"for different age groups (4.5–18.5 y.o., 4.5–8.5 y.o., "
"7–11 y.o., 7.5–13.5 y.o., 10–14 y.o., 13–18.5 y.o. This "
"template also comes in either -symmetric or -asymmetric flavor.",
"oasis30antsoasisants": "See https://figshare.com/articles/ANTs_ANTsR_Brain_Templates/915436",
"oasis30antsoasisants": "See https://figshare.com/articles/ANTs_ANTsR_Brain_Templates/915436", # noqa: E501
"oasis30atropos": "See https://mindboggle.info/data.html",
"talairach": "Piecewise linear scaling of the brain is implemented as "
"described in TT88.",
Expand Down
6 changes: 4 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ install_requires =
mne >= 1.3
numpy >= 1.20.2
scipy >= 1.6.3
setuptools
setuptools <66.0.0
packages = find:
include_package_data = True

Expand All @@ -58,8 +58,10 @@ console_scripts =
universal = true

[flake8]
max-line-length = 88
exclude = __init__.py
ignore = W504,I101,I100,I201
ignore = I101,I100,I201
extend-ignore = W503,E203
per-file-ignores =
mne_bids/commands/tests/test_*.py:E402
mne_bids/tests/test_*.py:E402
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

from setuptools import setup

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

version = None
Expand Down

0 comments on commit 026cf7b

Please sign in to comment.