Merge pull request #7598 from nicoddemus/setuptools-scm-pyproject

Configure setuptools_scm using pyproject.toml
pytest-dev · Aug 2, 2020 · 701998b · 701998b
2 parents be354b3 + d1fa749
commit 701998b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -0,0 +1,12 @@
+version: 2
+
+python:
+   version: 3.7
+   install:
+      - requirements: doc/en/requirements.txt
+      - method: pip
+        path: .
+
+formats:
+  - epub
+  - pdf
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,12 +1,15 @@
 [build-system]
 requires = [
   # sync with setup.py until we discard non-pep-517/518
-  "setuptools>=40.0",
-  "setuptools-scm",
+  "setuptools>=42.0",
+  "setuptools-scm[toml]>=3.4",
   "wheel",
 ]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools_scm]
+write_to = "src/_pytest/_version.py"
+
 [tool.pytest.ini_options]
 minversion = "2.0"
 addopts = "-rfEX -p pytester --strict-markers"

diff --git a/setup.py b/setup.py
@@ -1,9 +1,4 @@
 from setuptools import setup
 
-
-def main():
-    setup(use_scm_version={"write_to": "src/_pytest/_version.py"})
-
-
 if __name__ == "__main__":
-    main()
+    setup()