Re: [PATCH] pylibfdt: Fix disable version normalization

2023-01-06 Thread Tom Rini
On Wed, Jan 04, 2023 at 03:43:33PM +0100, Philippe Schenker wrote:

> From: Philippe Schenker 
> 
> On Arch Linux based systems python setuptools does not contain
> "setuptools.extern" hence it is failing with the following
> error-message:
> "
> ModuleNotFoundError: No module named 'setuptools.extern'
> "
> 
> According to a eschwartz `setuptools.extern` is not a public API and
> shall not be assumed to be present in the setuptools package. He
> mentions that the setuptools project anyway wants to drop this. [1]
> 
> Use the correct solution introduced by python setuptools developers to
> disable normalization. [2]
> 
> [1] https://bbs.archlinux.org/viewtopic.php?id=259608
> [2] https://github.com/pypa/setuptools/pull/2026
> Fixes: 440098c42e73 ("pylibfdt: Fix version normalization warning")
> Signed-off-by: Philippe Schenker 
> Reviewed-by: Marek Vasut 
> Reviewed-by: Simon Glass 

Applied to u-boot/master, thanks!

-- 
Tom


signature.asc
Description: PGP signature


Re: [PATCH] pylibfdt: Fix disable version normalization

2023-01-05 Thread Philippe Schenker
On Wed, 2023-01-04 at 13:01 -0700, Simon Glass wrote:
> Hi Philippe,
> 
> On Wed, 4 Jan 2023 at 07:44, Philippe Schenker 
> wrote:
> > From: Philippe Schenker 
> > 
> > On Arch Linux based systems python setuptools does not contain
> > "setuptools.extern" hence it is failing with the following
> > error-message:
> > "
> > ModuleNotFoundError: No module named 'setuptools.extern'
> 
> Reviewed-by: Simon Glass 
> 
> What are you doing to create that error?

Sorry for the late answer. I hit this error as soon as I tried to build
U-Boot using "make *defconfig; make"

Regards,Philippe

