Merge pull request #73 from templateflow/fix/setuptools-version

MAINT: Pin ``setuptools >=45``, new dependency as of ``setuptools_scm>=6.0.1``
templateflow · Sep 3, 2021 · 22869f4 · 22869f4
2 parents 137218d + c31af64
commit 22869f4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git 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 >= 6.2" 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 >= 6.2"
             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 >= 6.2" 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
@@ -16,8 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
-        pip: ["pip", "pip~=10.0.1"]
+        python-version: [3.7, 3.8, 3.9]
+        pip: ["pip~=20.0", "pip~=21.0"]
 
     steps:
     - uses: actions/checkout@v2
@@ -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*
@@ -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}\""
@@ -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,11 +140,8 @@ 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"
-        fi
         python setup.py install
         INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
         echo "INSTALLED: \"${INSTALLED_VERSION}\""
@@ -175,11 +172,8 @@ 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"
-        fi
         python setup.py develop
         INSTALLED_VERSION=$(python -c 'import templateflow as tf; print(tf.__version__, end="")')
         echo "INSTALLED: \"${INSTALLED_VERSION}\""

diff --git 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 >= 6.2",
     "wheel"
 ]
 build-backend = "setuptools.build_meta"

diff --git 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 >= 6.2
     wheel
 install_requires =
     pybids >= 0.12.1