[bug#60132] [PATCH 1/3] patman: remove extraneous imports

[bug#60132] [PATCH 1/3] patman: remove extraneous imports

[Maxim Cournoyer]

* tools/patman/main.py: Remove extraneous imports and fix indentation.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
---

 tools/patman/main.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/patman/main.py b/tools/patman/main.py
index 5a7756a221..8067a288ab 100755
--- a/tools/patman/main.py
+++ b/tools/patman/main.py
@@ -9,7 +9,6 @@
 from argparse import ArgumentParser
 import os
 import re
-import shutil
 import sys
 import traceback
 
@@ -19,7 +18,6 @@ if __name__ == "__main__":
     sys.path.append(os.path.join(our_path, '..'))
 
 # Our modules
-from patman import command
 from patman import control
 from patman import gitutil
 from patman import project
@@ -136,7 +134,6 @@ if not args.debug:
 
 # Run our meagre tests
 if args.cmd == 'test':
-    import doctest
     from patman import func_test
 
     result = test_util.run_test_suites(
@@ -183,7 +180,7 @@ elif args.cmd == 'status':
                                  args.show_comments, args.patchwork_url)
     except Exception as e:
         terminal.tprint('patman: %s: %s' % (type(e).__name__, e),
-                       colour=terminal.Color.RED)
+                        colour=terminal.Color.RED)
         if args.debug:
             print()
             traceback.print_exc()

base-commit: 9bd3d354a1a0712ac27c717df9ad60566b0406ee
-- 
2.38.1

[bug#60133] [PATCH 2/3] patman: fix installation of README.rst data file

[Maxim Cournoyer]

This fixes a regression introduced in commit 74df491051d6 ("buildman:
Convert documentation to rST").

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
---

 tools/patman/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/patman/setup.py b/tools/patman/setup.py
index 43fdc00ce6..ce9bb4aa63 100644
--- a/tools/patman/setup.py
+++ b/tools/patman/setup.py
@@ -7,6 +7,6 @@ setup(name='patman',
       scripts=['patman'],
       packages=['patman'],
       package_dir={'patman': ''},
-      package_data={'patman': ['README']},
+      package_data={'patman': ['README.rst']},
       classifiers=['Environment :: Console',
                    'Topic :: Software Development'])
-- 
2.38.1

[bug#60133] [PATCH 2/3] patman: fix installation of README.rst data file

[Simon Glass]

On Fri, 16 Dec 2022 at 18:45, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
>
> This fixes a regression introduced in commit 74df491051d6 ("buildman:
> Convert documentation to rST").
>
> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
> ---
>
>  tools/patman/setup.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

[bug#60132] [PATCH 2/3] patman: fix installation of README.rst data file

[Simon Glass]

On Fri, 16 Dec 2022 at 18:45, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
>
> This fixes a regression introduced in commit 74df491051d6 ("buildman:
> Convert documentation to rST").
>
> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
> ---
>
>  tools/patman/setup.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm/next, thanks!

[bug#60134] [PATCH 3/3] patman: locate README.rst via importlib

[Maxim Cournoyer]

Rationale: this is more robust than assumptions about the file
hierarchy layout of the installation of patman, for example on non
file-hierarchy standard (FHS) systems such as Guix System or Nix OS.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
---

 tools/patman/main.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/patman/main.py b/tools/patman/main.py
index 8067a288ab..2a2a7eaa24 100755
--- a/tools/patman/main.py
+++ b/tools/patman/main.py
@@ -7,6 +7,7 @@
 """See README for more information"""
 
 from argparse import ArgumentParser
+import importlib.resources
 import os
 import re
 import sys
@@ -160,11 +161,8 @@ elif args.cmd == 'send':
         fd.close()
 
     elif args.full_help:
-        tools.print_full_help(
-            os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])),
-                         'README.rst')
-        )
-
+        with importlib.resources.path('patman', 'README.rst') as readme:
+            tools.print_full_help(str(readme))
     else:
         # If we are not processing tags, no need to warning about bad ones
         if not args.process_tags:
-- 
2.38.1

[bug#60134] [PATCH 3/3] patman: locate README.rst via importlib

[Simon Glass]

On Fri, 16 Dec 2022 at 18:45, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
>
> Rationale: this is more robust than assumptions about the file
> hierarchy layout of the installation of patman, for example on non
> file-hierarchy standard (FHS) systems such as Guix System or Nix OS.
>
> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
> ---
>
>  tools/patman/main.py | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

[bug#60132] [PATCH 3/3] patman: locate README.rst via importlib

[Simon Glass]

On Fri, 16 Dec 2022 at 18:45, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
>
> Rationale: this is more robust than assumptions about the file
> hierarchy layout of the installation of patman, for example on non
> file-hierarchy standard (FHS) systems such as Guix System or Nix OS.
>
> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
> ---
>
>  tools/patman/main.py | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm/next, thanks!

[bug#60132] [PATCH 1/3] patman: remove extraneous imports

[Simon Glass]

On Fri, 16 Dec 2022 at 18:45, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
>
> * tools/patman/main.py: Remove extraneous imports and fix indentation.
>
> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
> ---
>
>  tools/patman/main.py | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

[bug#60132] [PATCH 1/3] patman: remove extraneous imports

[Simon Glass]

On Fri, 16 Dec 2022 at 18:45, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
>
> * tools/patman/main.py: Remove extraneous imports and fix indentation.
>
> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
> ---
>
>  tools/patman/main.py | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm/next, thanks!