Skip to content

Commit

Permalink
Rely on setuptools_scm 3.4 and setuptools 42. Now setup.py is optiona…
Browse files Browse the repository at this point in the history
…l. Remove setuptools from test environment.
  • Loading branch information
jaraco committed Jan 18, 2020
1 parent b07b273 commit 0bf3d43
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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]
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
import setuptools

if __name__ == "__main__":
setuptools.setup(use_scm_version=True)
setuptools.setup()
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ requires =

[testenv]
deps =
setuptools>=31.0.1
pip_version = pip
commands =
pytest {posargs}
Expand Down

0 comments on commit 0bf3d43

Please sign in to comment.