From e3447080650730b6fff80dc484d91620c8257e59 Mon Sep 17 00:00:00 2001 From: Oscar Esteban Date: Fri, 3 Sep 2021 00:19:32 +0200 Subject: [PATCH] maint: pin setuptools >=45, new dependency as of setuptools_scm>=6.0.1 --- .circleci/config.yml | 6 +++--- .github/workflows/pythonpackage.yml | 12 ++++++------ pyproject.toml | 4 ++-- setup.cfg | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 001eaf4c..c909514f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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[toml] >= 6.0.1" twine codecov - run: name: Install git and git-annex @@ -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[toml]>=6.0.1" pip install --no-cache-dir -r docs/requirements.txt - run: name: Build only this commit @@ -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[toml] >= 6.0.1" wheel twine python setup.py sdist bdist_wheel twine check dist/* twine upload dist/* diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index df878f68..52e78a53 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -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[toml] >= 6.0.1" \ setuptools_scm_git_archive pip twine docutils python setup.py sdist bdist_wheel python -m twine check dist/templateflow* @@ -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[toml] >= 6.0.1" "${{ matrix.pip }}" python -m pip install . INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")') echo "VERSION: \"${THISVERSION}\"" @@ -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}\"" @@ -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}\"" @@ -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[toml] >= 6.0.1" \ setuptools_scm_git_archive "${{ matrix.pip }}" if [ "${{ matrix.python-version }}" == "3.6" ]; then pip install "numpy < 1.20" "pandas < 1.2.0" @@ -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[toml] >= 6.0.1" \ setuptools_scm_git_archive "${{ matrix.pip }}" if [ "${{ matrix.python-version }}" == "3.6" ]; then pip install "numpy < 1.20" "pandas < 1.2.0" diff --git a/pyproject.toml b/pyproject.toml index 20d1f983..587f1b00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ - "setuptools >= 40.9", - "setuptools_scm[toml] >= 3.4", + "setuptools >= 45", + "setuptools_scm[toml] >= 6.0.1", "wheel" ] build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index 4c7c6a34..fd8d8f5f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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[toml] >= 6.0.1 wheel install_requires = pybids >= 0.12.1