mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

asciidoc: properly detect and compare Python versions >= 3.10

Browse Source 
asciidoc.py cannot properly detect versions of Python >= 3.10

Backport patch from upstream to correct this:

44d2d60952

Fixed upstream in version 9.04, so this patch is not required in master.

(From OE-Core rev: da3bd5e0934b6462ae53225a58305235849b32d5)

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Steve Sakoman
2022-01-07 04:24:13 -10:00
committed by Richard Purdie
parent d62ff88963
commit e2aa712775
2 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
meta/recipes-extended/asciidoc/asciidoc/detect-python-version.patch Normal file
View File

@@ -0,0 +1,42 @@
From 44d2d6095246124c024230f89c1029794491839f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 30 Oct 2020 15:10:35 +0100
Subject: [PATCH] Properly detect and compare Python version 3.10+ (#151)
Upstream commit: https://github.com/asciidoc-py/asciidoc-py/commit/44d2d6095246124c024230f89c1029794491839f
Slightly modified to cleanly apply to asciidoc 8.6.9:
- VERSION and MIN_PYTHON_VERSION changed to reflect values in 8.6.9
- line numbers corrected to eliminate offset warnings
Upstream-Status: Backport
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
asciidoc.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/asciidoc.py b/asciidoc.py
index f960e7d8..42868c4b 100755
--- a/asciidoc.py
+++ b/asciidoc.py
@@ -30,7 +30,7 @@
# Used by asciidocapi.py #
VERSION = '8.6.10' # See CHANGELOG file for version history.
-MIN_PYTHON_VERSION = '3.4' # Require this version of Python or better.
+MIN_PYTHON_VERSION = (3, 4) # Require this version of Python or better.
# ---------------------------------------------------------------------------
# Program constants.
@@ -4704,8 +4704,8 @@ def init(self, cmd):
directory.
cmd is the asciidoc command or asciidoc.py path.
"""
- if float(sys.version[:3]) < float(MIN_PYTHON_VERSION):
- message.stderr('FAILED: Python %s or better required' % MIN_PYTHON_VERSION)
+ if sys.version_info[:2] < MIN_PYTHON_VERSION:
+ message.stderr('FAILED: Python %d.%d or better required' % MIN_PYTHON_VERSION)
sys.exit(1)
if not os.path.exists(cmd):
message.stderr('FAILED: Missing asciidoc command: %s' % cmd)

3
meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
View File

@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"
SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main \
file://auto-catalogs.patch"
file://auto-catalogs.patch \
file://detect-python-version.patch"
SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
PV .= "+py3-git${SRCPV}"