> 
> Regards,
> Simon
> 
> 
> > "
> > 
> > According to a eschwartz `setuptools.extern` is not a public API
> > and
> > shall not be assumed to be present in the setuptools package. He
> > mentions that the setuptools project anyway wants to drop this. [1]
> > 
> > Use the correct solution introduced by python setuptools developers
> > to
> > disable normalization. [2]
> > 
> > [1] https://bbs.archlinux.org/viewtopic.php?id=259608
> > [2] https://github.com/pypa/setuptools/pull/2026
> > Fixes: 440098c42e73 ("pylibfdt: Fix version normalization warning")
> > Signed-off-by: Philippe Schenker 
> > 
> > ---
> > 
> >  scripts/dtc/pylibfdt/setup.py | 8 ++--
> >  1 file changed, 2 insertions(+), 6 deletions(-)
> > 
> > diff --git a/scripts/dtc/pylibfdt/setup.py
> > b/scripts/dtc/pylibfdt/setup.py
> > index 9abdb57595ad..c07f65e6bcaf 100755
> > --- a/scripts/dtc/pylibfdt/setup.py
> > +++ b/scripts/dtc/pylibfdt/setup.py
> > @@ -20,16 +20,12 @@ allows this script to be run stand-alone, e.g.:
> >  ./pylibfdt/setup.py install [--prefix=...]
> >  """
> > 
> > -from setuptools import setup, Extension
> > +from setuptools import setup, Extension, sic
> >  from setuptools.command.build_py import build_py as _build_py
> > -from setuptools.extern.packaging import version
> >  import os
> >  import re
> >  import sys
> > 
> > -# Disable version normalization
> > -version.Version = version.LegacyVersion
> > -
> >  srcdir = os.path.dirname(__file__)
> > 
> >  with open(os.path.join(srcdir, "../README"), "r") as fh:
> > @@ -141,7 +137,7 @@ class build_py(_build_py):
> > 
> >  setup(
> >  name='libfdt',
> > -version=version,
> > +version=sic(version),
> >  cmdclass = {'build_py' : build_py},
> >  author='Simon Glass',
> >  author_email='s...@chromium.org',
> > --
> > 2.39.0
> > 



Re: [PATCH] pylibfdt: Fix disable version normalization

2023-01-04 Thread Simon Glass
Hi Philippe,

On Wed, 4 Jan 2023 at 07:44, Philippe Schenker  wrote:
>
> From: Philippe Schenker 
>
> On Arch Linux based systems python setuptools does not contain
> "setuptools.extern" hence it is failing with the following
> error-message:
> "
> ModuleNotFoundError: No module named 'setuptools.extern'

Reviewed-by: Simon Glass 

What are you doing to create that error?

Regards,
Simon


> "
>
> According to a eschwartz `setuptools.extern` is not a public API and
> shall not be assumed to be present in the setuptools package. He
> mentions that the setuptools project anyway wants to drop this. [1]
>
> Use the correct solution introduced by python setuptools developers to
> disable normalization. [2]
>
> [1] https://bbs.archlinux.org/viewtopic.php?id=259608
> [2] https://github.com/pypa/setuptools/pull/2026
> Fixes: 440098c42e73 ("pylibfdt: Fix version normalization warning")
> Signed-off-by: Philippe Schenker 
>
> ---
>
>  scripts/dtc/pylibfdt/setup.py | 8 ++--
>  1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/dtc/pylibfdt/setup.py b/scripts/dtc/pylibfdt/setup.py
> index 9abdb57595ad..c07f65e6bcaf 100755
> --- a/scripts/dtc/pylibfdt/setup.py
> +++ b/scripts/dtc/pylibfdt/setup.py
> @@ -20,16 +20,12 @@ allows this script to be run stand-alone, e.g.:
>  ./pylibfdt/setup.py install [--prefix=...]
>  """
>
> -from setuptools import setup, Extension
> +from setuptools import setup, Extension, sic
>  from setuptools.command.build_py import build_py as _build_py
> -from setuptools.extern.packaging import version
>  import os
>  import re
>  import sys
>
> -# Disable version normalization
> -version.Version = version.LegacyVersion
> -
>  srcdir = os.path.dirname(__file__)
>
>  with open(os.path.join(srcdir, "../README"), "r") as fh:
> @@ -141,7 +137,7 @@ class build_py(_build_py):
>
>  setup(
>  name='libfdt',
> -version=version,
> +version=sic(version),
>  cmdclass = {'build_py' : build_py},
>  author='Simon Glass',
>  author_email='s...@chromium.org',
> --
> 2.39.0
>


Re: [PATCH] pylibfdt: Fix disable version normalization

2023-01-04 Thread Tom Rini
On Wed, Jan 04, 2023 at 03:51:08PM +0100, Marek Vasut wrote:
> On 1/4/23 15:43, Philippe Schenker wrote:
> > From: Philippe Schenker 
> > 
> > On Arch Linux based systems python setuptools does not contain
> > "setuptools.extern" hence it is failing with the following
> > error-message:
> > "
> > ModuleNotFoundError: No module named 'setuptools.extern'
> > "
> > 
> > According to a eschwartz `setuptools.extern` is not a public API and
> > shall not be assumed to be present in the setuptools package. He
> > mentions that the setuptools project anyway wants to drop this. [1]
> > 
> > Use the correct solution introduced by python setuptools developers to
> > disable normalization. [2]
> > 
> > [1] https://bbs.archlinux.org/viewtopic.php?id=259608
> > [2] https://github.com/pypa/setuptools/pull/2026
> > Fixes: 440098c42e73 ("pylibfdt: Fix version normalization warning")
> > Signed-off-by: Philippe Schenker 
> 
> Nice, thank you.
> 
> Reviewed-by: Marek Vasut 
> 
> +CC Tom, this should go into this 2023.01 release.

Yes, thanks. I saw a similar change via a GitHub PR that was on my list
to properly resubmit.

-- 
Tom


signature.asc
Description: PGP signature


Re: [PATCH] pylibfdt: Fix disable version normalization

2023-01-04 Thread Marek Vasut

On 1/4/23 15:43, Philippe Schenker wrote:

From: Philippe Schenker 

On Arch Linux based systems python setuptools does not contain
"setuptools.extern" hence it is failing with the following
error-message:
"
ModuleNotFoundError: No module named 'setuptools.extern'
"

According to a eschwartz `setuptools.extern` is not a public API and
shall not be assumed to be present in the setuptools package. He
mentions that the setuptools project anyway wants to drop this. [1]

Use the correct solution introduced by python setuptools developers to
disable normalization. [2]

[1] https://bbs.archlinux.org/viewtopic.php?id=259608
[2] https://github.com/pypa/setuptools/pull/2026
Fixes: 440098c42e73 ("pylibfdt: Fix version normalization warning")
Signed-off-by: Philippe Schenker 


Nice, thank you.

Reviewed-by: Marek Vasut 

+CC Tom, this should go into this 2023.01 release.


[PATCH] pylibfdt: Fix disable version normalization

2023-01-04 Thread Philippe Schenker
From: Philippe Schenker 

On Arch Linux based systems python setuptools does not contain
"setuptools.extern" hence it is failing with the following
error-message:
"
ModuleNotFoundError: No module named 'setuptools.extern'
"

According to a eschwartz `setuptools.extern` is not a public API and
shall not be assumed to be present in the setuptools package. He
mentions that the setuptools project anyway wants to drop this. [1]

Use the correct solution introduced by python setuptools developers to
disable normalization. [2]

[1] https://bbs.archlinux.org/viewtopic.php?id=259608
[2] https://github.com/pypa/setuptools/pull/2026
Fixes: 440098c42e73 ("pylibfdt: Fix version normalization warning")
Signed-off-by: Philippe Schenker 

---

 scripts/dtc/pylibfdt/setup.py | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/dtc/pylibfdt/setup.py b/scripts/dtc/pylibfdt/setup.py
index 9abdb57595ad..c07f65e6bcaf 100755
--- a/scripts/dtc/pylibfdt/setup.py
+++ b/scripts/dtc/pylibfdt/setup.py
@@ -20,16 +20,12 @@ allows this script to be run stand-alone, e.g.:
 ./pylibfdt/setup.py install [--prefix=...]
 """
 
-from setuptools import setup, Extension
+from setuptools import setup, Extension, sic
 from setuptools.command.build_py import build_py as _build_py
-from setuptools.extern.packaging import version
 import os
 import re
 import sys
 
-# Disable version normalization
-version.Version = version.LegacyVersion
-
 srcdir = os.path.dirname(__file__)
 
 with open(os.path.join(srcdir, "../README"), "r") as fh:
@@ -141,7 +137,7 @@ class build_py(_build_py):
 
 setup(
 name='libfdt',
-version=version,
+version=sic(version),
 cmdclass = {'build_py' : build_py},
 author='Simon Glass',
 author_email='s...@chromium.org',
-- 
2.39.0