summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch')
-rw-r--r--meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch17
1 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
index 8c5c17247e..1abd531c62 100644
--- a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
+++ b/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
@@ -1,8 +1,7 @@
1From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001 1From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001
2From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> 2From: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
3Date: Wed, 28 Aug 2019 16:12:27 +0900 3Date: Wed, 28 Aug 2019 16:12:27 +0900
4Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for 4Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm
5 setuptools-scm
6 5
7The setup_requires argument forces the download of the egg file for setuptools-scm 6The setup_requires argument forces the download of the egg file for setuptools-scm
8during the do_compile phase. This download is incompatible with the typical fetch 7during the do_compile phase. This download is incompatible with the typical fetch
@@ -18,22 +17,20 @@ Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
18Rebase for pytest 6.1.0. 17Rebase for pytest 6.1.0.
19 18
20Signed-off-by: Kai Kang <kai.kang@windriver.com> 19Signed-off-by: Kai Kang <kai.kang@windriver.com>
20
21--- 21---
22 setup.cfg | 1 - 22 setup.cfg | 1 -
23 1 file changed, 1 deletion(-) 23 1 file changed, 1 deletion(-)
24 24
25diff --git a/setup.cfg b/setup.cfg 25diff --git a/setup.cfg b/setup.cfg
26index 60f6564..c4d1471 100644 26index 6ed0792..0137090 100644
27--- a/setup.cfg 27--- a/setup.cfg
28+++ b/setup.cfg 28+++ b/setup.cfg
29@@ -55,7 +55,6 @@ package_dir = 29@@ -53,7 +53,6 @@ package_dir =
30 =src 30 =src
31 setup_requires = 31 setup_requires =
32 setuptools>=40.0 32 setuptools>=>=42.0
33- setuptools-scm 33- setuptools-scm>=3.4
34 zip_safe = no 34 zip_safe = no
35 35
36 [options.entry_points] 36 [options.entry_points]
37--
382.17.1
39