Skip to content

Commit

Permalink
maint: pin setuptools >=45, new dependency as of setuptools_scm>=6.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
oesteban committed Sep 2, 2021
1 parent 137218d commit 043b056
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
pip install -U pip
pip install -r /tmp/src/templateflow/requirements.txt
pip install "datalad ~= 0.11.8" "doi2bib < 0.4"
pip install "setuptools>=42.0" "setuptools_scm[toml] >= 3.4" twine codecov
pip install "setuptools>=45" "setuptools_scm >= 6.2" twine codecov
- run:
name: Install git and git-annex
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
- run:
name: Install deps
command: |
pip install --no-cache-dir "setuptools>=42.0" "setuptools_scm[toml]>=3.4"
pip install --no-cache-dir "setuptools>=45" "setuptools_scm >= 6.2"
pip install --no-cache-dir -r docs/requirements.txt
- run:
name: Build only this commit
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
name: Deploy to PyPi
command: |
source /tmp/venv/bin/activate
pip install "setuptools>=42.0" "setuptools_scm[toml] >= 3.4" wheel twine
pip install "setuptools>=45" "setuptools_scm >= 6.2" wheel twine
python setup.py sdist bdist_wheel
twine check dist/*
twine upload dist/*
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: |
python -m venv /tmp/buildenv
source /tmp/buildenv/bin/activate
python -m pip install -U "setuptools ~= 42.0" wheel "setuptools_scm[toml] >= 3.4" \
python -m pip install -U "setuptools >= 45" wheel "setuptools_scm >= 6.2" \
setuptools_scm_git_archive pip twine docutils
python setup.py sdist bdist_wheel
python -m twine check dist/templateflow*
Expand All @@ -62,7 +62,7 @@ jobs:
run: |
python -m venv /tmp/pip
source /tmp/pip/bin/activate
python -m pip install -U "setuptools ~= 42.0" "setuptools_scm[toml] >= 3.4" "${{ matrix.pip }}"
python -m pip install -U "setuptools >= 45" "setuptools_scm >= 6.2" "${{ matrix.pip }}"
python -m pip install .
INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
echo "VERSION: \"${THISVERSION}\""
Expand All @@ -75,7 +75,7 @@ jobs:
run: |
python -m venv /tmp/install_sdist
source /tmp/install_sdist/bin/activate
python -m pip install -U "setuptools ~= 42.0" "${{ matrix.pip }}"
python -m pip install -U "setuptools >= 45" "${{ matrix.pip }}"
python -m pip install /tmp/package/templateflow*.tar.gz
INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
echo "VERSION: \"${THISVERSION}\""
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
run: |
python -m venv /tmp/install_wheel
source /tmp/install_wheel/bin/activate
python -m pip install -U "setuptools ~= 42.0" "${{ matrix.pip }}"
python -m pip install -U "setuptools >= 45" "${{ matrix.pip }}"
python -m pip install /tmp/package/templateflow*.whl
INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
echo "INSTALLED: \"${INSTALLED_VERSION}\""
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
run: |
python -m venv /tmp/setup_install
source /tmp/setup_install/bin/activate
python -m pip install -U "setuptools ~= 42.0" wheel "setuptools_scm[toml] >= 3.4" \
python -m pip install -U "setuptools >= 45" wheel "setuptools_scm >= 6.2" \
setuptools_scm_git_archive "${{ matrix.pip }}"
if [ "${{ matrix.python-version }}" == "3.6" ]; then
pip install "numpy < 1.20" "pandas < 1.2.0"
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
run: |
python -m venv /tmp/setup_develop
source /tmp/setup_develop/bin/activate
python -m pip install -U "setuptools ~= 42.0" wheel "setuptools_scm[toml] >= 3.4" \
python -m pip install -U "setuptools >= 45" wheel "setuptools_scm >= 6.2" \
setuptools_scm_git_archive "${{ matrix.pip }}"
if [ "${{ matrix.python-version }}" == "3.6" ]; then
pip install "numpy < 1.20" "pandas < 1.2.0"
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
requires = [
"setuptools >= 40.9",
"setuptools_scm[toml] >= 3.4",
"setuptools >= 45",
"setuptools_scm >= 6.2",
"wheel"
]
build-backend = "setuptools.build_meta"
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ project_urls =
[options]
python_requires = >= 3.6
setup_requires =
setuptools >= 40.9
setuptools_scm[toml] >= 3.4
setuptools >= 45
setuptools_scm >= 6.2
wheel
install_requires =
pybids >= 0.12.1
Expand Down

0 comments on commit 043b056

Please sign in to comment.