summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Gamblin <tgamblin@baylibre.com>2023-05-09 11:55:26 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-11 17:08:29 +0100
commit1f6815e2109841861454ea0fe9d9c13033ce950c (patch)
tree3cff6051010befad48ecdd3613e0a79356c9acdc
parenta54cb25905a4b1447517da30cf456c50c916e14b (diff)
downloadpoky-1f6815e2109841861454ea0fe9d9c13033ce950c.tar.gz
python3-calver: Add recipe
calver is "a setuptools extension for automatically defining your Python package version as a calendar version." It is required for python3-trove-classifiers (another new recipe), which in turn is required for the upgrade of python3-hatchling from 1.13.0 to work. (From OE-Core rev: 79ed4fcad6bd49c269ada3ab99ca4548aaf34e99) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/conf/distro/include/ptest-packagelists.inc1
-rw-r--r--meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch32
-rw-r--r--meta/recipes-devtools/python/python3-calver/run-ptest3
-rw-r--r--meta/recipes-devtools/python/python3-calver_2022.6.26.bb28
5 files changed, 65 insertions, 0 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index a4fa2b4389..395c187c1b 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -607,6 +607,7 @@ RECIPE_MAINTAINER:pn-python3-attrs = "Tim Orling <tim.orling@konsulko.com>"
607RECIPE_MAINTAINER:pn-python3-babel = "Tim Orling <tim.orling@konsulko.com>" 607RECIPE_MAINTAINER:pn-python3-babel = "Tim Orling <tim.orling@konsulko.com>"
608RECIPE_MAINTAINER:pn-python3-bcrypt = "Tim Orling <tim.orling@konsulko.com>" 608RECIPE_MAINTAINER:pn-python3-bcrypt = "Tim Orling <tim.orling@konsulko.com>"
609RECIPE_MAINTAINER:pn-python3-build = "Ross Burton <ross.burton@arm.com>" 609RECIPE_MAINTAINER:pn-python3-build = "Ross Burton <ross.burton@arm.com>"
610RECIPE_MAINTAINER:pn-python3-calver = "Trevor Gamblin <tgamblin@baylibre.com>"
610RECIPE_MAINTAINER:pn-python3-certifi = "Tim Orling <tim.orling@konsulko.com>" 611RECIPE_MAINTAINER:pn-python3-certifi = "Tim Orling <tim.orling@konsulko.com>"
611RECIPE_MAINTAINER:pn-python3-cffi = "Tim Orling <tim.orling@konsulko.com>" 612RECIPE_MAINTAINER:pn-python3-cffi = "Tim Orling <tim.orling@konsulko.com>"
612RECIPE_MAINTAINER:pn-python3-chardet = "Tim Orling <tim.orling@konsulko.com>" 613RECIPE_MAINTAINER:pn-python3-chardet = "Tim Orling <tim.orling@konsulko.com>"
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
index 33a72d3eb8..faa9bd6983 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -56,6 +56,7 @@ PTESTS_FAST = "\
56 popt \ 56 popt \
57 python3-atomicwrites \ 57 python3-atomicwrites \
58 python3-bcrypt \ 58 python3-bcrypt \
59 python3-calver \
59 python3-hypothesis \ 60 python3-hypothesis \
60 python3-jinja2 \ 61 python3-jinja2 \
61 python3-jsonpointer \ 62 python3-jsonpointer \
diff --git a/meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch b/meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch
new file mode 100644
index 0000000000..43f8a78ef0
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch
@@ -0,0 +1,32 @@
1From 390a233ed969f82b2ef209b23bfb523e785603f9 Mon Sep 17 00:00:00 2001
2From: Trevor Gamblin <tgamblin@baylibre.com>
3Date: Tue, 9 May 2023 10:19:41 -0400
4Subject: [PATCH] setup.py: hard-code version
5
6setup.py is pulling the build version from the current date rather than
7a release tag or other predictable method, causing reproducibility
8issues in builds. Patch this to make reproducible builds work while
9discussing this with upstream maintainer (or developing a patch that can
10make calver rely on a more standard pyproject.toml solution).
11
12Upstream-Status: Inappropriate (configuration)
13
14Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
15---
16 setup.py | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/setup.py b/setup.py
20index 73f6b10..2e27cf1 100644
21--- a/setup.py
22+++ b/setup.py
23@@ -42,5 +42,5 @@ setup(
24 "use_calver = calver.integration:version",
25 ],
26 },
27- version=calver_version(True),
28+ version=calver_version("2022.6.26"),
29 )
30--
312.40.0
32
diff --git a/meta/recipes-devtools/python/python3-calver/run-ptest b/meta/recipes-devtools/python/python3-calver/run-ptest
new file mode 100644
index 0000000000..8d2017d39c
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-calver/run-ptest
@@ -0,0 +1,3 @@
1#!/bin/sh
2
3pytest --automake
diff --git a/meta/recipes-devtools/python/python3-calver_2022.6.26.bb b/meta/recipes-devtools/python/python3-calver_2022.6.26.bb
new file mode 100644
index 0000000000..58b33f19ff
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-calver_2022.6.26.bb
@@ -0,0 +1,28 @@
1SUMMARY = "Setuptools extension for CalVer package versions"
2HOMEPAGE = "https://github.com/di/calver"
3LICENSE = "Apache-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
5
6SRC_URI = " \
7 git://github.com/di/calver;branch=master;protocol=https \
8 file://run-ptest \
9 file://0001-setup.py-hard-code-version.patch \
10"
11SRCREV = "3268d8acf2c345f32a1c5f08ba25dc67f76cca81"
12
13inherit python_setuptools_build_meta ptest
14
15S = "${WORKDIR}/git"
16
17RDEPENDS:${PN}-ptest += " \
18 ${PYTHON_PN}-pretend \
19 ${PYTHON_PN}-pytest \
20 ${PYTHON_PN}-unittest-automake-output \
21"
22
23do_install_ptest() {
24 install -d ${D}${PTEST_PATH}/tests
25 cp -rf ${S}/tests ${D}${PTEST_PATH}/
26}
27
28BBCLASSEXTEND = "native nativesdk"