Re: version upgrade to python-click - patch

Re: version upgrade to python-click - patch

[Felix Snow]

[-- Attachment #1: Type: text/plain, Size: 3317 bytes --]

Hello, 

Thanks for the reply, I have tried several times over the last few days to subscribe to the devel list so I can send the patch there but it doesn't seem to work, so sending it here instead. Patch is attached.

The changes worked as I applied them in our firmware, and I cloned your repo locally, carefully put the changes in and created the patch. Am not sure exactly how to test it from within your repo. If you can fire it up and put the following into the terminal:

python3 -c "import click; print(click.__version__)"

and it returns “7.0” then it is probably working. Would not hurt to do the same with python2. 

Regards,
Felix Snow

-----Ursprüngliche Nachricht-----
Von: Randy MacLeod [mailto:randy.macleod@windriver.com] 
Gesendet: Dienstag, 12. Februar 2019 19:06
An: Felix Snow <fsnow@phoenixcontact.com>; openembedded-core@lists.openembedded.org; openembedded-devel@lists.openembedded.org
Betreff: Re: [OE-core] version upgrade to python-click

On 2/12/19 5:02 AM, Felix Snow wrote:
> Hello,
> 
> it seems that the latest version of python-click in open-embedded is 6.7 :
> 
> https://layers.openembedded.org/layerindex/recipe/52136/
> 
> This was released in January 2017, but 7.0 came out in September 2018:
> 
> https://pypi.org/project/click/#history
> 
> I have had a considerable struggle with click on our embedded linux 
> around locale.
> 
> It was a hard requirement and there are were a lot of complaints prior 
> to version 7.0
> 
> Here are a few examples:
> 
> https://github.com/NixOS/nixpkgs/pull/41843
> 
> https://github.com/NixOS/nixpkgs/issues/40146
> 
> https://github.com/NixOS/nixpkgs/issues/38991
> 
> I believe they removed the hard dependency in this pull request -
> https://github.com/pallets/click/pull/880
> 
> which went into version 7.0
> 
> If you look at the code of that request there is very little which 
> fixes this, but it would probably still be cleaner at least long term 
> to have the newer version of click than to patch that in our system.  
> The locale issue is one of a long list of changes in 7.0 
> http://click.palletsprojects.com/en/7.x/changelog/

Thanks for pointing that out.

Can you update the recipe, test it and send a patch to:
    openembedded-devel@lists.openembedded.org
as per:
    https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

../Randy

> 
> Actually, click is not explicitly mentioned in the bb file, but 
> python-flask is, and that somehow installs click with it, I think as 
> there is another recipe for python-flask which includes click.
> 
> Cheers,
> 
> Felix
> 
> .......................................................................................
> 
> PHOENIX CONTACT Cyber Security GmbH
> 
> Richard-Willstätter-Straße 6
> 
> D-12489 Berlin
> 
> 　
> 
> Register Court: AG Charlottenburg, HR B 202908
> 
> Geschäftsführer/General Manager: Kilian Golm
> 
> //
> 


--
# Randy MacLeod
# Wind River Linux

.......................................................................................
PHOENIX CONTACT Cyber Security GmbH 
Richard-Willstätter-Straße 6  
D-12489 Berlin  
 
Register Court: AG Charlottenburg, HR B 202908 
Geschäftsführer/General Manager: Kilian Golm

[-- Attachment #2: 0001-upgrade-python-click-from-6.7-to-7.0.patch --]
[-- Type: application/octet-stream, Size: 2324 bytes --]

From 4942a0a8787c295f60a9d6f82e50e064552778c8 Mon Sep 17 00:00:00 2001
From: Felix Snow <fsnow@phoenixcontact.com>
Date: Tue, 19 Feb 2019 11:06:01 +0100
Subject: [PATCH] upgrade python-click from 6.7 to 7.0

---
 meta-python/recipes-devtools/python/python-click.inc              | 8 +++++---
 .../python/{python-click_6.7.bb => python-click_7.0.bb}           | 0
 .../python/{python3-click_6.7.bb => python3-click_7.0.bb}         | 0
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename meta-python/recipes-devtools/python/{python-click_6.7.bb => python-click_7.0.bb} (100%)
 rename meta-python/recipes-devtools/python/{python3-click_6.7.bb => python3-click_7.0.bb} (100%)

diff --git a/meta-python/recipes-devtools/python/python-click.inc b/meta-python/recipes-devtools/python/python-click.inc
index c81545b15..60bc46f82 100644
--- a/meta-python/recipes-devtools/python/python-click.inc
+++ b/meta-python/recipes-devtools/python/python-click.inc
@@ -6,10 +6,10 @@ Line Interface Creation Kit". It's highly configurable but comes with \
 sensible defaults out of the box."
 HOMEPAGE = "http://click.pocoo.org/"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=09e8b7869f94ba9e9a7b260d53c65dab"
+LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c13ed890b210a882c1778216694c98c7"
 
-SRC_URI[md5sum] = "fc4cc00c4863833230d3af92af48abd4"
-SRC_URI[sha256sum] = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"
+SRC_URI[md5sum] = "7f53d50f7b7373ebc7963f9ff697450a"
+SRC_URI[sha256sum] = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"
 
 UPSTREAM_CHECK_REGEX = "click/(?P<pver>\d+(\.\d+)+)/"
 
@@ -21,3 +21,5 @@ RDEPENDS_${PN} += "\
     "
 
 BBCLASSEXTEND = "native nativesdk"
+
+PYPI_PACKAGE = "Click"
diff --git a/meta-python/recipes-devtools/python/python-click_6.7.bb b/meta-python/recipes-devtools/python/python-click_7.0.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python-click_6.7.bb
rename to meta-python/recipes-devtools/python/python-click_7.0.bb
diff --git a/meta-python/recipes-devtools/python/python3-click_6.7.bb b/meta-python/recipes-devtools/python/python3-click_7.0.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-click_6.7.bb
rename to meta-python/recipes-devtools/python/python3-click_7.0.bb
-- 
2.11.0