From f6355e494dea2d96fd1b7a94b3ce4243c082488b Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 8 Dec 2020 14:30:50 -0500 Subject: create gatesgarth branch Reset the following subtrees on gatesgarth: meta-raspberrypi: 09a3c11696(gatesgarth) poky: 943ef2fad8(gatesgarth) meta-openembedded: b9dcf17700(gatesgarth) meta-xilinx: b3e37df5d9(gatesgarth) meta-security: 4583ab9b08(gatesgarth) cherry pick: meta-phosphor: c52fa217b832 Change-Id: I8ad417df218284605f6edfe65798a3b0c99aba12 Signed-off-by: Brad Bishop --- ...ove-the-setup_requires-for-setuptools-scm.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-pytest') diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch new file mode 100644 index 0000000000..8c5c17247e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch @@ -0,0 +1,39 @@ +From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001 +From: Yuan Chao +Date: Wed, 28 Aug 2019 16:12:27 +0900 +Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for + setuptools-scm + +The setup_requires argument forces the download of the egg file for setuptools-scm +during the do_compile phase. This download is incompatible with the typical fetch +and mirror structure. The only usage of scm is the generation of the _version.py +file and in the release tarball it is already correctly created + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Derek Straka + +Signed-off-by: Yuan Chao + +Rebase for pytest 6.1.0. + +Signed-off-by: Kai Kang +--- + setup.cfg | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +index 60f6564..c4d1471 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -55,7 +55,6 @@ package_dir = + =src + setup_requires = + setuptools>=40.0 +- setuptools-scm + zip_safe = no + + [options.entry_points] +-- +2.17.1 + -- cgit v1.2.3