[PATCH 1/2] python3-astor: Upgrade 0.7.1->0.8.0

[PATCH 1/2] python3-astor: Upgrade 0.7.1->0.8.0

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python/{python3-astor_0.7.1.bb => python3-astor_0.8.0.bb}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-astor_0.7.1.bb => python3-astor_0.8.0.bb} (100%)

diff --git a/meta-python/recipes-devtools/python/python3-astor_0.7.1.bb b/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-astor_0.7.1.bb
rename to meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
-- 
2.20.1

[PATCH 2/2] python3-astor: Fix issue with new version of setuptools

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python3-astor/fix-new-setuptools.patch     | 18 ++++++++++++++++++
 .../python/python3-astor_0.8.0.bb              |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch

diff --git a/meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch b/meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch
new file mode 100644
index 000000000..90defe25c
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch
@@ -0,0 +1,18 @@
+New versions of setuptools can't parse this expression. We know our python versions
+match so just remove it until upstream fixes it.
+
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+Upstream-Status: Pending
+
+Index: git/setup.cfg
+===================================================================
+--- git.orig/setup.cfg
++++ git/setup.cfg
+@@ -34,7 +34,6 @@ classifiers =
+ zip_safe = True
+ include_package_data = True
+ packages = find:
+-python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+ 
+ [options.packages.find]
+ exclude = tests
diff --git a/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb b/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
index c2dc9245c..97dbdbbea 100644
--- a/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
@@ -4,7 +4,8 @@ SECTION = "devel/python"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=561205fdabc3ec52cae2d30815b8ade7"
 
-SRC_URI = "git://github.com/berkerpeksag/astor.git"
+SRC_URI = "git://github.com/berkerpeksag/astor.git \
+           file://fix-new-setuptools.patch"
 SRCREV ?= "4ca3a26e52f08678854c2841cd0fdf223461e47d"
 
 inherit setuptools3
-- 
2.20.1

Re: [PATCH 1/2] python3-astor: Upgrade 0.7.1->0.8.0

[Khem Raj]

Hi Richard

This also needed SRCREV bump, so I have actually staged a fix with
that change as well.

On Wed, Oct 23, 2019 at 10:17 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  .../python/{python3-astor_0.7.1.bb => python3-astor_0.8.0.bb}     | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename meta-python/recipes-devtools/python/{python3-astor_0.7.1.bb => python3-astor_0.8.0.bb} (100%)
>
> diff --git a/meta-python/recipes-devtools/python/python3-astor_0.7.1.bb b/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
> similarity index 100%
> rename from meta-python/recipes-devtools/python/python3-astor_0.7.1.bb
> rename to meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [PATCH 2/2] python3-astor: Fix issue with new version of setuptools

[Khem Raj]

Hi Richard

there is a upstream proposed fix as pointed by Adrian which I picked instead

On Wed, Oct 23, 2019 at 10:17 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  .../python3-astor/fix-new-setuptools.patch     | 18 ++++++++++++++++++
>  .../python/python3-astor_0.8.0.bb              |  3 ++-
>  2 files changed, 20 insertions(+), 1 deletion(-)
>  create mode 100644 meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch
>
> diff --git a/meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch b/meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch
> new file mode 100644
> index 000000000..90defe25c
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch
> @@ -0,0 +1,18 @@
> +New versions of setuptools can't parse this expression. We know our python versions
> +match so just remove it until upstream fixes it.
> +
> +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> +Upstream-Status: Pending
> +
> +Index: git/setup.cfg
> +===================================================================
> +--- git.orig/setup.cfg
> ++++ git/setup.cfg
> +@@ -34,7 +34,6 @@ classifiers =
> + zip_safe = True
> + include_package_data = True
> + packages = find:
> +-python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
> +
> + [options.packages.find]
> + exclude = tests
> diff --git a/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb b/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
> index c2dc9245c..97dbdbbea 100644
> --- a/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
> @@ -4,7 +4,8 @@ SECTION = "devel/python"
>  LICENSE = "BSD-3-Clause"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=561205fdabc3ec52cae2d30815b8ade7"
>
> -SRC_URI = "git://github.com/berkerpeksag/astor.git"
> +SRC_URI = "git://github.com/berkerpeksag/astor.git \
> +           file://fix-new-setuptools.patch"
>  SRCREV ?= "4ca3a26e52f08678854c2841cd0fdf223461e47d"
>
>  inherit setuptools3
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel