Merge pull request #4183 from RonnyPfannschmidt/bump-setuptools

nicoddemus · web-flow · commit e4871f7722d4 · 2018-10-18T07:49:03.000-03:00
fix #4177 - pin setuptools>=40.0
diff --git a/changelog/4177.bugfix.rst b/changelog/4177.bugfix.rst
@@ -0,0 +1 @@
+Pin ``setuptools>=40.0`` to support ``py_modules`` in ``setup.cfg``
diff --git 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>=30.3",
+  "setuptools>=40.0",
   "setuptools-scm",
   "wheel",
 ]
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@
 def main():
     setup(
         use_scm_version={"write_to": "src/_pytest/_version.py"},
-        setup_requires=["setuptools-scm", "setuptools>=30.3"],
+        setup_requires=["setuptools-scm", "setuptools>=40.0"],
         package_dir={"": "src"},
         install_requires=INSTALL_REQUIRES,
     )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Pin ``setuptools>=40.0`` to support ``py_modules`` in ``setup.cfg``
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[build-system]`
`2`	`2`	`requires = [`
`3`	`3`	`# sync with setup.py until we discard non-pep-517/518`
`4`		`- "setuptools>=30.3",`
	`4`	`+ "setuptools>=40.0",`
`5`	`5`	`"setuptools-scm",`
`6`	`6`	`"wheel",`
`7`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`def main():`
`27`	`27`	`setup(`
`28`	`28`	`use_scm_version={"write_to": "src/_pytest/_version.py"},`
`29`		`- setup_requires=["setuptools-scm", "setuptools>=30.3"],`
	`29`	`+ setup_requires=["setuptools-scm", "setuptools>=40.0"],`
`30`	`30`	`package_dir={"": "src"},`
`31`	`31`	`install_requires=INSTALL_REQUIRES,`
`32`	`32`	`)`