From bd6bf732efadbcb7598ccb644c417d6e070f7f58 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 9 Feb 2021 21:35:54 -0500
Subject: newrelic: update to 6.0.1.155

Along with the version bump, we tweak the LICENSE checksum, since the
file changed locations in the repository.

We also add a patch to setup.py to allow the version of setuptools_scm
in oe-core to satisfy the build requirements.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 ...y-tweak-setuptools_scm-version-dependency.patch | 32 ++++++++++++++++++++++
 .../python/python3-newrelic_5.14.1.144.bb          | 19 -------------
 .../python/python3-newrelic_6.0.1.155.bb           | 23 ++++++++++++++++
 3 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 recipes-devtools/python/python3-newrelic/0001-setup.py-tweak-setuptools_scm-version-dependency.patch
 delete mode 100644 recipes-devtools/python/python3-newrelic_5.14.1.144.bb
 create mode 100644 recipes-devtools/python/python3-newrelic_6.0.1.155.bb

(limited to 'recipes-devtools/python')

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
new file mode 100644
index 00000000..7ec705bc
--- /dev/null
+++ b/recipes-devtools/python/python3-newrelic/0001-setup.py-tweak-setuptools_scm-version-dependency.patch
@@ -0,0 +1,32 @@
+From a61cea5053730f8180eb1fc8b4cb0f94ff4fc176 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Tue, 9 Feb 2021 21:31:19 -0500
+Subject: [PATCH] setup.py: tweak setuptools_scm version dependency
+
+The version dependency of <4 isn't showing any issues in builds.
+The oe-core version is 5+, and carrying a secondary version is
+not trivial or something we want to do.
+
+So we tweak the version to accept what we have in oe-core.
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index ade43a9..889a74f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -132,7 +132,7 @@ kwargs = dict(
+             "git_describe_command": "git describe --dirty --tags --long --match *.*.*.*",
+             "write_to": "newrelic/version.txt",
+         },
+-        setup_requires=["setuptools_scm>=3.2,<4"],
++        setup_requires=["setuptools_scm>=3.2"],
+         description = "New Relic Python Agent",
+         long_description = open(readme_file).read(),
+         url = "https://newrelic.com/docs/python/new-relic-for-python",
+-- 
+2.19.1
+
diff --git a/recipes-devtools/python/python3-newrelic_5.14.1.144.bb b/recipes-devtools/python/python3-newrelic_5.14.1.144.bb
deleted file mode 100644
index 42e87d33..00000000
--- a/recipes-devtools/python/python3-newrelic_5.14.1.144.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-HOMEPAGE = "http://www.newrelic.com"
-SUMMARY = "New Relic Python Agent"
-DESCRIPTION = "\
-  Python agent for the New Relic web application performance monitoring \
-  service. Check the release notes for what has changed in this version. \
-  "
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause & MIT & Python-2.0 & BSD-2-Clause & NewRelic"
-LIC_FILES_CHKSUM = "file://newrelic/LICENSE;md5=b4840908dbb9e62b3d8891e77187b34f"
-
-SRC_URI[md5sum] = "53115aea6cbdf0e2721279c230230600"
-SRC_URI[sha256sum] = "340ebcdb0dd08bfb597c71598d6d8f746a93f7e4921f10b3616c9142c608a14d"
-
-inherit pypi setuptools3
-
-FILES_${PN}-dbg += "\
-  ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/*/.debug \
-  ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/packages/*/.debug/ \
-  "
diff --git a/recipes-devtools/python/python3-newrelic_6.0.1.155.bb b/recipes-devtools/python/python3-newrelic_6.0.1.155.bb
new file mode 100644
index 00000000..f79c99ca
--- /dev/null
+++ b/recipes-devtools/python/python3-newrelic_6.0.1.155.bb
@@ -0,0 +1,23 @@
+HOMEPAGE = "http://www.newrelic.com"
+SUMMARY = "New Relic Python Agent"
+DESCRIPTION = "\
+  Python agent for the New Relic web application performance monitoring \
+  service. Check the release notes for what has changed in this version. \
+  "
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause & MIT & Python-2.0 & BSD-2-Clause & NewRelic"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9"
+
+SRC_URI[md5sum] = "0acf701c37ceb590e2a12d358ced16d7"
+SRC_URI[sha256sum] = "e96689fc75eb2b1591903ad9e74225f5e1da734afcd3151d318c53f6635b5dda"
+
+inherit pypi setuptools3
+
+DEPENDS += "python3-setuptools-scm-native"
+
+SRC_URI += "file://0001-setup.py-tweak-setuptools_scm-version-dependency.patch"
+
+FILES_${PN}-dbg += "\
+  ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/*/.debug \
+  ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/packages/*/.debug/ \
+  "
-- 
cgit v1.2.3-54-g00ecf