From 0bf3d43d97d5466fddac708e7ca38ba95281c6e7 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 18 Jan 2020 13:36:43 -0500 Subject: [PATCH] Rely on setuptools_scm 3.4 and setuptools 42. Now setup.py is optional. Remove setuptools from test environment. --- pyproject.toml | 4 +++- setup.cfg | 2 +- setup.py | 2 +- tox.ini | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3afc8c33..74cff744 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,8 @@ [build-system] -requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"] +requires = ["setuptools>=42", "wheel", "setuptools_scm>=3.4"] build-backend = "setuptools.build_meta" [tool.black] skip-string-normalization = true + +[tool.setuptools_scm] diff --git a/setup.cfg b/setup.cfg index 2c0f7b1f..bc7a9d5d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,7 +20,7 @@ packages = find: include_package_data = true python_requires = >=3.6 install_requires = -setup_requires = setuptools_scm >= 1.15.0 +setup_requires = setuptools_scm >= 3.4 [options.extras_require] testing = diff --git a/setup.py b/setup.py index 827e955f..bac24a43 100644 --- a/setup.py +++ b/setup.py @@ -3,4 +3,4 @@ import setuptools if __name__ == "__main__": - setuptools.setup(use_scm_version=True) + setuptools.setup() diff --git a/tox.ini b/tox.ini index fa2a72f4..fb98930e 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,6 @@ requires = [testenv] deps = - setuptools>=31.0.1 pip_version = pip commands = pytest {posargs}