Skip to content

Commit 22869f4

Browse files
authored
Merge pull request #73 from templateflow/fix/setuptools-version
MAINT: Pin ``setuptools >=45``, new dependency as of ``setuptools_scm>=6.0.1``
2 parents 137218d + c31af64 commit 22869f4

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
pip install -U pip
4747
pip install -r /tmp/src/templateflow/requirements.txt
4848
pip install "datalad ~= 0.11.8" "doi2bib < 0.4"
49-
pip install "setuptools>=42.0" "setuptools_scm[toml] >= 3.4" twine codecov
49+
pip install "setuptools>=45" "setuptools_scm >= 6.2" twine codecov
5050
5151
- run:
5252
name: Install git and git-annex
@@ -167,7 +167,7 @@ jobs:
167167
- run:
168168
name: Install deps
169169
command: |
170-
pip install --no-cache-dir "setuptools>=42.0" "setuptools_scm[toml]>=3.4"
170+
pip install --no-cache-dir "setuptools>=45" "setuptools_scm >= 6.2"
171171
pip install --no-cache-dir -r docs/requirements.txt
172172
- run:
173173
name: Build only this commit
@@ -219,7 +219,7 @@ jobs:
219219
name: Deploy to PyPi
220220
command: |
221221
source /tmp/venv/bin/activate
222-
pip install "setuptools>=42.0" "setuptools_scm[toml] >= 3.4" wheel twine
222+
pip install "setuptools>=45" "setuptools_scm >= 6.2" wheel twine
223223
python setup.py sdist bdist_wheel
224224
twine check dist/*
225225
twine upload dist/*

.github/workflows/pythonpackage.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
python-version: [3.6, 3.7, 3.8]
20-
pip: ["pip", "pip~=10.0.1"]
19+
python-version: [3.7, 3.8, 3.9]
20+
pip: ["pip~=20.0", "pip~=21.0"]
2121

2222
steps:
2323
- uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
3939
run: |
4040
python -m venv /tmp/buildenv
4141
source /tmp/buildenv/bin/activate
42-
python -m pip install -U "setuptools ~= 42.0" wheel "setuptools_scm[toml] >= 3.4" \
42+
python -m pip install -U "setuptools >= 45" wheel "setuptools_scm >= 6.2" \
4343
setuptools_scm_git_archive pip twine docutils
4444
python setup.py sdist bdist_wheel
4545
python -m twine check dist/templateflow*
@@ -62,7 +62,7 @@ jobs:
6262
run: |
6363
python -m venv /tmp/pip
6464
source /tmp/pip/bin/activate
65-
python -m pip install -U "setuptools ~= 42.0" "setuptools_scm[toml] >= 3.4" "${{ matrix.pip }}"
65+
python -m pip install -U "setuptools >= 45" "setuptools_scm >= 6.2" "${{ matrix.pip }}"
6666
python -m pip install .
6767
INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
6868
echo "VERSION: \"${THISVERSION}\""
@@ -75,7 +75,7 @@ jobs:
7575
run: |
7676
python -m venv /tmp/install_sdist
7777
source /tmp/install_sdist/bin/activate
78-
python -m pip install -U "setuptools ~= 42.0" "${{ matrix.pip }}"
78+
python -m pip install -U "setuptools >= 45" "${{ matrix.pip }}"
7979
python -m pip install /tmp/package/templateflow*.tar.gz
8080
INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
8181
echo "VERSION: \"${THISVERSION}\""
@@ -107,7 +107,7 @@ jobs:
107107
run: |
108108
python -m venv /tmp/install_wheel
109109
source /tmp/install_wheel/bin/activate
110-
python -m pip install -U "setuptools ~= 42.0" "${{ matrix.pip }}"
110+
python -m pip install -U "setuptools >= 45" "${{ matrix.pip }}"
111111
python -m pip install /tmp/package/templateflow*.whl
112112
INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
113113
echo "INSTALLED: \"${INSTALLED_VERSION}\""
@@ -140,11 +140,8 @@ jobs:
140140
run: |
141141
python -m venv /tmp/setup_install
142142
source /tmp/setup_install/bin/activate
143-
python -m pip install -U "setuptools ~= 42.0" wheel "setuptools_scm[toml] >= 3.4" \
143+
python -m pip install -U "setuptools >= 45" wheel "setuptools_scm >= 6.2" \
144144
setuptools_scm_git_archive "${{ matrix.pip }}"
145-
if [ "${{ matrix.python-version }}" == "3.6" ]; then
146-
pip install "numpy < 1.20" "pandas < 1.2.0"
147-
fi
148145
python setup.py install
149146
INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
150147
echo "INSTALLED: \"${INSTALLED_VERSION}\""
@@ -175,11 +172,8 @@ jobs:
175172
run: |
176173
python -m venv /tmp/setup_develop
177174
source /tmp/setup_develop/bin/activate
178-
python -m pip install -U "setuptools ~= 42.0" wheel "setuptools_scm[toml] >= 3.4" \
175+
python -m pip install -U "setuptools >= 45" wheel "setuptools_scm >= 6.2" \
179176
setuptools_scm_git_archive "${{ matrix.pip }}"
180-
if [ "${{ matrix.python-version }}" == "3.6" ]; then
181-
pip install "numpy < 1.20" "pandas < 1.2.0"
182-
fi
183177
python setup.py develop
184178
INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
185179
echo "INSTALLED: \"${INSTALLED_VERSION}\""

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[build-system]
22
requires = [
3-
"setuptools >= 40.9",
4-
"setuptools_scm[toml] >= 3.4",
3+
"setuptools >= 45",
4+
"setuptools_scm >= 6.2",
55
"wheel"
66
]
77
build-backend = "setuptools.build_meta"

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ project_urls =
2525
[options]
2626
python_requires = >= 3.6
2727
setup_requires =
28-
setuptools >= 40.9
29-
setuptools_scm[toml] >= 3.4
28+
setuptools >= 45
29+
setuptools_scm >= 6.2
3030
wheel
3131
install_requires =
3232
pybids >= 0.12.1

0 commit comments

Comments
 (0)