summaryrefslogtreecommitdiffstats
path: root/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-devtools')
-rw-r--r--recipes-devtools/go/go-build_git.bb2
-rw-r--r--recipes-devtools/go/go-cli_git.bb2
-rw-r--r--recipes-devtools/go/go-md2man_git.bb2
-rw-r--r--recipes-devtools/go/notary_git.bb41
-rw-r--r--recipes-devtools/python/gunicorn_23.0.0.bb (renamed from recipes-devtools/python/gunicorn_20.0.4.bb)8
-rw-r--r--recipes-devtools/python/python3-boto3_1.37.35.bb (renamed from recipes-devtools/python/python3-boto3_1.17.51.bb)2
-rw-r--r--recipes-devtools/python/python3-botocore/0001-Fix-rejecting-URLs-with-unsafe-characters-in-is_vali.patch61
-rw-r--r--recipes-devtools/python/python3-botocore_1.37.35.bb (renamed from recipes-devtools/python/python3-botocore_1.20.51.bb)4
-rw-r--r--recipes-devtools/python/python3-bugsnag_4.7.1.bb (renamed from recipes-devtools/python/python3-bugsnag_4.1.0.bb)2
-rw-r--r--recipes-devtools/python/python3-cached-property_1.5.2.bb10
-rw-r--r--recipes-devtools/python/python3-colorama_0.4.6.bb14
-rw-r--r--recipes-devtools/python/python3-docker_7.1.0.bb (renamed from recipes-devtools/python/python3-docker_7.0.0.bb)8
-rw-r--r--recipes-devtools/python/python3-docopt_0.6.2.bb2
-rw-r--r--recipes-devtools/python/python3-dotenv_0.17.0.bb12
-rw-r--r--recipes-devtools/python/python3-dotenv_1.1.0.bb12
-rw-r--r--recipes-devtools/python/python3-flask-cors-virt_3.0.10.bb16
-rw-r--r--recipes-devtools/python/python3-newrelic/0001-setup.py-tweak-setuptools_scm-version-dependency.patch34
-rw-r--r--recipes-devtools/python/python3-newrelic_10.9.0.bb (renamed from recipes-devtools/python/python3-newrelic_6.2.0.156.bb)4
-rw-r--r--recipes-devtools/python/python3-sphinx-420.bb15
-rw-r--r--recipes-devtools/python/python3-webob_1.8.9.bb (renamed from recipes-devtools/python/python3-webob_1.8.7.bb)4
-rw-r--r--recipes-devtools/yq/yq_git.bb146
21 files changed, 114 insertions, 287 deletions
diff --git a/recipes-devtools/go/go-build_git.bb b/recipes-devtools/go/go-build_git.bb
index 75ea40a8..c0253298 100644
--- a/recipes-devtools/go/go-build_git.bb
+++ b/recipes-devtools/go/go-build_git.bb
@@ -7,7 +7,7 @@ SRCREV_runc = "1e7bb5b773162b57333d57f612fd72e3f8612d94"
7 7
8SRCREV_FORMAT = "runx_runc" 8SRCREV_FORMAT = "runx_runc"
9SRC_URI = "\ 9SRC_URI = "\
10 git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \ 10 git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
11 git://github.com/opencontainers/runc;branch=release-1.1;name=runc;protocol=https;destsuffix=git/src/import/gobuild/go/src/github.com/opencontainers/runc \ 11 git://github.com/opencontainers/runc;branch=release-1.1;name=runc;protocol=https;destsuffix=git/src/import/gobuild/go/src/github.com/opencontainers/runc \
12 file://0001-build-use-instead-of-go.patch \ 12 file://0001-build-use-instead-of-go.patch \
13 " 13 "
diff --git a/recipes-devtools/go/go-cli_git.bb b/recipes-devtools/go/go-cli_git.bb
index 8a4992bd..37f65c33 100644
--- a/recipes-devtools/go/go-cli_git.bb
+++ b/recipes-devtools/go/go-cli_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ed9b539ed65d73926f30ff1f1587dc44"
7SRCNAME = "cli" 7SRCNAME = "cli"
8 8
9PKG_NAME = "github.com/codegangsta/${SRCNAME}" 9PKG_NAME = "github.com/codegangsta/${SRCNAME}"
10SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" 10SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https"
11 11
12SRCREV = "27ecc97192df1bf053a22b04463f2b51b8b8373e" 12SRCREV = "27ecc97192df1bf053a22b04463f2b51b8b8373e"
13PV = "1.1.0+git" 13PV = "1.1.0+git"
diff --git a/recipes-devtools/go/go-md2man_git.bb b/recipes-devtools/go/go-md2man_git.bb
index 1d96bb1b..73d8d167 100644
--- a/recipes-devtools/go/go-md2man_git.bb
+++ b/recipes-devtools/go/go-md2man_git.bb
@@ -9,7 +9,7 @@ BBCLASSEXTEND = "native"
9GO_IMPORT = "github.com/cpuguy83/go-md2man" 9GO_IMPORT = "github.com/cpuguy83/go-md2man"
10#GO_INSTALL = "${GO_IMPORT}/bin/go-md2man" 10#GO_INSTALL = "${GO_IMPORT}/bin/go-md2man"
11 11
12SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https" 12SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
13 13
14SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a" 14SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a"
15PV = "1.0.10+git" 15PV = "1.0.10+git"
diff --git a/recipes-devtools/go/notary_git.bb b/recipes-devtools/go/notary_git.bb
deleted file mode 100644
index ace7174d..00000000
--- a/recipes-devtools/go/notary_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
1DESCRIPTION = "Notary is a Docker project that allows anyone to have trust over arbitrary collections of data"
2HOMEPAGE = "https://github.com/docker/notary"
3SECTION = "devel/go"
4LICENSE = "Apache-2.0"
5LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=3596b980bb036e0875174ed15e4b982a"
6
7SRCNAME = "notary"
8
9PKG_NAME = "github.com/docker/${SRCNAME}"
10SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
11
12SRCREV = "d6e1431feb32348e0650bf7551ac5cffd01d857b"
13PV = "0.6.1+git"
14
15S = "${WORKDIR}/git"
16
17inherit meta-virt-depreciated-warning
18
19# NO-OP the do compile rule because this recipe is source only.
20do_compile() {
21}
22
23do_install() {
24 install -d ${D}${prefix}/local/go/src/${PKG_NAME}
25 for j in $(cd ${S} && find src/${PKG_NAME} -name "*.go"); do
26 if [ ! -d ${D}${prefix}/local/go/$(dirname $j) ]; then
27 mkdir -p ${D}${prefix}/local/go/$(dirname $j)
28 fi
29 cp $j ${D}${prefix}/local/go/$j
30 done
31 cp -r ${S}/src/${PKG_NAME}/LICENSE ${D}${prefix}/local/go/src/${PKG_NAME}/
32}
33
34SYSROOT_PREPROCESS_FUNCS += "go_notary_sysroot_preprocess"
35
36go_notary_sysroot_preprocess () {
37 install -d ${SYSROOT_DESTDIR}${prefix}/local/go/src/${PKG_NAME}
38 cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
39}
40
41FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
diff --git a/recipes-devtools/python/gunicorn_20.0.4.bb b/recipes-devtools/python/gunicorn_23.0.0.bb
index 41c909c5..04ec0578 100644
--- a/recipes-devtools/python/gunicorn_20.0.4.bb
+++ b/recipes-devtools/python/gunicorn_23.0.0.bb
@@ -6,11 +6,11 @@ DESCRIPTION = "\
6 simply implemented, light on server resource usage, and fairly speedy. \ 6 simply implemented, light on server resource usage, and fairly speedy. \
7 " 7 "
8LICENSE = "MIT" 8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=f75f3fb94cdeab1d607e2adaa6077752" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=5b70a8b30792a916f50dc96123e61ddf"
10 10
11SRC_URI = "https://pypi.python.org/packages/source/g/gunicorn/${BPN}-${PV}.tar.gz" 11SRC_URI = "https://pypi.python.org/packages/source/g/gunicorn/${BPN}-${PV}.tar.gz"
12 12
13SRC_URI[md5sum] = "543669fcbb5739ee2af77184c5e571a1" 13SRC_URI[md5sum] = "18b666db62a890579170639961c5b064"
14SRC_URI[sha256sum] = "1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626" 14SRC_URI[sha256sum] = "f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec"
15 15
16inherit setuptools3 16inherit python_pep517 python_setuptools_build_meta
diff --git a/recipes-devtools/python/python3-boto3_1.17.51.bb b/recipes-devtools/python/python3-boto3_1.37.35.bb
index 9c94a34d..6fe8007d 100644
--- a/recipes-devtools/python/python3-boto3_1.17.51.bb
+++ b/recipes-devtools/python/python3-boto3_1.37.35.bb
@@ -9,7 +9,7 @@ SECTION = "devel/python"
9LICENSE = "MIT" 9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
11 11
12SRC_URI[sha256sum] = "c45e7d3aef8965ae1b42c9855c31ded19fbb38cfad0a34cc37dc880ded3672c2" 12SRC_URI[sha256sum] = "751ed599c8fd9ca24896edcd6620e8a32b3db1b68efea3a90126312240e668a2"
13 13
14inherit pypi setuptools3 14inherit pypi setuptools3
15 15
diff --git a/recipes-devtools/python/python3-botocore/0001-Fix-rejecting-URLs-with-unsafe-characters-in-is_vali.patch b/recipes-devtools/python/python3-botocore/0001-Fix-rejecting-URLs-with-unsafe-characters-in-is_vali.patch
deleted file mode 100644
index 95b30a08..00000000
--- a/recipes-devtools/python/python3-botocore/0001-Fix-rejecting-URLs-with-unsafe-characters-in-is_vali.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 370cdf7d708c92bf21a42f15392f7be330cf8f80 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
3Date: Fri, 7 May 2021 19:54:16 +0200
4Subject: [PATCH] Fix rejecting URLs with unsafe characters in
5 is_valid_endpoint_url() (#2381)
6
7Detect unsafe characters in is_valid_endpoint_url()
8and is_valid_ipv6_endpoint_url() early, in order to fix rejecting
9invalid URLs with Python 3.9.5+ and other versions carrying bpo-43882
10fix. In these versions, urlsplit() silently strips LF, CR and HT
11characters while splitting the URL, effectively disarming the validator
12in botocore.
13
14The solution is based on a similar fix in Django.
15
16Fixes #2377
17
18Upstream-Status: Backport
19
20---
21 botocore/utils.py | 10 ++++++++++
22 1 file changed, 10 insertions(+)
23
24diff --git a/botocore/utils.py b/botocore/utils.py
25index 378972248..d35dd64bb 100644
26--- a/botocore/utils.py
27+++ b/botocore/utils.py
28@@ -173,6 +173,10 @@ ZONE_ID_PAT = "(?:%25|%)(?:[" + UNRESERVED_PAT + "]|%[a-fA-F0-9]{2})+"
29 IPV6_ADDRZ_PAT = r"\[" + IPV6_PAT + r"(?:" + ZONE_ID_PAT + r")?\]"
30 IPV6_ADDRZ_RE = re.compile("^" + IPV6_ADDRZ_PAT + "$")
31
32+# These are the characters that are stripped by post-bpo-43882 urlparse().
33+UNSAFE_URL_CHARS = frozenset('\t\r\n')
34+
35+
36 def ensure_boolean(val):
37 """Ensures a boolean value if a string or boolean is provided
38
39@@ -977,6 +981,8 @@ class ArgumentGenerator(object):
40
41
42 def is_valid_ipv6_endpoint_url(endpoint_url):
43+ if UNSAFE_URL_CHARS.intersection(endpoint_url):
44+ return False
45 netloc = urlparse(endpoint_url).netloc
46 return IPV6_ADDRZ_RE.match(netloc) is not None
47
48@@ -990,6 +996,10 @@ def is_valid_endpoint_url(endpoint_url):
49 :return: True if the endpoint url is valid. False otherwise.
50
51 """
52+ # post-bpo-43882 urlsplit() strips unsafe characters from URL, causing
53+ # it to pass hostname validation below. Detect them early to fix that.
54+ if UNSAFE_URL_CHARS.intersection(endpoint_url):
55+ return False
56 parts = urlsplit(endpoint_url)
57 hostname = parts.hostname
58 if hostname is None:
59--
602.25.1
61
diff --git a/recipes-devtools/python/python3-botocore_1.20.51.bb b/recipes-devtools/python/python3-botocore_1.37.35.bb
index f71db1fc..edafd2da 100644
--- a/recipes-devtools/python/python3-botocore_1.20.51.bb
+++ b/recipes-devtools/python/python3-botocore_1.37.35.bb
@@ -3,10 +3,8 @@ HOMEPAGE = "https://github.com/boto/botocore"
3LICENSE = "Apache-2.0" 3LICENSE = "Apache-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93"
5 5
6SRC_URI[sha256sum] = "c853d6c2321e2f2328282c7d49d7b1a06201826ba0e7049c6975ab5f22927ea8" 6SRC_URI[sha256sum] = "197a9bf8251c45b9d882c405ec0d0ab40c10e2d2a55ee66960185daec4beb6ec"
7 7
8inherit pypi setuptools3 8inherit pypi setuptools3
9 9
10RDEPENDS:${PN} += "python3-jmespath python3-dateutil python3-logging" 10RDEPENDS:${PN} += "python3-jmespath python3-dateutil python3-logging"
11
12SRC_URI += "file://0001-Fix-rejecting-URLs-with-unsafe-characters-in-is_vali.patch"
diff --git a/recipes-devtools/python/python3-bugsnag_4.1.0.bb b/recipes-devtools/python/python3-bugsnag_4.7.1.bb
index 595cc8c7..379d07c0 100644
--- a/recipes-devtools/python/python3-bugsnag_4.1.0.bb
+++ b/recipes-devtools/python/python3-bugsnag_4.7.1.bb
@@ -10,7 +10,7 @@ SECTION = "devel/python"
10LICENSE = "MIT" 10LICENSE = "MIT"
11LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" 11LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489"
12 12
13SRC_URI[sha256sum] = "dcbd59cd9edea26cc92efb6518aed83a2f356f81bfd5acc730bfe202fb27c1c1" 13SRC_URI[sha256sum] = "98408fe17d4a7f300a56535407a6448b9844d9b528c44527908868fc3646e873"
14 14
15inherit pypi setuptools3 15inherit pypi setuptools3
16 16
diff --git a/recipes-devtools/python/python3-cached-property_1.5.2.bb b/recipes-devtools/python/python3-cached-property_1.5.2.bb
deleted file mode 100644
index 1f99115b..00000000
--- a/recipes-devtools/python/python3-cached-property_1.5.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1SUMMARY = "A decorator for caching properties in classes."
2DESCRIPTION = "Makes caching of time or computational expensive properties quick and easy."
3HOMEPAGE = "https://pypi.org/project/cached-property/"
4SECTION = "devel/python"
5LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=db7ff60c4e14f58534201242803d8abc"
7
8inherit pypi setuptools3
9
10SRC_URI[sha256sum] = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"
diff --git a/recipes-devtools/python/python3-colorama_0.4.6.bb b/recipes-devtools/python/python3-colorama_0.4.6.bb
deleted file mode 100644
index 0f364c42..00000000
--- a/recipes-devtools/python/python3-colorama_0.4.6.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SUMMARY = "Cross-platform colored terminal text."
2HOMEPAGE = "https://github.com/tartley/colorama"
3LICENSE = "BSD-2-Clause"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26"
5
6inherit pypi python_setuptools_build_meta
7
8SRC_URI[sha256sum] = "08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"
9
10DEPENDS += " \
11 python3-hatchling-native \
12"
13
14BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/python/python3-docker_7.0.0.bb b/recipes-devtools/python/python3-docker_7.1.0.bb
index 39567c04..cef0af4f 100644
--- a/recipes-devtools/python/python3-docker_7.0.0.bb
+++ b/recipes-devtools/python/python3-docker_7.1.0.bb
@@ -3,11 +3,12 @@ HOMEPAGE = "https://github.com/docker/docker-py"
3LICENSE = "Apache-2.0" 3LICENSE = "Apache-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=34f3846f940453127309b920eeb89660" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=34f3846f940453127309b920eeb89660"
5 5
6SRC_URI[md5sum] = "b08eeccf6a5efd11c316c08207edfeef" 6SRC_URI[md5sum] = "04e92a7b6dc8b88dde3c7cca6850b277"
7SRC_URI[sha256sum] = "323736fb92cd9418fc5e7133bc953e11a9da04f4483f828b527db553f1e7e5a3" 7SRC_URI[sha256sum] = "ad8c70e6e3f8926cb8a92619b832b4ea5299e2831c14284663184e200546fa6c"
8 8
9DEPENDS += "python3-pip-native" 9DEPENDS += "python3-pip-native"
10DEPENDS += "python3-setuptools-scm-native" 10DEPENDS += "python3-setuptools-scm-native"
11DEPENDS += "python3-hatch-vcs-native"
11 12
12RDEPENDS:${PN} += " \ 13RDEPENDS:${PN} += " \
13 python3-misc \ 14 python3-misc \
@@ -16,5 +17,6 @@ RDEPENDS:${PN} += " \
16 python3-requests \ 17 python3-requests \
17 python3-websocket-client \ 18 python3-websocket-client \
18 python3-packaging \ 19 python3-packaging \
20 python3-hatch-vcs \
19" 21"
20inherit pypi python_setuptools_build_meta 22inherit pypi python_hatchling
diff --git a/recipes-devtools/python/python3-docopt_0.6.2.bb b/recipes-devtools/python/python3-docopt_0.6.2.bb
deleted file mode 100644
index 4637448a..00000000
--- a/recipes-devtools/python/python3-docopt_0.6.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1inherit setuptools3
2require python-docopt.inc
diff --git a/recipes-devtools/python/python3-dotenv_0.17.0.bb b/recipes-devtools/python/python3-dotenv_0.17.0.bb
deleted file mode 100644
index 1fd13b70..00000000
--- a/recipes-devtools/python/python3-dotenv_0.17.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1HOMEPAGE = "https://github.com/pedroburon/dotenv"
2SUMMARY = "Python Dot Env Handler"
3DESCRIPTION = "Shell Command and Library to write and read .env like files."
4SECTION = "devel/python"
5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=55ee2c3471d386636a719c8ccac40b31"
7
8PYPI_PACKAGE = "python-dotenv"
9
10SRC_URI[sha256sum] = "471b782da0af10da1a80341e8438fca5fadeba2881c54360d5fd8d03d03a4f4a"
11
12inherit pypi setuptools3
diff --git a/recipes-devtools/python/python3-dotenv_1.1.0.bb b/recipes-devtools/python/python3-dotenv_1.1.0.bb
new file mode 100644
index 00000000..f297e6a6
--- /dev/null
+++ b/recipes-devtools/python/python3-dotenv_1.1.0.bb
@@ -0,0 +1,12 @@
1HOMEPAGE = "https://github.com/theskumar/python-dotenv"
2SUMMARY = "Python Dot Env Handler"
3DESCRIPTION = "Shell Command and Library to write and read .env like files."
4SECTION = "devel/python"
5LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=e914cdb773ae44a732b392532d88f072"
7
8PYPI_PACKAGE = "python_dotenv"
9
10SRC_URI[sha256sum] = "41f90bc6f5f177fb41f53e87666db362025010eb28f60a01c9143bfa33a2b2d5"
11
12inherit pypi setuptools3
diff --git a/recipes-devtools/python/python3-flask-cors-virt_3.0.10.bb b/recipes-devtools/python/python3-flask-cors-virt_3.0.10.bb
deleted file mode 100644
index 2b2e2ce6..00000000
--- a/recipes-devtools/python/python3-flask-cors-virt_3.0.10.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1HOMEPAGE = "https://pypi.python.org/pypi/Flask-Cors/"
2SUMMARY = "A Flask extension adding a decorator for CORS support"
3DESCRIPTION = "\
4 A Flask extension for handling Cross Origin Resource Sharing (CORS), making cross-origin AJAX possible \
5 "
6SECTION = "devel/python"
7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=118fecaa576ab51c1520f95e98db61ce"
9
10DEPENDS += "python3-six python3-flask"
11
12PYPI_PACKAGE = "Flask-Cors"
13
14SRC_URI[sha256sum] = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"
15
16inherit pypi setuptools3
diff --git a/recipes-devtools/python/python3-newrelic/0001-setup.py-tweak-setuptools_scm-version-dependency.patch b/recipes-devtools/python/python3-newrelic/0001-setup.py-tweak-setuptools_scm-version-dependency.patch
deleted file mode 100644
index 75fb6558..00000000
--- a/recipes-devtools/python/python3-newrelic/0001-setup.py-tweak-setuptools_scm-version-dependency.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From a61cea5053730f8180eb1fc8b4cb0f94ff4fc176 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Tue, 9 Feb 2021 21:31:19 -0500
4Subject: [PATCH] setup.py: tweak setuptools_scm version dependency
5
6The version dependency of <4 isn't showing any issues in builds.
7The oe-core version is 5+, and carrying a secondary version is
8not trivial or something we want to do.
9
10So we tweak the version to accept what we have in oe-core.
11
12Upstream-Status: Inappropriate [embedded specific]
13
14Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
15---
16 setup.py | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/setup.py b/setup.py
20index ade43a9..889a74f 100644
21--- a/setup.py
22+++ b/setup.py
23@@ -132,7 +132,7 @@ kwargs = dict(
24 "git_describe_command": "git describe --dirty --tags --long --match *.*.*.*",
25 "write_to": "newrelic/version.txt",
26 },
27- setup_requires=["setuptools_scm>=3.2,<4"],
28+ setup_requires=["setuptools_scm>=3.2"],
29 description = "New Relic Python Agent",
30 long_description = open(readme_file).read(),
31 url = "https://newrelic.com/docs/python/new-relic-for-python",
32--
332.19.1
34
diff --git a/recipes-devtools/python/python3-newrelic_6.2.0.156.bb b/recipes-devtools/python/python3-newrelic_10.9.0.bb
index 62371f60..a390aff8 100644
--- a/recipes-devtools/python/python3-newrelic_6.2.0.156.bb
+++ b/recipes-devtools/python/python3-newrelic_10.9.0.bb
@@ -8,14 +8,12 @@ SECTION = "devel/python"
8LICENSE = "BSD-3-Clause & MIT & Python-2.0 & BSD-2-Clause & NewRelic" 8LICENSE = "BSD-3-Clause & MIT & Python-2.0 & BSD-2-Clause & NewRelic"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9"
10 10
11SRC_URI[sha256sum] = "3dec4647de67609570c4e305f2b6432a00e0a0940a7ac69660ee92268b49d6e7" 11SRC_URI[sha256sum] = "0741de2138b41a1ae1cfad397878774de4131196d66f1443a23b055d9f47e706"
12 12
13inherit pypi setuptools3 13inherit pypi setuptools3
14 14
15DEPENDS += "python3-setuptools-scm-native" 15DEPENDS += "python3-setuptools-scm-native"
16 16
17SRC_URI += "file://0001-setup.py-tweak-setuptools_scm-version-dependency.patch"
18
19FILES:${PN}-dbg += "\ 17FILES:${PN}-dbg += "\
20 ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/*/.debug \ 18 ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/*/.debug \
21 ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/packages/*/.debug/ \ 19 ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/packages/*/.debug/ \
diff --git a/recipes-devtools/python/python3-sphinx-420.bb b/recipes-devtools/python/python3-sphinx-420.bb
deleted file mode 100644
index 67ecf416..00000000
--- a/recipes-devtools/python/python3-sphinx-420.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1DESCRIPTION = "Python documentation generator"
2HOMEPAGE = "http://sphinx-doc.org/"
3SECTION = "devel/python"
4LICENSE = "BSD-2-Clause & BSD-3-Clause & MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=82cc7d23060a75a07b820eaaf75abecf"
6
7PYPI_PACKAGE = "Sphinx"
8
9PV = "4.2.0"
10
11RCONFLICTS:${PN} = "python3-sphinx"
12
13SRC_URI[sha256sum] = "94078db9184491e15bce0a56d9186e0aec95f16ac20b12d00e06d4e36f1058a6"
14
15inherit setuptools3 pypi
diff --git a/recipes-devtools/python/python3-webob_1.8.7.bb b/recipes-devtools/python/python3-webob_1.8.9.bb
index d23ddfd2..4a3ed90e 100644
--- a/recipes-devtools/python/python3-webob_1.8.7.bb
+++ b/recipes-devtools/python/python3-webob_1.8.9.bb
@@ -4,9 +4,9 @@ SECTION = "devel/python"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://docs/license.txt;md5=8ed3584bcc78c16da363747ccabc5af5" 5LIC_FILES_CHKSUM = "file://docs/license.txt;md5=8ed3584bcc78c16da363747ccabc5af5"
6 6
7PYPI_PACKAGE = "WebOb" 7PYPI_PACKAGE = "webob"
8 8
9SRC_URI[sha256sum] = "b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dcef0c323" 9SRC_URI[sha256sum] = "ad6078e2edb6766d1334ec3dee072ac6a7f95b1e32ce10def8ff7f0f02d56589"
10 10
11inherit setuptools3 pypi 11inherit setuptools3 pypi
12 12
diff --git a/recipes-devtools/yq/yq_git.bb b/recipes-devtools/yq/yq_git.bb
index 45f2f970..415a4a4e 100644
--- a/recipes-devtools/yq/yq_git.bb
+++ b/recipes-devtools/yq/yq_git.bb
@@ -4,81 +4,103 @@ HOMEPAGE = "https://github.com/mikefarah/yq"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=e40a0dcd62f8269b9bff37fe9aa7dcc2" 5LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=e40a0dcd62f8269b9bff37fe9aa7dcc2"
6 6
7SRCREV_yq = "dd6cf3df146f3e2c0f8c765a6ef9e35780ad8cc1" 7SRCREV_yq = "de2f77b49cbd40fd67031ee602245d0acc4ac482"
8SRCREV_color = "daf2830f2741ebb735b21709a520c5f37d642d85"
9SRCREV_lexer = "6cdefc42e112ac71cbe316e1eed264ea62f58e25"
10SRCREV_cobra = "b43be995ebb4bee335a787bd44498b91aef7619c"
11SRCREV_pflag = "2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab"
12SRCREV_logging = "b2cb9fa56473e98db8caba80237377e83fe44db5"
13SRCREV_yaml = "f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
14SRCREV_xerrors="65e65417b02f28de84b55f16b46a1e789149973a"
15SRCREV_envsubst = "16035fe3571ad42c7796bf554f978bb2df64231b"
16SRCREV_participle = "49f4822ed012d9818c80ca4fcdeb7e2d55c04806"
17SRCREV_utfbom = "6ae8f945ca96f30defc7e8ab12ec5d10cf86ded4"
18SRCREV_orderedmap = "1e43e194ff533a346bab5f9b66b738256f199c8a"
19SRCREV_go-json = "5efc7d07eeeba186df630d9ab4ac78c761938c27"
20SRCREV_copier = "d132b069fe1a77d09e4c260852b389a730bbe9ba"
21SRCREV_properties = "c9a06e8f8f0164e4e16c0d5c4793cbed4ac90264"
22SRCREV_net = "f3363e06e74cdc304618bf31d898b78590103527"
23SRCREV_text = "434eadcdbc3b0256971992e8c70027278364c72c"
24SRCREV_diff = "20ebb0f2a09e612109b224b32f79370409108bcc"
25 8
26SRCREV_FORMAT = "yq_color" 9SRCREV_FORMAT = "yq_color"
27SRC_URI = "git://${GO_IMPORT};name=yq;branch=master;protocol=https \ 10SRC_URI = "git://${GO_IMPORT};name=yq;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
28 git://github.com/fatih/color;name=color;destsuffix=build/vendor/src/github.com/fatih/color;branch=main;protocol=https \ 11 file://run-ptest"
29 git://github.com/goccy/go-yaml;name=lexer;destsuffix=build/vendor/src/github.com/goccy/go-yaml/;branch=master;protocol=https \
30 git://github.com/spf13/cobra;name=cobra;nobranch=1;destsuffix=build/vendor/src/github.com/spf13/cobra;branch=main;protocol=https \
31 git://github.com/spf13/pflag;name=pflag;destsuffix=build/vendor/src/github.com/spf13/pflag;branch=master;protocol=https \
32 git://github.com/op/go-logging.git;name=logging;destsuffix=build/vendor/src/gopkg.in/op/go-logging.v1;branch=master;protocol=https \
33 git://github.com/go-yaml/yaml.git;name=yaml;branch=v3;destsuffix=build/vendor/src/gopkg.in/yaml.v3;protocol=https \
34 git://github.com/golang/xerrors;name=xerrors;protocol=https;nobranch=1;destsuffix=build/vendor/src/golang.org/x/xerrors \
35 git://github.com/a8m/envsubst;name=envsubst;destsuffix=build/vendor/src/github.com/a8m/envsubst;branch=master;protocol=https \
36 git://github.com/alecthomas/participle;name=participle;destsuffix=build/vendor/src/github.com/alecthomas/participle;branch=master;protocol=https \
37 git://github.com/dimchansky/utfbom;name=utfbom;destsuffix=build/vendor/src/github.com/dimchansky/utfbom;branch=master;protocol=https \
38 git://github.com/elliotchance/orderedmap;name=orderedmap;destsuffix=build/vendor/src/github.com/elliotchance/orderedmap;branch=master;protocol=https \
39 git://github.com/goccy/go-json;name=go-json;destsuffix=build/vendor/src/github.com/goccy/go-json;branch=master;protocol=https \
40 git://github.com/jinzhu/copier;name=copier;destsuffix=build/vendor/src/github.com/jinzhu/copier;branch=master;protocol=https \
41 git://github.com/magiconair/properties;name=properties;destsuffix=build/vendor/src/github.com/magiconair/properties;branch=main;protocol=https \
42 git://github.com/golang/net;name=net;destsuffix=build/vendor/src/golang.org/x/net;branch=master;protocol=https \
43 git://github.com/golang/text;name=text;destsuffix=build/vendor/src/golang.org/x/text;branch=master;protocol=https \
44 git://github.com/pkg/diff;name=diff;destsuffix=build/vendor/src/github.com/pkg/diff;branch=main;protocol=https \
45 file://run-ptest \
46 "
47
48PV = "4.30.8+git${SRCREV_yq}"
49GO_IMPORT = "github.com/mikefarah/yq"
50 12
51inherit go ptest 13# go.mod dependencies are below:
52 14
53do_compile:prepend() { 15SRCREV_net = "8da7ed17cdaf5e1d42aa868f0b0322a207a17dcd"
54 # arrange for some of the golang built ins to be found 16SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/golang.org/x/net"
55 (
56 cd ${WORKDIR}/build/src/
57 ln -sf ${STAGING_DIR_TARGET}/${prefix}/lib/go/src/cmd/vendor/golang.org .
58 )
59 17
60 # arrange for the fetched dependencies to be found 18SRCREV_yaml.v3 = "f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
61 export GOPATH="${GOPATH}:${WORKDIR}/build/vendor/" 19SRC_URI += "git://github.com/go-yaml/yaml;name=yaml.v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/gopkg.in/yaml.v3"
62 export GO111MODULE=off
63}
64 20
65do_install:append() { 21SRCREV_sys = "d4ac05dc8c4c953ec29cae3df56c0833f4010763"
66 # these bring in dependencies for the -dev package on bash, and we don't 22SRC_URI += "git://github.com/golang/sys;name=sys;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/golang.org/x/sys"
67 # need them .. so we remove them to avoid needing that rdepends 23
68 rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/debian/rules 24SRCREV_text = "566b44fc931e2542778a18423c655ce99b4f1402"
69 rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/scripts 25SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/golang.org/x/text"
70 rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/acceptance_tests 26
71} 27SRCREV_diff = "20ebb0f2a09e612109b224b32f79370409108bcc"
28SRC_URI += "git://github.com/pkg/diff;name=diff;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/pkg/diff;apply=no"
29
30SRCREV_color = "1c8d8706604ee5fb9a464e5097ba113101828a75"
31SRC_URI += "git://github.com/fatih/color;name=color;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/fatih/color"
32
33SRCREV_cobra = "e94f6d0dd9a5e5738dca6bce03c4b1207ffbc0ec"
34SRC_URI += "git://github.com/spf13/cobra;name=cobra;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/spf13/cobra"
35
36SRCREV_pflag = "5ca813443bd2a4d9f46a253ea0407d23b3790713"
37SRC_URI += "git://github.com/spf13/pflag;name=pflag;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/spf13/pflag"
38
39SRCREV_envsubst = "9df41d110e18f0ce5f7cd58f94d88d79dc441259"
40SRC_URI += "git://github.com/a8m/envsubst;name=envsubst;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/a8m/envsubst"
41
42SRCREV_go-json = "9872089c316cfe2d0f29b331b75d45bf6d522d96"
43SRC_URI += "git://github.com/goccy/go-json;name=go-json;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/goccy/go-json"
44
45SRCREV_go-yaml = "9b2c4569e2563d5cf2f16785b1fa2cab5e09882e"
46SRC_URI += "git://github.com/goccy/go-yaml;name=go-yaml;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/goccy/go-yaml"
47
48SRCREV_copier = "70b1d4e41a98ca3ef7f468ade5c515e4193405df"
49SRC_URI += "git://github.com/jinzhu/copier;name=copier;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/jinzhu/copier"
50
51SRCREV_go-logging.v1 = "b2cb9fa56473e98db8caba80237377e83fe44db5"
52SRC_URI += "git://github.com/op/go-logging;name=go-logging.v1;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/gopkg.in/op/go-logging.v1"
53
54SRCREV_repr = "3d05a4813c4bc97890471226ba1cf7f240a376ac"
55SRC_URI += "git://github.com/alecthomas/repr;name=repr;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/alecthomas/repr"
56
57SRCREV_gopher-lua = "1388221efeb4a239a053e5932c3d755699055684"
58SRC_URI += "git://github.com/yuin/gopher-lua;name=gopher-lua;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/yuin/gopher-lua"
59
60SRCREV_go-isatty = "a7c02353c47bc4ec6b30dc9628154ae4fe760c11"
61SRC_URI += "git://github.com/mattn/go-isatty;name=go-isatty;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/mattn/go-isatty"
62
63SRCREV_utfbom = "6ae8f945ca96f30defc7e8ab12ec5d10cf86ded4"
64SRC_URI += "git://github.com/dimchansky/utfbom;name=utfbom;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/dimchansky/utfbom"
65
66SRCREV_go-colorable = "11a925cff3d38c293ddc8c05a16b504e3e2c63be"
67SRC_URI += "git://github.com/mattn/go-colorable;name=go-colorable;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/mattn/go-colorable"
68
69SRCREV_go-toml-v2 = "b730b2be5d3ab7283067ddf61188f41cdf42ce06"
70SRC_URI += "git://github.com/pelletier/go-toml;name=go-toml-v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/pelletier/go-toml/v2"
71
72SRCREV_properties = "d8bdba35b511a72d4c00a47e801dc703328198e8"
73SRC_URI += "git://github.com/magiconair/properties;name=properties;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/magiconair/properties"
74
75SRCREV_orderedmap = "9d80274286972e4b495b38de2923a4d5f9758c8d"
76SRC_URI += "git://github.com/elliotchance/orderedmap;name=orderedmap;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/elliotchance/orderedmap"
77
78SRCREV_v2 = "bcbb39153e17f8018257f17aba8eac628d396b64"
79SRC_URI += "git://github.com/alecthomas/participle;name=v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/alecthomas/participle/v2"
80
81SRCREV_mousetrap = "4e8053ee7ef85a6bd26368364a6d27f1641c1d21"
82SRC_URI += "git://github.com/inconshreveable/mousetrap;name=mousetrap;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/inconshreveable/mousetrap"
83
84PV = "4.45.1+git"
85
86GO_IMPORT = "github.com/mikefarah/yq"
87export GO111MODULE = "off"
88
89inherit go ptest
72 90
73do_install_ptest() { 91do_install_ptest() {
74 install -d ${D}${PTEST_PATH}/tests 92 install -d ${D}${PTEST_PATH}/tests
75 cp -r ${S}/src/github.com/mikefarah/yq/scripts/* ${D}${PTEST_PATH}/tests 93 cp -r ${S}/src/${GO_IMPORT}/scripts/* ${D}${PTEST_PATH}/tests
76 cp -r ${S}/src/github.com/mikefarah/yq/acceptance_tests/* ${D}${PTEST_PATH}/tests 94 cp -r ${S}/src/${GO_IMPORT}/acceptance_tests/* ${D}${PTEST_PATH}/tests
77 cp -r ${S}/src/github.com/mikefarah/yq/examples ${D}${PTEST_PATH}/tests 95 cp -r ${S}/src/${GO_IMPORT}/examples ${D}${PTEST_PATH}/tests
78} 96}
79 97
80RDEPENDS:${PN}-ptest += " \ 98RDEPENDS:${PN}-ptest += " \
81 bash \ 99 bash \
82" 100"
83 101
102RDEPENDS:${PN}-dev += " \
103 bash \
104"
105
84BBCLASSEXTEND = "native" 106BBCLASSEXTEND = "native"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-05 10:13:13 +0000