[meta-python] python3-termcolor: Use setuptools instead of distutils

Message ID 20220228224810.218466-1-raj.khem@gmail.com
State New
Headers show
Series [meta-python] python3-termcolor: Use setuptools instead of distutils | expand

Commit Message

Khem Raj Feb. 28, 2022, 10:48 p.m. UTC
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Justin Bronder <jsbronder@cold-front.org>
---
 ...-Use-setuptools-instead-of-distutils.patch | 27 +++++++++++++++++++
 .../python/python3-termcolor_1.1.0.bb         |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch

Comments

Justin Bronder Feb. 28, 2022, 10:56 p.m. UTC | #1
So, am I right to stand corrected that patching stagnant projects to use
distutils over setuptools is preferable to dropping the recipe?  I had assumed
from other distribution work that cleaning things out when the opportunity arose
was the norm.  If so, I'll stop trying to figure out if upstream is active and
will fix the package along with sending patch upstream.

Regardless,

Signed-off-by: Justin Bronder <jsbronder@cold-front.org>

On 28/02/22 14:48 -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Justin Bronder <jsbronder@cold-front.org>
> ---
>  ...-Use-setuptools-instead-of-distutils.patch | 27 +++++++++++++++++++
>  .../python/python3-termcolor_1.1.0.bb         |  3 ++-
>  2 files changed, 29 insertions(+), 1 deletion(-)
>  create mode 100644 meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch
> 
> diff --git a/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch b/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch
> new file mode 100644
> index 0000000000..a55a6a914b
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch
> @@ -0,0 +1,27 @@
> +From e30308284c721210e2ba50d8b3d159cedf5eada8 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Mon, 28 Feb 2022 14:44:42 -0800
> +Subject: [PATCH] setup.py: Use setuptools instead of distutils
> +
> +Upstream-Status: Pending
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + setup.py | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/setup.py b/setup.py
> +index c4fe4ed..dad1d29 100755
> +--- a/setup.py
> ++++ b/setup.py
> +@@ -23,7 +23,7 @@
> + # Author: Konstantin Lepa <konstantin.lepa@gmail.com>
> + 
> + import os
> +-from distutils.core import setup
> ++from setuptools import setup
> + 
> + prjdir = os.path.dirname(__file__)
> + 
> +-- 
> +2.35.1
> +
> diff --git a/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb b/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb
> index 17df7f983d..15bab622a6 100644
> --- a/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb
> @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=809e8749b63567978acfbd81d9f6a27d"
>  
>  inherit pypi setuptools3
>  
> -SRC_URI[md5sum] = "043e89644f8909d462fbbfa511c768df"
> +SRC_URI += "file://0001-setup.py-Use-setuptools-instead-of-distutils.patch"
> +
>  SRC_URI[sha256sum] = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"
>  
>  BBCLASSEXTEND = "native"
> -- 
> 2.35.1
>
Khem Raj Feb. 28, 2022, 11:14 p.m. UTC | #2
On Mon, Feb 28, 2022 at 2:56 PM Justin Bronder <jsbronder@cold-front.org> wrote:
>
> So, am I right to stand corrected that patching stagnant projects to use
> distutils over setuptools is preferable to dropping the recipe?  I had assumed
> from other distribution work that cleaning things out when the opportunity arose
> was the norm.  If so, I'll stop trying to figure out if upstream is active and
> will fix the package along with sending patch upstream.

you are doing the right thing and removal is on cards. These recipes
were however added in 2019 and 2020 into OE
so I thought of giving an opportunity to original submitters to
comment before we can remove them.

>
> Regardless,
>
> Signed-off-by: Justin Bronder <jsbronder@cold-front.org>
>
> On 28/02/22 14:48 -0800, Khem Raj wrote:
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > Cc: Justin Bronder <jsbronder@cold-front.org>
> > ---
> >  ...-Use-setuptools-instead-of-distutils.patch | 27 +++++++++++++++++++
> >  .../python/python3-termcolor_1.1.0.bb         |  3 ++-
> >  2 files changed, 29 insertions(+), 1 deletion(-)
> >  create mode 100644 meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch
> >
> > diff --git a/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch b/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch
> > new file mode 100644
> > index 0000000000..a55a6a914b
> > --- /dev/null
> > +++ b/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch
> > @@ -0,0 +1,27 @@
> > +From e30308284c721210e2ba50d8b3d159cedf5eada8 Mon Sep 17 00:00:00 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Mon, 28 Feb 2022 14:44:42 -0800
> > +Subject: [PATCH] setup.py: Use setuptools instead of distutils
> > +
> > +Upstream-Status: Pending
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +---
> > + setup.py | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/setup.py b/setup.py
> > +index c4fe4ed..dad1d29 100755
> > +--- a/setup.py
> > ++++ b/setup.py
> > +@@ -23,7 +23,7 @@
> > + # Author: Konstantin Lepa <konstantin.lepa@gmail.com>
> > +
> > + import os
> > +-from distutils.core import setup
> > ++from setuptools import setup
> > +
> > + prjdir = os.path.dirname(__file__)
> > +
> > +--
> > +2.35.1
> > +
> > diff --git a/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb b/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb
> > index 17df7f983d..15bab622a6 100644
> > --- a/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb
> > +++ b/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb
> > @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=809e8749b63567978acfbd81d9f6a27d"
> >
> >  inherit pypi setuptools3
> >
> > -SRC_URI[md5sum] = "043e89644f8909d462fbbfa511c768df"
> > +SRC_URI += "file://0001-setup.py-Use-setuptools-instead-of-distutils.patch"
> > +
> >  SRC_URI[sha256sum] = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"
> >
> >  BBCLASSEXTEND = "native"
> > --
> > 2.35.1
> >
>
> --
> Justin Bronder
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95607): https://lists.openembedded.org/g/openembedded-devel/message/95607
> Mute This Topic: https://lists.openembedded.org/mt/89463744/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch b/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch
new file mode 100644
index 0000000000..a55a6a914b
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch
@@ -0,0 +1,27 @@ 
+From e30308284c721210e2ba50d8b3d159cedf5eada8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 28 Feb 2022 14:44:42 -0800
+Subject: [PATCH] setup.py: Use setuptools instead of distutils
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index c4fe4ed..dad1d29 100755
+--- a/setup.py
++++ b/setup.py
+@@ -23,7 +23,7 @@
+ # Author: Konstantin Lepa <konstantin.lepa@gmail.com>
+ 
+ import os
+-from distutils.core import setup
++from setuptools import setup
+ 
+ prjdir = os.path.dirname(__file__)
+ 
+-- 
+2.35.1
+
diff --git a/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb b/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb
index 17df7f983d..15bab622a6 100644
--- a/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb
@@ -6,7 +6,8 @@  LIC_FILES_CHKSUM = "file://COPYING.txt;md5=809e8749b63567978acfbd81d9f6a27d"
 
 inherit pypi setuptools3
 
-SRC_URI[md5sum] = "043e89644f8909d462fbbfa511c768df"
+SRC_URI += "file://0001-setup.py-Use-setuptools-instead-of-distutils.patch"
+
 SRC_URI[sha256sum] = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"
 
 BBCLASSEXTEND = "native"