From 1d870c0ee51b11eb42e2533c8bd428e6654ef454 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Sat, 4 Apr 2020 14:21:04 -0400 Subject: python-pytest: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- ...ove-the-setup_requires-for-setuptools-scm.patch | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch (limited to 'meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch') diff --git a/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch deleted file mode 100644 index c29fb12de8..0000000000 --- a/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index adbafb5..75fdd09 100644 ---- a/setup.py -+++ b/setup.py -@@ -19,7 +19,7 @@ INSTALL_REQUIRES = [ - def main(): - setup( - use_scm_version={"write_to": "src/_pytest/_version.py"}, -- setup_requires=["setuptools-scm", "setuptools>=40.0"], -+ setup_requires=["setuptools>=40.0"], - package_dir={"": "src"}, - extras_require={ - "testing": [ --- -2.17.1 - -- cgit v1.2.3-54-g00ecf