Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 1 | From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> |
| 3 | Date: Wed, 28 Aug 2019 16:12:27 +0900 |
| 4 | Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | setuptools-scm |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 6 | |
| 7 | The setup_requires argument forces the download of the egg file for setuptools-scm |
| 8 | during the do_compile phase. This download is incompatible with the typical fetch |
| 9 | and mirror structure. The only usage of scm is the generation of the _version.py |
| 10 | file and in the release tarball it is already correctly created |
| 11 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 12 | Upstream-Status: Inappropriate [oe specific] |
| 13 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 14 | Signed-off-by: Derek Straka <derek@asterius.io> |
Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 15 | |
| 16 | Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 17 | --- |
Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 18 | setup.py | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 20 | |
| 21 | diff --git a/setup.py b/setup.py |
Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 22 | index adbafb5..75fdd09 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | --- a/setup.py |
| 24 | +++ b/setup.py |
Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 25 | @@ -19,7 +19,7 @@ INSTALL_REQUIRES = [ |
| 26 | def main(): |
| 27 | setup( |
| 28 | use_scm_version={"write_to": "src/_pytest/_version.py"}, |
| 29 | - setup_requires=["setuptools-scm", "setuptools>=40.0"], |
| 30 | + setup_requires=["setuptools>=40.0"], |
| 31 | package_dir={"": "src"}, |
| 32 | extras_require={ |
| 33 | "testing": [ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 34 | -- |
Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 35 | 2.17.1 |
| 36 | |