From 09265eb7c731a658fe27e1d8a5f640c42effcd90 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 31 Jul 2020 15:46:02 -0300
Subject: [PATCH 1/4] Configure setuptools_scm using pyproject.toml

---
 pyproject.toml | 5 ++++-
 setup.py       | 7 +------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 493213d84..737f50346 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,11 +2,14 @@
 requires = [
   # sync with setup.py until we discard non-pep-517/518
   "setuptools>=40.0",
-  "setuptools-scm",
+  "setuptools-scm>=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
index 4475e30a7..7f1a1763c 100644
--- 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()

From 4f0793a4629a3ee5f34bcb3336c1390aaab29a76 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 31 Jul 2020 18:17:12 -0300
Subject: [PATCH 2/4] Require setuptools >=42

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 737f50346..e98a02804 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [build-system]
 requires = [
   # sync with setup.py until we discard non-pep-517/518
-  "setuptools>=40.0",
+  "setuptools>=42.0",
   "setuptools-scm>=3.4",
   "wheel",
 ]

From d5a49100cf8581e5a225fea2524ae1e7039a8ecd Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Fri, 31 Jul 2020 21:44:44 -0700
Subject: [PATCH 3/4] Try this maybe?

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index e98a02804..3d3d232f4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 requires = [
   # sync with setup.py until we discard non-pep-517/518
   "setuptools>=42.0",
-  "setuptools-scm>=3.4",
+  "setuptools-scm[toml]>=3.4",
   "wheel",
 ]
 build-backend = "setuptools.build_meta"

From d1fa749b834013904514f5af235d0d562d96c671 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 1 Aug 2020 14:21:36 -0300
Subject: [PATCH 4/4] Add readthedocs config file to use pip for installation

---
 .readthedocs.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .readthedocs.yml

diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 000000000..0176c2640
--- /dev/null
+++ 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