Remove patman from the U-Boot tree
v2 cover Remove patman from the U-Boot tree
patman is now maintained as a standalone 'patch-manager' package, so remove it from the tree. The command becomes a stub that tells people to run 'pip install patch-manager'.
buildman still imports the shared modules commit and patchstream (along with their dependencies), so this series leaves those in place. It drops the tool's code, tests, CI hooks and packaging, and removes the in-tree documentation, moving the b4 contributor guide alongside the patman note in the patch-sending docs. It also adds a .patman-defaults file so the external tool is set up for U-Boot, next to the existing .b4-config. Where the CI jobs relied on patman's requirements for the setuptools that pylibfdt needs, they now install scripts/dtc/pylibfdt/requirements.txt instead.
More could be done here: commit and patchstream (and their dependencies series, get_maintainer and settings) only remain because buildman still imports them. A follow-up could move those into u_boot_pylib (or buildman itself) and drop the rest, leaving tools/patman as just the stub.
Note: I was unable to run this through CI as it is not working at present. I will check it in a few days.
Changes in v2:
- New patch: move the b4 guide into sending_patches.rst
- Remove the patman manual outright instead of leaving a stub
- Add a couple of lines on how patman works to the sending guide
- Point the SPI howto at the sending guide instead of the patman package
- New patch: add a .patman-defaults file for the external patman tool
- New patch, split from 'CI: Stop building and testing patman', to add scripts/dtc/pylibfdt/requirements.txt for setuptools
- Drop the 'u_boot_pylib: Require setuptools' patch
- Put the documentation and .patman-defaults patches at the front of the series
Simon Glass (11):
doc: Move the b4 guide into sending_patches
doc: Remove the patman documentation
patman: Add a .patman-defaults file for U-Boot
patman: Replace the tool with a stub for patch-manager
patman: Remove the test suite
patman: Remove the patch-management code
CI: Install pylibfdt's requirements in the tool jobs
CI: Stop building and testing patman
tools: docker: Drop patman from the CI image
tools: Stop packaging patman as a pip module
test: Stop running the patman tests
.azure-pipelines.yml | 9 +- .gitlab-ci.yml | 13 +- .patman-defaults | 32 + Makefile | 1 - doc/develop/codingstyle.rst | 48 - doc/develop/driver-model/spi-howto.rst | 4 +- doc/develop/index.rst | 1 - doc/develop/patman.rst | 1 - doc/develop/sending_patches.rst | 63 +- doc/develop/testing.rst | 2 +- scripts/make_pip.sh | 10 +- test/run | 1 - tools/binman/pyproject.toml | 2 +- tools/docker/Dockerfile | 2 - tools/patman/README.rst | 1 - tools/patman/__init__.py | 5 +- tools/patman/__main__.py | 68 +- tools/patman/checkpatch.py | 287 -- tools/patman/cmdline.py | 516 --- tools/patman/control.py | 333 -- tools/patman/cser_helper.py | 1524 ------- tools/patman/cseries.py | 1165 ------ tools/patman/database.py | 823 ---- tools/patman/func_test.py | 1342 ------ tools/patman/patchwork.py | 852 ---- tools/patman/patman.rst | 1023 ----- tools/patman/project.py | 27 - tools/patman/pyproject.toml | 29 - tools/patman/pytest.ini | 2 - tools/patman/requirements.txt | 6 - tools/patman/send.py | 197 - tools/patman/setup.py | 11 - tools/patman/status.py | 405 -- tools/patman/test/0000-cover-letter.patch | 23 - .../0001-pci-Correct-cast-for-sandbox.patch | 51 - ...-for-sandbox-in-fdtdec_setup_mem_siz.patch | 85 - tools/patman/test/test01.txt | 72 - tools/patman/test_checkpatch.py | 526 --- tools/patman/test_common.py | 254 -- tools/patman/test_cseries.py | 3684 ----------------- tools/patman/test_settings.py | 67 - 41 files changed, 134 insertions(+), 13433 deletions(-) create mode 100644 .patman-defaults delete mode 120000 doc/develop/patman.rst delete mode 120000 tools/patman/README.rst delete mode 100644 tools/patman/checkpatch.py delete mode 100644 tools/patman/cmdline.py delete mode 100644 tools/patman/control.py delete mode 100644 tools/patman/cser_helper.py delete mode 100644 tools/patman/cseries.py delete mode 100644 tools/patman/database.py delete mode 100644 tools/patman/func_test.py delete mode 100644 tools/patman/patchwork.py delete mode 100644 tools/patman/patman.rst delete mode 100644 tools/patman/project.py delete mode 100644 tools/patman/pyproject.toml delete mode 100644 tools/patman/pytest.ini delete mode 100644 tools/patman/requirements.txt delete mode 100644 tools/patman/send.py delete mode 100644 tools/patman/setup.py delete mode 100644 tools/patman/status.py delete mode 100644 tools/patman/test/0000-cover-letter.patch delete mode 100644 tools/patman/test/0001-pci-Correct-cast-for-sandbox.patch delete mode 100644 tools/patman/test/0002-fdt-Correct-cast-for-sandbox-in-fdtdec_setup_mem_siz.patch delete mode 100644 tools/patman/test/test01.txt delete mode 100644 tools/patman/test_checkpatch.py delete mode 100644 tools/patman/test_common.py delete mode 100644 tools/patman/test_cseries.py delete mode 100644 tools/patman/test_settings.py
---
base-commit: 2569e25ddd5aa323cd87c7a3819c3a4f4b32302f
branch: patm2
Signature · 1 line
2.43.0
PATCH v2 1/11 doc: Move the b4 guide into sending_patches
The b4 contributor guide sits in the coding-style document, which is an odd place for it. Move it into sending_patches.rst, next to the patman note, so both patch-sending tools are described together.
The b4_contrib label moves with it, so the reference from process.rst still resolves.
---
Changes in v2:
- New patch: move the b4 guide into sending_patches.rst
doc/develop/codingstyle.rst | 48 ------------------------------- doc/develop/sending_patches.rst | 51 +++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 48 deletions(-)
doc/develop/codingstyle.rst +0 -48
@@ -24,54 +24,6 @@ The following rules apply: <https://peps.python.org/pep-0008/>`_. Use `pylint <https://github.com/pylint-dev/pylint>`_ for checking the code. -.. _b4_contrib: - -* Use the `b4 <https://b4.docs.kernel.org/en/latest/>`__ tool to prepare and - send your patches. b4 has become the preferred tool to sending patches for many - Linux kernel contributors, and U-Boot ships with a ready-to-use ``.b4-config`` that - targets ``[email protected]`` and integrates with ``scripts/get_maintainer.pl`` for - recipient discovery. - - Start a topical series with ``b4 prep`` and keep the commits organised with - ``git rebase -i``. ``b4 prep --edit-cover`` opens an editor for the cover - letter, while ``b4 prep --auto-to-cc`` collects reviewers and maintainers from - both the configuration file and ``scripts/get_maintainer.pl``. - - .. code-block:: bash - - b4 prep -n mmc-fixes - git rebase -i origin/master - b4 prep --edit-cover - b4 prep --auto-to-cc - - Run the style checks before sending. ``b4 prep --check`` wraps the existing - tooling so you see the output from ``scripts/checkpatch.pl`` alongside b4's - own validation. You can always invoke ``scripts/checkpatch.pl`` directly for - additional runs. - - .. code-block:: bash - - b4 prep --check - - When the series is ready, use ``b4 send``. Begin with ``--dry-run`` to review - the generated emails and ``--reflect`` to copy yourself for records before - dispatching to ``[email protected]``. - - .. code-block:: bash - - b4 send --dry-run - b4 send --reflect - b4 send - - After reviews arrive, collect Acked-by/Tested-by tags with ``b4 trailers -u`` - and fold them into your commits before resending the updated series. - - .. code-block:: bash - - b4 trailers -u - git rebase -i origin/master - b4 send - * Run ``scripts/checkpatch.pl`` directly or via ``b4 prep --check`` so that all issues are resolved *before* posting on the mailing list. For more information, read :doc:`checkpatch`.
doc/develop/sending_patches.rst +51 -0
57 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v2 01/11] doc: Move the b4 guide into sending_patches
Quoted 8 lines · Simon Glass
The b4 contributor guide sits in the coding-style document, which is an odd place for it. Move it into
sending_patches.rst, next to the patman note, so both patch-sending tools are described together.The
b4_contriblabel moves with it, so the reference fromprocess.rststill resolves.Signed-off-by Simon Glass <[email protected]>
Signature · 1 line
Tom
Re: [PATCH v2 01/11] doc: Move the b4 guide into sending_patches
In reply to Simon GlassHi Simon,
Thank you for the patch.
Quoted 8 lines · Simon Glass
The b4 contributor guide sits in the coding-style document, which is an odd place for it. Move it into
sending_patches.rst, next to the patman note, so both patch-sending tools are described together.The
b4_contriblabel moves with it, so the reference fromprocess.rststill resolves.Signed-off-by Simon Glass <[email protected]>
PATCH v2 2/11 doc: Remove the patman documentation
In reply to Simon GlassThe full patman manual now lives with the standalone patch-manager package, making the 1000-line copy in the tree redundant.
Remove the in-tree manual, its README and the doc/develop/patman.rst toctree page.
The sending-patches guide already introduces patman, so point it at the patch-manager package instead of the now-dead ':doc:' cross-reference and, with the manual gone, add a couple of lines on how the tool works. Point the SPI howto at that guide too, rather than repeating the install details.
---
Changes in v2:
- Remove the patman manual outright instead of leaving a stub
- Add a couple of lines on how patman works to the sending guide
- Point the SPI howto at the sending guide instead of the patman package
doc/develop/driver-model/spi-howto.rst | 4 +- doc/develop/index.rst | 1 - doc/develop/patman.rst | 1 - doc/develop/sending_patches.rst | 12 +- tools/patman/README.rst | 1 - tools/patman/patman.rst | 1023 ------------------------ 6 files changed, 11 insertions(+), 1031 deletions(-) delete mode 120000 doc/develop/patman.rst delete mode 120000 tools/patman/README.rst delete mode 100644 tools/patman/patman.rst
doc/develop/driver-model/spi-howto.rst +2 -2
@@ -649,8 +649,8 @@ board. Prepare patches and send them to the mailing lists -------------------------------------------------- -You can use 'tools/patman/patman' to prepare, check and send patches for -your work. See tools/patman/README for details. +You can prepare, check and send patches for your work using the tools described +in :doc:`/develop/sending_patches`. A little note about SPI uclass features ---------------------------------------
doc/develop/index.rst +0 -1
@@ -16,7 +16,6 @@ General docstyle kconfig memory - patman process release_cycle security
doc/develop/patman.rst deleted +0 -1
@@ -1 +0,0 @@ -../../tools/patman/patman.rst
doc/develop/sending_patches.rst +9 -3
@@ -73,9 +73,15 @@ Using patman You can use a tool called patman to prepare, check and send patches. It creates change logs, cover letters and patch notes. It also simplifies the process of -sending multiple versions of a series. - -See more details at :doc:`patman`. +sending multiple versions of a series. patman is driven by tags in your commit +messages, and can collect Reviewed-by and other tags from patchwork when you +send a new version. It can optionally keep a local database of all your series, +tracking each version and their review / applied status over time, so you can +easily track upstreaming progress. + +patman now lives outside the U-Boot tree; install it with +``pip install patch-manager``. See the +`patman documentation <https://deinde.dev/patman>`_ for details. General Patch Submission Rules ------------------------------
tools/patman/README.rst deleted +0 -1
@@ -1 +0,0 @@ -patman.rst
tools/patman/patman.rst deleted +0 -1023
1,023 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v2 02/11] doc: Remove the patman documentation
Quoted 6 lines · Simon Glass
The full patman manual now lives with the standalone patch-manager package, making the 1000-line copy in the tree redundant.
Remove the in-tree manual, its README and the
doc/develop/patman.rsttoctree page.
Quoted 7 lines
The sending-patches guide already introduces patman, so point it at the patch-manager package instead of the now-dead ':doc:' cross-reference and, with the manual gone, add a couple of lines on how the tool works. Point the SPI howto at that guide too, rather than repeating the install details.
Signed-off-by Simon Glass <[email protected]>
Signature · 1 line
Tom
Re: [PATCH v2 02/11] doc: Remove the patman documentation
In reply to Simon GlassHi Simon,
Thank you for the patch.
Quoted 6 lines · Simon Glass
The full patman manual now lives with the standalone patch-manager package, making the 1000-line copy in the tree redundant.
Remove the in-tree manual, its README and the
doc/develop/patman.rsttoctree page.
Quoted 7 lines
The sending-patches guide already introduces patman, so point it at the patch-manager package instead of the now-dead ':doc:' cross-reference and, with the manual gone, add a couple of lines on how the tool works. Point the SPI howto at that guide too, rather than repeating the install details.
Signed-off-by Simon Glass <[email protected]>
PATCH v2 3/11 patman: Add a .patman-defaults file for U-Boot
In reply to Simon Glasspatman is now installed from the separate patch-manager package. It reads a .patman-defaults file from the tree root as its lowest-priority config, so a project can ship defaults that developers still override from their own ~/.patman, a local .patman or the command line. This behaviour is new in patman version 0.0.20
Add one for U-Boot, alongside .b4-config, pinning the patchwork server and the get_maintainer.pl invocation so the tool works out of the box without depending on patman's built-in defaults. A few other settings are listed, commented out, as a starting point.
---
Changes in v2:
- New patch: add a .patman-defaults file for the external patman tool
.patman-defaults | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .patman-defaults
.patman-defaults new file +32 -0
@@ -0,0 +1,32 @@ +# Default patman settings for the U-Boot tree +# +# patman is maintained separately; install it with: +# pip install patch-manager +# +# See https://deinde.dev/patman +# +# patman reads this file at the lowest priority, so anything set here is a +# default that you can override in your own ~/.patman, in a local .patman or +# on the command line. patman autodetects the U-Boot project and locates +# scripts/get_maintainer.pl on its own; the patchwork server and get-maintainer +# script are pinned here so U-Boot does not depend on patman's built-in +# defaults in case those change. + +[settings] +patchwork_url: https://patchwork.ozlabs.org +get_maintainer_script: scripts/get_maintainer.pl --norolestats + +# Other settings you might set here as project defaults: +# process_tags: True +# add_signoff: True +# check_patch: True +# verbose: False +# smtp_server: /path/to/sendmail + +# Aliases are recursive and are usually kept per-user in ~/.patman: +# [alias] +# me: Your Name <[email protected]> + +# Addresses known to bounce can be dropped from the recipient list: +# [bounces] +# someone: A Name <[email protected]>
Signature · 1 line
2.43.0
Re: [PATCH v2 03/11] patman: Add a .patman-defaults file for U-Boot
Quoted 6 lines · Simon Glass
patman is now installed from the separate patch-manager package. It reads a .patman-defaults file from the tree root as its lowest-priority config, so a project can ship defaults that developers still override from their own ~/.patman, a local .patman or the command line. This behaviour is new in patman version 0.0.20
Quoted 6 lines
Add one for U-Boot, alongside .b4-config, pinning the patchwork server and the get_maintainer.pl invocation so the tool works out of the box without depending on patman's built-in defaults. A few other settings are listed, commented out, as a starting point.
Signed-off-by Simon Glass <[email protected]>
Signature · 1 line
Tom
PATCH v2 4/11 patman: Replace the tool with a stub for patch-manager
In reply to Simon Glasspatman is now maintained as a standalone 'patch-manager' package, rather than in the U-Boot tree. Replace the command with a small stub which tells people how to install it.
buildman still uses the shared modules commit and patchstream (and their dependencies), so leave those in place; the patches that follow remove the patch-management code itself.
---
(no changes since v1)
tools/patman/__main__.py | 68 +++++++++++++--------------------------- 1 file changed, 21 insertions(+), 47 deletions(-)
tools/patman/__main__.py +21 -47
@@ -4,56 +4,30 @@ # Copyright (c) 2011 The Chromium OS Authors. # -"""See README for more information""" +"""Stub for the former in-tree patman tool -import os -import sys - -# Allow 'from patman import xxx to work' -# pylint: disable=C0413 -our_path = os.path.dirname(os.path.realpath(__file__)) -sys.path.append(os.path.join(our_path, '..')) - -# Our modules -from u_boot_pylib import test_util -from u_boot_pylib import tout -from patman import cmdline -from patman import control - - -def run_patman(): - """Run patamn +patman is now maintained as a standalone 'patch-manager' package, rather +than living in the U-Boot tree. This stub just tells the user how to get +it. +""" - This is the main program. It collects arguments and runs either the tests or - the control module. - """ - args = cmdline.parse_args() - - if not args.debug: - sys.tracebacklimit = 0 - - tout.init(tout.INFO if args.verbose else tout.WARNING) - - # Run our reasonably good tests - if args.cmd == 'test': - # pylint: disable=C0415 - from patman import func_test - from patman import test_checkpatch - from patman import test_cseries +import sys - to_run = args.testname if args.testname not in [None, 'test'] else None - result = test_util.run_test_suites( - 'patman', False, args.verbose, args.no_capture, - args.test_preserve_dirs, None, to_run, None, - [test_checkpatch.TestPatch, func_test.TestFunctional, 'settings', - test_cseries.TestCseries]) - sys.exit(0 if result.wasSuccessful() else 1) - # Process commits, produce patches files, check them, email them - else: - exit_code = control.do_patman(args) - sys.exit(exit_code) +def main(): + """Print instructions for installing the patch-manager package""" + print( + 'patman is no longer part of U-Boot. It is now maintained as a\n' + "separate package called 'patch-manager'.\n" + '\n' + 'Install it with:\n' + '\n' + ' pip install patch-manager\n' + '\n' + 'Documentation: https://deinde.dev/patman\n', + file=sys.stderr) + return 1 -if __name__ == "__main__": - sys.exit(run_patman()) +if __name__ == '__main__': + sys.exit(main())
Signature · 1 line
2.43.0
PATCH v2 5/11 patman: Remove the test suite
In reply to Simon GlassThese tests cover the patch-management functionality, which is being removed from the tree in favour of the standalone patch-manager package. Drop the tests and their data files.
---
(no changes since v1)
tools/patman/func_test.py | 1342 ------ tools/patman/pytest.ini | 2 - tools/patman/test/0000-cover-letter.patch | 23 - .../0001-pci-Correct-cast-for-sandbox.patch | 51 - ...-for-sandbox-in-fdtdec_setup_mem_siz.patch | 85 - tools/patman/test/test01.txt | 72 - tools/patman/test_checkpatch.py | 526 --- tools/patman/test_common.py | 254 -- tools/patman/test_cseries.py | 3684 ----------------- tools/patman/test_settings.py | 67 - 10 files changed, 6106 deletions(-) delete mode 100644 tools/patman/func_test.py delete mode 100644 tools/patman/pytest.ini delete mode 100644 tools/patman/test/0000-cover-letter.patch delete mode 100644 tools/patman/test/0001-pci-Correct-cast-for-sandbox.patch delete mode 100644 tools/patman/test/0002-fdt-Correct-cast-for-sandbox-in-fdtdec_setup_mem_siz.patch delete mode 100644 tools/patman/test/test01.txt delete mode 100644 tools/patman/test_checkpatch.py delete mode 100644 tools/patman/test_common.py delete mode 100644 tools/patman/test_cseries.py delete mode 100644 tools/patman/test_settings.py
tools/patman/func_test.py deleted +0 -1342
@@ -1,1342 +0,0 @@ -# -*- coding: utf-8 -*- -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright 2017 Google, Inc -# - -"""Functional tests for checking that patman behaves correctly""" - -import asyncio -import contextlib -import os -import pathlib -import re -import shutil -import sys -import unittest - -import pygit2 - -from u_boot_pylib import command -from u_boot_pylib import gitutil -from u_boot_pylib import terminal -from u_boot_pylib import tools - -from patman.commit import Commit -from patman import control -from patman import patchstream -from patman.patchstream import PatchStream -from patman import patchwork -from patman import send -from patman.series import Series -from patman import status -from patman.test_common import TestCommon - -PATMAN_DIR = pathlib.Path(__file__).parent -TEST_DATA_DIR = PATMAN_DIR / 'test/' - - [email protected] -def directory_excursion(directory): - """Change directory to `directory` for a limited to the context block.""" - current = os.getcwd() - try: - os.chdir(directory) - yield - finally: - os.chdir(current) - - -class TestFunctional(unittest.TestCase, TestCommon): - """Functional tests for checking that patman behaves correctly""" - fred = 'Fred Bloggs <[email protected]>' - joe = 'Joe Bloggs <[email protected]>' - mary = 'Mary Bloggs <[email protected]>' - commits = None - patches = None - - def setUp(self): - TestCommon.setUp(self) - self.repo = None - self._patman_pathname = sys.argv[0] - self._patman_dir = os.path.dirname(os.path.realpath(sys.argv[0])) - - def tearDown(self): - TestCommon.tearDown(self) - - @staticmethod - def _get_path(fname): - """Get the path to a test file - - Args: - fname (str): Filename to obtain - - Returns: - str: Full path to file in the test directory - """ - return TEST_DATA_DIR / fname - - @classmethod - def _get_text(cls, fname): - """Read a file as text - - Args: - fname (str): Filename to read - - Returns: - str: Contents of file - """ - return open(cls._get_path(fname), encoding='utf-8').read() - - @classmethod - def _get_patch_name(cls, subject): - """Get the filename of a patch given its subject - - Args: - subject (str): Patch subject - - Returns: - str: Filename for that patch - """ - fname = re.sub('[ :]', '-', subject) - return fname.replace('--', '-') - - def _create_patches_for_test(self, series): - """Create patch files for use by tests - - This copies patch files from the test directory as needed by the series - - Args: - series (Series): Series containing commits to convert - - Returns: - tuple: - str: Cover-letter filename, or None if none - fname_list: list of str, each a patch filename - """ - cover_fname = None - fname_list = [] - for i, commit in enumerate(series.commits): - clean_subject = self._get_patch_name(commit.subject) - src_fname = '%04d-%s.patch' % (i + 1, clean_subject[:52]) - fname = os.path.join(self.tmpdir, src_fname) - shutil.copy(self._get_path(src_fname), fname) - fname_list.append(fname) - if series.get('cover'): - src_fname = '0000-cover-letter.patch' - cover_fname = os.path.join(self.tmpdir, src_fname) - fname = os.path.join(self.tmpdir, src_fname) - shutil.copy(self._get_path(src_fname), fname) - - return cover_fname, fname_list - - def test_basic(self): - """Tests the basic flow of patman - - This creates a series from some hard-coded patches build from a simple - tree with the following metadata in the top commit: - - Series-to: u-boot - Series-prefix: RFC - Series-postfix: some-branch - Series-cc: Stefan Brüns <[email protected]> - Cover-letter-cc: Lord Mëlchett <[email protected]> - Series-version: 3 - Patch-cc: fred - Series-process-log: sort, uniq - Series-changes: 4 - - Some changes - - Multi - line - change - - Commit-changes: 2 - - Changes only for this commit - - Cover-changes: 4 - - Some notes for the cover letter - - Cover-letter: - test: A test patch series - This is a test of how the cover - letter - works - END - - and this in the first commit: - - Commit-changes: 2 - - second revision change - - Series-notes: - some notes - about some things - from the first commit - END - - Commit-notes: - Some notes about - the first commit - END - - with the following commands: - - git log -n2 --reverse >/path/to/tools/patman/test/test01.txt - git format-patch --subject-prefix RFC --cover-letter HEAD~2 - mv 00* /path/to/tools/patman/test - - It checks these aspects: - - git log can be processed by patchstream - - emailing patches uses the correct command - - CC file has information on each commit - - cover letter has the expected text and subject - - each patch has the correct subject - - dry-run information prints out correctly - - unicode is handled correctly - - Series-to, Series-cc, Series-prefix, Series-postfix, Cover-letter - - Cover-letter-cc, Series-version, Series-changes, Series-notes - - Commit-notes - """ - process_tags = True - ignore_bad_tags = False - stefan = (b'Stefan Br\xc3\xbcns <[email protected]>' - .decode('utf-8')) - rick = 'Richard III <[email protected]>' - mel = b'Lord M\xc3\xablchett <[email protected]>'.decode('utf-8') - add_maintainers = [stefan, rick] - dry_run = True - in_reply_to = mel - count = 2 - alias = { - 'fdt': ['simon'], - 'u-boot': ['[email protected]'], - 'simon': [self.leb], - 'fred': [self.fred], - 'joe': [self.joe], - } - - text = self._get_text('test01.txt') - series = patchstream.get_metadata_for_test(text) - series.base_commit = Commit('1a44532') - series.branch = 'mybranch' - cover_fname, args = self._create_patches_for_test(series) - get_maintainer_script = str(pathlib.Path(__file__).parent.parent.parent - / 'get_maintainer.pl') + ' --norolestats' - with terminal.capture() as out: - patchstream.fix_patches(series, args) - if cover_fname and series.get('cover'): - patchstream.insert_cover_letter(cover_fname, series, count) - series.DoChecks() - cc_file = series.MakeCcFile(process_tags, cover_fname, - not ignore_bad_tags, add_maintainers, - None, get_maintainer_script, alias) - cmd = gitutil.email_patches( - series, cover_fname, args, dry_run, not ignore_bad_tags, - cc_file, alias, in_reply_to=in_reply_to, thread=None) - series.ShowActions(args, cmd, process_tags, alias) - cc_lines = tools.read_file(cc_file, binary=False).splitlines() - os.remove(cc_file) - - itr = iter(out[0].getvalue().splitlines()) - self.assertEqual('Cleaned %s patches' % len(series.commits), - next(itr)) - self.assertEqual('Change log missing for v2', next(itr)) - self.assertEqual('Change log missing for v3', next(itr)) - self.assertEqual('Change log for unknown version v4', next(itr)) - self.assertEqual("Alias 'pci' not found", next(itr)) - while next(itr) != 'Cc processing complete': - pass - self.assertIn('Dry run', next(itr)) - self.assertEqual('', next(itr)) - self.assertIn('Send a total of %d patches' % count, next(itr)) - prev = next(itr) - for i in range(len(series.commits)): - self.assertEqual(' %s' % args[i], prev) - while True: - prev = next(itr) - if 'Cc:' not in prev: - break - self.assertEqual('To: [email protected]', prev) - self.assertEqual('Cc: %s' % stefan, next(itr)) - self.assertEqual('Version: 3', next(itr)) - self.assertEqual('Prefix:\t RFC', next(itr)) - self.assertEqual('Postfix:\t some-branch', next(itr)) - self.assertEqual('Cover: 4 lines', next(itr)) - self.assertEqual(' Cc: %s' % self.fred, next(itr)) - self.assertEqual(' Cc: %s' % self.joe, next(itr)) - self.assertEqual(' Cc: %s' % self.leb, - next(itr)) - self.assertEqual(' Cc: %s' % mel, next(itr)) - self.assertEqual(' Cc: %s' % rick, next(itr)) - expected = ('Git command: git send-email --annotate ' - '--in-reply-to="%s" --to [email protected] ' - '--cc "%s" --cc-cmd "%s send --cc-cmd %s" %s %s' - % (in_reply_to, stefan, sys.argv[0], cc_file, cover_fname, - ' '.join(args))) - self.assertEqual(expected, next(itr)) - - self.assertEqual(('%s %s\0%s' % (args[0], rick, stefan)), cc_lines[0]) - self.assertEqual( - '%s %s\0%s\0%s\0%s\0%s' % (args[1], self.fred, self.joe, self.leb, - rick, stefan), - cc_lines[1]) - - expected = ''' -This is a test of how the cover -letter -works - -some notes -about some things -from the first commit - -Changes in v4: -- Multi - line - change -- Some changes -- Some notes for the cover letter -- fdt: Correct cast for sandbox in fdtdec_setup_mem_size_base() - -Simon Glass (2): - pci: Correct cast for sandbox - fdt: Correct cast for sandbox in fdtdec_setup_mem_size_base() - - cmd/pci.c | 3 ++- - fs/fat/fat.c | 1 + - lib/efi_loader/efi_memory.c | 1 + - lib/fdtdec.c | 3 ++- - 4 files changed, 6 insertions(+), 2 deletions(-) - ---\x20 -2.7.4 - -base-commit: 1a44532 -branch: mybranch -''' - lines = tools.read_file(cover_fname, binary=False).splitlines() - self.assertEqual( - 'Subject: [RFC PATCH some-branch v3 0/2] test: A test patch series', - lines[3]) - self.assertEqual(expected.splitlines(), lines[7:]) - - for i, fname in enumerate(args): - lines = tools.read_file(fname, binary=False).splitlines() - subject = [line for line in lines if line.startswith('Subject')] - self.assertEqual('Subject: [RFC %d/%d]' % (i + 1, count), - subject[0][:18]) - - # Check that we got our commit notes - start = 0 - expected = '' - - if i == 0: - start = 17 - expected = '''--- -Some notes about -the first commit - -(no changes since v2) - -Changes in v2: -- second revision change''' - elif i == 1: - start = 17 - expected = '''--- - -Changes in v4: -- Multi - line - change -- New -- Some changes - -Changes in v2: -- Changes only for this commit''' - - if expected: - expected = expected.splitlines() - self.assertEqual(expected, lines[start:(start+len(expected))]) - - def test_base_commit(self): - """Test adding a base commit with no cover letter""" - orig_text = self._get_text('test01.txt') - pos = orig_text.index( - 'commit 5ab48490f03051875ab13d288a4bf32b507d76fd') - text = orig_text[:pos] - series = patchstream.get_metadata_for_test(text) - series.base_commit = Commit('1a44532') - series.branch = 'mybranch' - cover_fname, args = self._create_patches_for_test(series) - self.assertFalse(cover_fname) - with terminal.capture() as out: - patchstream.fix_patches(series, args, insert_base_commit=True) - self.assertEqual('Cleaned 1 patch\n', out[0].getvalue()) - lines = tools.read_file(args[0], binary=False).splitlines() - pos = lines.index('-- ') - - # We expect these lines at the end: - # -- (with trailing space) - # 2.7.4 - # (empty) - # base-commit: xxx - # branch: xxx - self.assertEqual('base-commit: 1a44532', lines[pos + 3]) - self.assertEqual('branch: mybranch', lines[pos + 4]) - - def test_branch(self): - """Test creating patches from a branch""" - repo = self.make_git_tree() - target = repo.lookup_reference('refs/heads/first') - # pylint doesn't seem to find this - # pylint: disable=E1101 - self.repo.checkout(target, strategy=pygit2.GIT_CHECKOUT_FORCE) - control.setup() - orig_dir = os.getcwd() - try: - os.chdir(self.tmpdir) - - # Check that it can detect the current branch - self.assertEqual(2, gitutil.count_commits_to_branch(None)) - col = terminal.Color() - with terminal.capture() as _: - _, cover_fname, patch_files = send.prepare_patches( - col, branch=None, count=-1, start=0, end=0, - ignore_binary=False, signoff=True) - self.assertIsNone(cover_fname) - self.assertEqual(2, len(patch_files)) - - # Check that it can detect a different branch - self.assertEqual(3, gitutil.count_commits_to_branch('second')) - with terminal.capture() as _: - _, cover_fname, patch_files = send.prepare_patches( - col, branch='second', count=-1, start=0, end=0, - ignore_binary=False, signoff=True) - self.assertIsNotNone(cover_fname) - self.assertEqual(3, len(patch_files)) - - cover = tools.read_file(cover_fname, binary=False) - lines = cover.splitlines()[-2:] - base = repo.lookup_reference('refs/heads/base').target - self.assertEqual(f'base-commit: {base}', lines[0]) - self.assertEqual('branch: second', lines[1]) - - # Make sure that the base-commit is not present when it is in the - # cover letter - for fname in patch_files: - self.assertNotIn(b'base-commit:', tools.read_file(fname)) - - # Check that it can skip patches at the end - with terminal.capture() as _: - _, cover_fname, patch_files = send.prepare_patches( - col, branch='second', count=-1, start=0, end=1, - ignore_binary=False, signoff=True) - self.assertIsNotNone(cover_fname) - self.assertEqual(2, len(patch_files)) - - cover = tools.read_file(cover_fname, binary=False) - lines = cover.splitlines()[-2:] - base2 = repo.lookup_reference('refs/heads/second') - ref = base2.peel(pygit2.GIT_OBJ_COMMIT).parents[0].parents[0].id - self.assertEqual(f'base-commit: {ref}', lines[0]) - self.assertEqual('branch: second', lines[1]) - finally: - os.chdir(orig_dir) - - def test_custom_get_maintainer_script(self): - """Validate that a custom get_maintainer script gets used.""" - self.make_git_tree() - with directory_excursion(self.tmpdir): - # Setup git. - os.environ['GIT_CONFIG_GLOBAL'] = '/dev/null' - os.environ['GIT_CONFIG_SYSTEM'] = '/dev/null' - tools.run('git', 'config', 'user.name', 'Dummy') - tools.run('git', 'config', 'user.email', '[email protected]') - tools.run('git', 'branch', 'upstream') - tools.run('git', 'branch', '--set-upstream-to=upstream') - - # Setup patman configuration. - tools.write_file('.patman', '[settings]\n' - 'get_maintainer_script: dummy-script.sh\n' - 'check_patch: False\n' - 'add_maintainers: True\n', binary=False) - tools.write_file('dummy-script.sh', - '#!/usr/bin/env python3\n' - 'print("[email protected]")\n', binary=False) - os.chmod('dummy-script.sh', 0x555) - tools.run('git', 'add', '.') - tools.run('git', 'commit', '-m', 'new commit') - - # Finally, do the test - with terminal.capture(): - output = tools.run(PATMAN_DIR / 'patman', '--dry-run') - # Assert the email address is part of the dry-run - # output. - self.assertIn('[email protected]', output) - - def test_tags(self): - """Test collection of tags in a patchstream""" - text = '''This is a patch - -Signed-off-by: Terminator -Reviewed-by: %s -Reviewed-by: %s -Tested-by: %s -''' % (self.joe, self.mary, self.leb) - pstrm = PatchStream.process_text(text) - self.assertEqual(pstrm.commit.rtags, { - 'Reviewed-by': {self.joe, self.mary}, - 'Tested-by': {self.leb}}) - - def test_invalid_tag(self): - """Test invalid tag in a patchstream""" - text = '''This is a patch - -Serie-version: 2 -''' - with self.assertRaises(ValueError) as exc: - PatchStream.process_text(text) - self.assertEqual("Line 3: Invalid tag = 'Serie-version: 2'", - str(exc.exception)) - - def test_missing_end(self): - """Test a missing END tag""" - text = '''This is a patch - -Cover-letter: -This is the title -missing END after this line -Signed-off-by: Fred -''' - pstrm = PatchStream.process_text(text) - self.assertEqual(["Missing 'END' in section 'cover'"], - pstrm.commit.warn) - - def test_missing_blank_line(self): - """Test a missing blank line after a tag""" - text = '''This is a patch - -Series-changes: 2 -- First line of changes -- Missing blank line after this line -Signed-off-by: Fred -''' - pstrm = PatchStream.process_text(text) - self.assertEqual(["Missing 'blank line' in section 'Series-changes'"], - pstrm.commit.warn) - - def test_invalid_commit_tag(self): - """Test an invalid Commit-xxx tag""" - text = '''This is a patch - -Commit-fred: testing -''' - pstrm = PatchStream.process_text(text) - self.assertEqual(["Line 3: Ignoring Commit-fred"], pstrm.commit.warn) - - def test_self_test(self): - """Test a tested by tag by this user""" - test_line = 'Tested-by: %[email protected]' % os.getenv('USER') - text = '''This is a patch - -%s -''' % test_line - pstrm = PatchStream.process_text(text) - self.assertEqual(["Ignoring '%s'" % test_line], pstrm.commit.warn) - - def test_space_before_tab(self): - """Test a space before a tab""" - text = '''This is a patch - -+ \tSomething -''' - pstrm = PatchStream.process_text(text) - self.assertEqual(["Line 3/0 has space before tab"], pstrm.commit.warn) - - def test_lines_after_test(self): - """Test detecting lines after TEST= line""" - text = '''This is a patch - -TEST=sometest -more lines -here -''' - pstrm = PatchStream.process_text(text) - self.assertEqual(["Found 2 lines after TEST="], pstrm.commit.warn) - - def test_blank_line_at_end(self): - """Test detecting a blank line at the end of a file""" - text = '''This is a patch - -diff --git a/lib/fdtdec.c b/lib/fdtdec.c -index c072e54..942244f 100644 ---- a/lib/fdtdec.c -+++ b/lib/fdtdec.c -@@ -1200,7 +1200,8 @@ int fdtdec_setup_mem_size_base(void) - \t} - - \tgd->ram_size = (phys_size_t)(res.end - res.start + 1); -- debug("%s: Initial DRAM size %llx\n", __func__, (u64)gd->ram_size); -+ debug("%s: Initial DRAM size %llx\n", __func__, -+ (unsigned long long)gd->ram_size); -+ -diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c - --- -2.7.4 - - ''' - pstrm = PatchStream.process_text(text) - self.assertEqual( - ["Found possible blank line(s) at end of file 'lib/fdtdec.c'"], - pstrm.commit.warn) - - def test_no_upstream(self): - """Test CountCommitsToBranch when there is no upstream""" - repo = self.make_git_tree() - target = repo.lookup_reference('refs/heads/base') - # pylint doesn't seem to find this - # pylint: disable=E1101 - self.repo.checkout(target, strategy=pygit2.GIT_CHECKOUT_FORCE) - - # Check that it can detect the current branch - orig_dir = os.getcwd() - try: - os.chdir(self.gitdir) - with self.assertRaises(ValueError) as exc: - gitutil.count_commits_to_branch(None) - self.assertIn( - "Failed to determine upstream: fatal: no upstream configured for branch 'base'", - str(exc.exception)) - finally: - os.chdir(orig_dir) - - def run_patman(self, *args): - """Run patman using the provided arguments - - This runs the patman executable from scratch, as opposed to calling - the control.do_patman() function. - - Args: - args (list of str): Arguments to pass (excluding argv[0]) - - Return: - CommandResult: Result of execution - """ - all_args = [self._patman_pathname] + list(args) - return command.run_one(*all_args, capture=True, capture_stderr=True) - - def test_full_help(self): - """Test getting full help""" - command.TEST_RESULT = None - result = self.run_patman('-H') - help_file = os.path.join(self._patman_dir, 'README.rst') - # Remove possible extraneous strings - extra = '::::::::::::::\n' + help_file + '\n::::::::::::::\n' - gothelp = result.stdout.replace(extra, '') - self.assertEqual(len(gothelp), os.path.getsize(help_file)) - self.assertEqual(0, len(result.stderr)) - self.assertEqual(0, result.return_code) - - def test_help(self): - """Test getting help with commands and arguments""" - command.TEST_RESULT = None - result = self.run_patman('-h') - self.assertTrue(len(result.stdout) > 1000) - self.assertEqual(0, len(result.stderr)) - self.assertEqual(0, result.return_code) - - @staticmethod - def _fake_patchwork(subpath): - """Fake Patchwork server for the function below - - This handles accessing a series, providing a list consisting of a - single patch - - Args: - subpath (str): URL subpath to use - """ - re_series = re.match(r'series/(\d*)/$', subpath) - if re_series: - series_num = re_series.group(1) - if series_num == '1234': - return {'patches': [ - {'id': '1', 'name': 'Some patch'}]} - raise ValueError('Fake Patchwork does not understand: %s' % subpath) - - def test_status_mismatch(self): - """Test Patchwork patches not matching the series""" - pwork = patchwork.Patchwork.for_testing(self._fake_patchwork) - with terminal.capture() as (_, err): - loop = asyncio.get_event_loop() - _, patches = loop.run_until_complete(status.check_status(1234, - pwork)) - status.check_patch_count(0, len(patches)) - self.assertIn('Warning: Patchwork reports 1 patches, series has 0', - err.getvalue()) - - def test_status_read_patch(self): - """Test handling a single patch in Patchwork""" - pwork = patchwork.Patchwork.for_testing(self._fake_patchwork) - loop = asyncio.get_event_loop() - _, patches = loop.run_until_complete(status.check_status(1234, pwork)) - self.assertEqual(1, len(patches)) - patch = patches[0] - self.assertEqual('1', patch.id) - self.assertEqual('Some patch', patch.raw_subject) - - def test_parse_subject(self): - """Test parsing of the patch subject""" - patch = patchwork.Patch('1') - - # Simple patch not in a series - patch.parse_subject('Testing') - self.assertEqual('Testing', patch.raw_subject) - self.assertEqual('Testing', patch.subject) - self.assertEqual(1, patch.seq) - self.assertEqual(1, patch.count) - self.assertEqual(None, patch.prefix) - self.assertEqual(None, patch.version) - - # First patch in a series - patch.parse_subject('[1/2] Testing') - self.assertEqual('[1/2] Testing', patch.raw_subject) - self.assertEqual('Testing', patch.subject) - self.assertEqual(1, patch.seq) - self.assertEqual(2, patch.count) - self.assertEqual(None, patch.prefix) - self.assertEqual(None, patch.version) - - # Second patch in a series - patch.parse_subject('[2/2] Testing') - self.assertEqual('Testing', patch.subject) - self.assertEqual(2, patch.seq) - self.assertEqual(2, patch.count) - self.assertEqual(None, patch.prefix) - self.assertEqual(None, patch.version) - - # With PATCH prefix - patch.parse_subject('[PATCH,2/5] Testing') - self.assertEqual('Testing', patch.subject) - self.assertEqual(2, patch.seq) - self.assertEqual(5, patch.count) - self.assertEqual('PATCH', patch.prefix) - self.assertEqual(None, patch.version) - - # RFC patch - patch.parse_subject('[RFC,3/7] Testing') - self.assertEqual('Testing', patch.subject) - self.assertEqual(3, patch.seq) - self.assertEqual(7, patch.count) - self.assertEqual('RFC', patch.prefix) - self.assertEqual(None, patch.version) - - # Version patch - patch.parse_subject('[v2,3/7] Testing') - self.assertEqual('Testing', patch.subject) - self.assertEqual(3, patch.seq) - self.assertEqual(7, patch.count) - self.assertEqual(None, patch.prefix) - self.assertEqual('v2', patch.version) - - # All fields - patch.parse_subject('[RESEND,v2,3/7] Testing') - self.assertEqual('Testing', patch.subject) - self.assertEqual(3, patch.seq) - self.assertEqual(7, patch.count) - self.assertEqual('RESEND', patch.prefix) - self.assertEqual('v2', patch.version) - - # RFC only - patch.parse_subject('[RESEND] Testing') - self.assertEqual('Testing', patch.subject) - self.assertEqual(1, patch.seq) - self.assertEqual(1, patch.count) - self.assertEqual('RESEND', patch.prefix) - self.assertEqual(None, patch.version) - - def test_compare_series(self): - """Test operation of compare_with_series()""" - commit1 = Commit('abcd') - commit1.subject = 'Subject 1' - commit2 = Commit('ef12') - commit2.subject = 'Subject 2' - commit3 = Commit('3456') - commit3.subject = 'Subject 2' - - patch1 = patchwork.Patch('1') - patch1.subject = 'Subject 1' - patch2 = patchwork.Patch('2') - patch2.subject = 'Subject 2' - patch3 = patchwork.Patch('3') - patch3.subject = 'Subject 2' - - series = Series() - series.commits = [commit1] - patches = [patch1] - patch_for_commit, commit_for_patch, warnings = ( - status.compare_with_series(series, patches)) - self.assertEqual(1, len(patch_for_commit)) - self.assertEqual(patch1, patch_for_commit[0]) - self.assertEqual(1, len(commit_for_patch)) - self.assertEqual(commit1, commit_for_patch[0]) - - series.commits = [commit1] - patches = [patch1, patch2] - patch_for_commit, commit_for_patch, warnings = ( - status.compare_with_series(series, patches)) - self.assertEqual(1, len(patch_for_commit)) - self.assertEqual(patch1, patch_for_commit[0]) - self.assertEqual(1, len(commit_for_patch)) - self.assertEqual(commit1, commit_for_patch[0]) - self.assertEqual(["Cannot find commit for patch 2 ('Subject 2')"], - warnings) - - series.commits = [commit1, commit2] - patches = [patch1] - patch_for_commit, commit_for_patch, warnings = ( - status.compare_with_series(series, patches)) - self.assertEqual(1, len(patch_for_commit)) - self.assertEqual(patch1, patch_for_commit[0]) - self.assertEqual(1, len(commit_for_patch)) - self.assertEqual(commit1, commit_for_patch[0]) - self.assertEqual(["Cannot find patch for commit 2 ('Subject 2')"], - warnings) - - series.commits = [commit1, commit2, commit3] - patches = [patch1, patch2] - patch_for_commit, commit_for_patch, warnings = ( - status.compare_with_series(series, patches)) - self.assertEqual(2, len(patch_for_commit)) - self.assertEqual(patch1, patch_for_commit[0]) - self.assertEqual(patch2, patch_for_commit[1]) - self.assertEqual(1, len(commit_for_patch)) - self.assertEqual(commit1, commit_for_patch[0]) - self.assertEqual(["Cannot find patch for commit 3 ('Subject 2')", - "Multiple commits match patch 2 ('Subject 2'):\n" - ' Subject 2\n Subject 2'], - warnings) - - series.commits = [commit1, commit2] - patches = [patch1, patch2, patch3] - patch_for_commit, commit_for_patch, warnings = ( - status.compare_with_series(series, patches)) - self.assertEqual(1, len(patch_for_commit)) - self.assertEqual(patch1, patch_for_commit[0]) - self.assertEqual(2, len(commit_for_patch)) - self.assertEqual(commit1, commit_for_patch[0]) - self.assertEqual(["Multiple patches match commit 2 ('Subject 2'):\n" - ' Subject 2\n Subject 2', - "Cannot find commit for patch 3 ('Subject 2')"], - warnings) - - def _fake_patchwork2(self, subpath): - """Fake Patchwork server for the function below - - This handles accessing series, patches and comments, providing the data - in self.patches to the caller - - Args: - subpath (str): URL subpath to use - """ - re_series = re.match(r'series/(\d*)/$', subpath) - re_patch = re.match(r'patches/(\d*)/$', subpath) - re_comments = re.match(r'patches/(\d*)/comments/$', subpath) - if re_series: - series_num = re_series.group(1) - if series_num == '1234': - return {'patches': self.patches} - elif re_patch: - patch_num = int(re_patch.group(1)) - patch = self.patches[patch_num - 1] - return patch - elif re_comments: - patch_num = int(re_comments.group(1)) - patch = self.patches[patch_num - 1] - return patch.comments - raise ValueError('Fake Patchwork does not understand: %s' % subpath) - - def test_find_new_responses(self): - """Test operation of find_new_responses()""" - commit1 = Commit('abcd') - commit1.subject = 'Subject 1' - commit2 = Commit('ef12') - commit2.subject = 'Subject 2' - - patch1 = patchwork.Patch('1') - patch1.parse_subject('[1/2] Subject 1') - patch1.name = patch1.raw_subject - patch1.content = 'This is my patch content' - comment1a = {'content': 'Reviewed-by: %s\n' % self.joe} - - patch1.comments = [comment1a] - - patch2 = patchwork.Patch('2') - patch2.parse_subject('[2/2] Subject 2') - patch2.name = patch2.raw_subject - patch2.content = 'Some other patch content' - comment2a = { - 'content': 'Reviewed-by: %s\nTested-by: %s\n' % - (self.mary, self.leb)} - comment2b = {'content': 'Reviewed-by: %s' % self.fred} - patch2.comments = [comment2a, comment2b] - - # This test works by setting up commits and patch for use by the fake - # Rest API function _fake_patchwork2(). It calls various functions in - # the status module after setting up tags in the commits, checking that - # things behaves as expected - self.commits = [commit1, commit2] - self.patches = [patch1, patch2] - - # Check that the tags are picked up on the first patch - new_rtags, _ = status.process_reviews(patch1.content, patch1.comments, - commit1.rtags) - self.assertEqual(new_rtags, {'Reviewed-by': {self.joe}}) - - # Now the second patch - new_rtags, _ = status.process_reviews(patch2.content, patch2.comments, - commit2.rtags) - self.assertEqual(new_rtags, { - 'Reviewed-by': {self.mary, self.fred}, - 'Tested-by': {self.leb}}) - - # Now add some tags to the commit, which means they should not appear as - # 'new' tags when scanning comments - commit1.rtags = {'Reviewed-by': {self.joe}} - new_rtags, _ = status.process_reviews(patch1.content, patch1.comments, - commit1.rtags) - self.assertEqual(new_rtags, {}) - - # For the second commit, add Ed and Fred, so only Mary should be left - commit2.rtags = { - 'Tested-by': {self.leb}, - 'Reviewed-by': {self.fred}} - new_rtags, _ = status.process_reviews(patch2.content, patch2.comments, - commit2.rtags) - self.assertEqual(new_rtags, {'Reviewed-by': {self.mary}}) - - # Check that the output patches expectations: - # 1 Subject 1 - # Reviewed-by: Joe Bloggs <[email protected]> - # 2 Subject 2 - # Tested-by: Lord Edmund Blackaddër <[email protected]> - # Reviewed-by: Fred Bloggs <[email protected]> - # + Reviewed-by: Mary Bloggs <[email protected]> - # 1 new response available in patchwork - - series = Series() - series.commits = [commit1, commit2] - terminal.set_print_test_mode() - pwork = patchwork.Patchwork.for_testing(self._fake_patchwork2) - status.check_and_show_status(series, '1234', None, None, False, False, - False, pwork) - itr = iter(terminal.get_print_test_lines()) - col = terminal.Color() - self.assertEqual(terminal.PrintLine(' 1 Subject 1', col.YELLOW), - next(itr)) - self.assertEqual( - terminal.PrintLine(' Reviewed-by: ', col.GREEN, newline=False, - bright=False), - next(itr)) - self.assertEqual(terminal.PrintLine(self.joe, col.WHITE, bright=False), - next(itr)) - - self.assertEqual(terminal.PrintLine(' 2 Subject 2', col.YELLOW), - next(itr)) - self.assertEqual( - terminal.PrintLine(' Reviewed-by: ', col.GREEN, newline=False, - bright=False), - next(itr)) - self.assertEqual(terminal.PrintLine(self.fred, col.WHITE, - bright=False), next(itr)) - self.assertEqual( - terminal.PrintLine(' Tested-by: ', col.GREEN, newline=False, - bright=False), - next(itr)) - self.assertEqual(terminal.PrintLine(self.leb, col.WHITE, bright=False), - next(itr)) - self.assertEqual( - terminal.PrintLine(' + Reviewed-by: ', col.GREEN, newline=False), - next(itr)) - self.assertEqual(terminal.PrintLine(self.mary, col.WHITE), - next(itr)) - self.assertEqual(terminal.PrintLine( - '1 new response available in patchwork (use -d to write them to a new branch)', - None), next(itr)) - - def _fake_patchwork3(self, subpath): - """Fake Patchwork server for the function below - - This handles accessing series, patches and comments, providing the data - in self.patches to the caller - - Args: - subpath (str): URL subpath to use - """ - re_series = re.match(r'series/(\d*)/$', subpath) - re_patch = re.match(r'patches/(\d*)/$', subpath) - re_comments = re.match(r'patches/(\d*)/comments/$', subpath) - if re_series: - series_num = re_series.group(1) - if series_num == '1234': - return {'patches': self.patches} - elif re_patch: - patch_num = int(re_patch.group(1)) - patch = self.patches[patch_num - 1] - return patch - elif re_comments: - patch_num = int(re_comments.group(1)) - patch = self.patches[patch_num - 1] - return patch.comments - raise ValueError('Fake Patchwork does not understand: %s' % subpath) - - def test_create_branch(self): - """Test operation of create_branch()""" - repo = self.make_git_tree() - branch = 'first' - dest_branch = 'first2' - count = 2 - gitdir = self.gitdir - - # Set up the test git tree. We use branch 'first' which has two commits - # in it - series = patchstream.get_metadata_for_list(branch, gitdir, count) - self.assertEqual(2, len(series.commits)) - - patch1 = patchwork.Patch('1') - patch1.parse_subject('[1/2] %s' % series.commits[0].subject) - patch1.name = patch1.raw_subject - patch1.content = 'This is my patch content' - comment1a = {'content': 'Reviewed-by: %s\n' % self.joe} - - patch1.comments = [comment1a] - - patch2 = patchwork.Patch('2') - patch2.parse_subject('[2/2] %s' % series.commits[1].subject) - patch2.name = patch2.raw_subject - patch2.content = 'Some other patch content' - comment2a = { - 'content': 'Reviewed-by: %s\nTested-by: %s\n' % - (self.mary, self.leb)} - comment2b = { - 'content': 'Reviewed-by: %s' % self.fred} - patch2.comments = [comment2a, comment2b] - - # This test works by setting up patches for use by the fake Rest API - # function _fake_patchwork3(). The fake patch comments above should - # result in new review tags that are collected and added to the commits - # created in the destination branch. - self.patches = [patch1, patch2] - count = 2 - - # Expected output: - # 1 i2c: I2C things - # + Reviewed-by: Joe Bloggs <[email protected]> - # 2 spi: SPI fixes - # + Reviewed-by: Fred Bloggs <[email protected]> - # + Reviewed-by: Mary Bloggs <[email protected]> - # + Tested-by: Lord Edmund Blackaddër <[email protected]> - # 4 new responses available in patchwork - # 4 responses added from patchwork into new branch 'first2' - # <unittest.result.TestResult run=8 errors=0 failures=0> - - terminal.set_print_test_mode() - pwork = patchwork.Patchwork.for_testing(self._fake_patchwork3) - status.check_and_show_status( - series, '1234', branch, dest_branch, False, False, False, pwork, - repo) - lines = terminal.get_print_test_lines() - self.assertEqual(12, len(lines)) - self.assertEqual( - "4 responses added from patchwork into new branch 'first2'", - lines[11].text) - - # Check that the destination branch has the new tags - new_series = patchstream.get_metadata_for_list(dest_branch, gitdir, - count) - self.assertEqual( - {'Reviewed-by': {self.joe}}, - new_series.commits[0].rtags) - self.assertEqual( - {'Tested-by': {self.leb}, - 'Reviewed-by': {self.fred, self.mary}}, - new_series.commits[1].rtags) - - # Now check the actual test of the first commit message. We expect to - # see the new tags immediately below the old ones. - stdout = patchstream.get_list(dest_branch, count=count, git_dir=gitdir) - itr = iter([line.strip() for line in stdout.splitlines() - if '-by:' in line]) - - # First patch should have the review tag - self.assertEqual('Reviewed-by: %s' % self.joe, next(itr)) - - # Second patch should have the sign-off then the tested-by and two - # reviewed-by tags - self.assertEqual('Signed-off-by: %s' % self.leb, next(itr)) - self.assertEqual('Reviewed-by: %s' % self.fred, next(itr)) - self.assertEqual('Reviewed-by: %s' % self.mary, next(itr)) - self.assertEqual('Tested-by: %s' % self.leb, next(itr)) - - def test_parse_snippets(self): - """Test parsing of review snippets""" - text = '''Hi Fred, - -This is a comment from someone. - -Something else - -On some recent date, Fred wrote: -> This is why I wrote the patch -> so here it is - -Now a comment about the commit message -A little more to say - -Even more - -> diff --git a/file.c b/file.c -> Some more code -> Code line 2 -> Code line 3 -> Code line 4 -> Code line 5 -> Code line 6 -> Code line 7 -> Code line 8 -> Code line 9 - -And another comment - -> @@ -153,8 +143,13 @@ def check_patch(fname, show_types=False): -> further down on the file -> and more code -> +Addition here -> +Another addition here -> codey -> more codey - -and another thing in same file - -> @@ -253,8 +243,13 @@ -> with no function context - -one more thing - -> diff --git a/tools/patman/main.py b/tools/patman/main.py -> +line of code -now a very long comment in a different file -line2 -line3 -line4 -line5 -line6 -line7 -line8 -''' - pstrm = PatchStream.process_text(text, True) - self.assertEqual([], pstrm.commit.warn) - - # We expect to the filename and up to 5 lines of code context before - # each comment. The 'On xxx wrote:' bit should be removed. - self.assertEqual( - [['Hi Fred,', - 'This is a comment from someone.', - 'Something else'], - ['> This is why I wrote the patch', - '> so here it is', - 'Now a comment about the commit message', - 'A little more to say', 'Even more'], - ['> File: file.c', '> Code line 5', '> Code line 6', - '> Code line 7', '> Code line 8', '> Code line 9', - 'And another comment'], - ['> File: file.c', - '> Line: 153 / 143: def check_patch(fname, show_types=False):', - '> and more code', '> +Addition here', - '> +Another addition here', '> codey', '> more codey', - 'and another thing in same file'], - ['> File: file.c', '> Line: 253 / 243', - '> with no function context', 'one more thing'], - ['> File: tools/patman/main.py', '> +line of code', - 'now a very long comment in a different file', - 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8']], - pstrm.snippets) - - def test_review_snippets(self): - """Test showing of review snippets""" - def _to_submitter(who): - m_who = re.match('(.*) <(.*)>', who) - return { - 'name': m_who.group(1), - 'email': m_who.group(2) - } - - commit1 = Commit('abcd') - commit1.subject = 'Subject 1' - commit2 = Commit('ef12') - commit2.subject = 'Subject 2' - - patch1 = patchwork.Patch('1') - patch1.parse_subject('[1/2] Subject 1') - patch1.name = patch1.raw_subject - patch1.content = 'This is my patch content' - comment1a = {'submitter': _to_submitter(self.joe), - 'content': '''Hi Fred, - -On some date Fred wrote: - -> diff --git a/file.c b/file.c -> Some code -> and more code - -Here is my comment above the above... - - -Reviewed-by: %s -''' % self.joe} - - patch1.comments = [comment1a] - - patch2 = patchwork.Patch('2') - patch2.parse_subject('[2/2] Subject 2') - patch2.name = patch2.raw_subject - patch2.content = 'Some other patch content' - comment2a = { - 'content': 'Reviewed-by: %s\nTested-by: %s\n' % - (self.mary, self.leb)} - comment2b = {'submitter': _to_submitter(self.fred), - 'content': '''Hi Fred, - -On some date Fred wrote: - -> diff --git a/tools/patman/commit.py b/tools/patman/commit.py -> @@ -41,6 +41,9 @@ class Commit: -> self.rtags = collections.defaultdict(set) -> self.warn = [] -> -> + def __str__(self): -> + return self.subject -> + -> def add_change(self, version, info): -> """Add a new change line to the change list for a version. -> -A comment - -Reviewed-by: %s -''' % self.fred} - patch2.comments = [comment2a, comment2b] - - # This test works by setting up commits and patch for use by the fake - # Rest API function _fake_patchwork2(). It calls various functions in - # the status module after setting up tags in the commits, checking that - # things behaves as expected - self.commits = [commit1, commit2] - self.patches = [patch1, patch2] - - # Check that the output patches expectations: - # 1 Subject 1 - # Reviewed-by: Joe Bloggs <[email protected]> - # 2 Subject 2 - # Tested-by: Lord Edmund Blackaddër <[email protected]> - # Reviewed-by: Fred Bloggs <[email protected]> - # + Reviewed-by: Mary Bloggs <[email protected]> - # 1 new response available in patchwork - - series = Series() - series.commits = [commit1, commit2] - terminal.set_print_test_mode() - pwork = patchwork.Patchwork.for_testing(self._fake_patchwork2) - status.check_and_show_status( - series, '1234', None, None, False, True, False, pwork) - itr = iter(terminal.get_print_test_lines()) - col = terminal.Color() - self.assertEqual(terminal.PrintLine(' 1 Subject 1', col.YELLOW), - next(itr)) - self.assertEqual( - terminal.PrintLine(' + Reviewed-by: ', col.GREEN, newline=False), - next(itr)) - self.assertEqual(terminal.PrintLine(self.joe, col.WHITE), next(itr)) - - self.assertEqual(terminal.PrintLine('Review: %s' % self.joe, col.RED), - next(itr)) - self.assertEqual(terminal.PrintLine(' Hi Fred,', None), next(itr)) - self.assertEqual(terminal.PrintLine('', None), next(itr)) - self.assertEqual(terminal.PrintLine(' > File: file.c', col.MAGENTA), - next(itr)) - self.assertEqual(terminal.PrintLine(' > Some code', col.MAGENTA), - next(itr)) - self.assertEqual(terminal.PrintLine(' > and more code', - col.MAGENTA), - next(itr)) - self.assertEqual(terminal.PrintLine( - ' Here is my comment above the above...', None), next(itr)) - self.assertEqual(terminal.PrintLine('', None), next(itr)) - - self.assertEqual(terminal.PrintLine(' 2 Subject 2', col.YELLOW), - next(itr)) - self.assertEqual( - terminal.PrintLine(' + Reviewed-by: ', col.GREEN, newline=False), - next(itr)) - self.assertEqual(terminal.PrintLine(self.fred, col.WHITE), - next(itr)) - self.assertEqual( - terminal.PrintLine(' + Reviewed-by: ', col.GREEN, newline=False), - next(itr)) - self.assertEqual(terminal.PrintLine(self.mary, col.WHITE), - next(itr)) - self.assertEqual( - terminal.PrintLine(' + Tested-by: ', col.GREEN, newline=False), - next(itr)) - self.assertEqual(terminal.PrintLine(self.leb, col.WHITE), - next(itr)) - - self.assertEqual(terminal.PrintLine('Review: %s' % self.fred, col.RED), - next(itr)) - self.assertEqual(terminal.PrintLine(' Hi Fred,', None), next(itr)) - self.assertEqual(terminal.PrintLine('', None), next(itr)) - self.assertEqual(terminal.PrintLine( - ' > File: tools/patman/commit.py', col.MAGENTA), next(itr)) - self.assertEqual(terminal.PrintLine( - ' > Line: 41 / 41: class Commit:', col.MAGENTA), next(itr)) - self.assertEqual(terminal.PrintLine( - ' > + return self.subject', col.MAGENTA), next(itr)) - self.assertEqual(terminal.PrintLine( - ' > +', col.MAGENTA), next(itr)) - self.assertEqual( - terminal.PrintLine( - ' > def add_change(self, version, info):', - col.MAGENTA), - next(itr)) - self.assertEqual(terminal.PrintLine( - ' > """Add a new change line to the change list for a version.', - col.MAGENTA), next(itr)) - self.assertEqual(terminal.PrintLine( - ' >', col.MAGENTA), next(itr)) - self.assertEqual(terminal.PrintLine( - ' A comment', None), next(itr)) - self.assertEqual(terminal.PrintLine('', None), next(itr)) - - self.assertEqual(terminal.PrintLine( - '4 new responses available in patchwork (use -d to write them to a new branch)', - None), next(itr)) - - def test_insert_tags(self): - """Test inserting of review tags""" - msg = '''first line -second line.''' - tags = [ - 'Reviewed-by: Bin Meng <[email protected]>', - 'Tested-by: Bin Meng <[email protected]>' - ] - signoff = 'Signed-off-by: Simon Glass <[email protected]>' - tag_str = '\n'.join(tags) - - new_msg = patchstream.insert_tags(msg, tags) - self.assertEqual(msg + '\n\n' + tag_str, new_msg) - - new_msg = patchstream.insert_tags(msg + '\n', tags) - self.assertEqual(msg + '\n\n' + tag_str, new_msg) - - msg += '\n\n' + signoff - new_msg = patchstream.insert_tags(msg, tags) - self.assertEqual(msg + '\n' + tag_str, new_msg)
tools/patman/pytest.ini deleted +0 -2
@@ -1,2 +0,0 @@ -[pytest] -addopts = --doctest-modules
tools/patman/test/0000-cover-letter.patch deleted +0 -23
@@ -1,23 +0,0 @@ -From 5ab48490f03051875ab13d288a4bf32b507d76fd Mon Sep 17 00:00:00 2001 -From: Simon Glass <[email protected]> -Date: Sat, 27 May 2017 20:52:11 -0600 -Subject: [RFC 0/2] *** SUBJECT HERE *** -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -*** BLURB HERE *** - -Simon Glass (2): - pci: Correct cast for sandbox - fdt: Correct cast for sandbox in fdtdec_setup_mem_size_base() - - cmd/pci.c | 3 ++- - fs/fat/fat.c | 1 + - lib/efi_loader/efi_memory.c | 1 + - lib/fdtdec.c | 3 ++- - 4 files changed, 6 insertions(+), 2 deletions(-) - --- -2.7.4 -
tools/patman/test/0001-pci-Correct-cast-for-sandbox.patch deleted +0 -51
51 lines not on this page · raw message
tools/patman/test/0002-fdt-Correct-cast-for-sandbox-in-fdtdec_setup_mem_siz.patch deleted +0 -85
85 lines not on this page · raw message
tools/patman/test/test01.txt deleted +0 -72
72 lines not on this page · raw message
tools/patman/test_checkpatch.py deleted +0 -526
526 lines not on this page · raw message
tools/patman/test_common.py deleted +0 -254
254 lines not on this page · raw message
tools/patman/test_cseries.py deleted +0 -3684
645 lines not on this page · raw message
tools/patman/test_settings.py deleted +0 -67
67 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.43.0
Part of the diff is not shown here. View the raw message.
PATCH v2 6/11 patman: Remove the patch-management code
In reply to Simon GlassDelete the command-line tool and its supporting modules, now that this functionality lives in the standalone patch-manager package.
Keep the modules that buildman still imports (commit and patchstream, plus their dependencies series, get_maintainer and settings), along with the stub command. Trim __init__.py to match.
---
(no changes since v1)
tools/patman/__init__.py | 5 +- tools/patman/checkpatch.py | 287 ------- tools/patman/cmdline.py | 516 ------------ tools/patman/control.py | 333 -------- tools/patman/cser_helper.py | 1524 ----------------------------------- tools/patman/cseries.py | 1165 -------------------------- tools/patman/database.py | 823 ------------------- tools/patman/patchwork.py | 852 -------------------- tools/patman/project.py | 27 - tools/patman/send.py | 197 ----- tools/patman/status.py | 405 ---------- 11 files changed, 1 insertion(+), 6133 deletions(-) delete mode 100644 tools/patman/checkpatch.py delete mode 100644 tools/patman/cmdline.py delete mode 100644 tools/patman/control.py delete mode 100644 tools/patman/cser_helper.py delete mode 100644 tools/patman/cseries.py delete mode 100644 tools/patman/database.py delete mode 100644 tools/patman/patchwork.py delete mode 100644 tools/patman/project.py delete mode 100644 tools/patman/send.py delete mode 100644 tools/patman/status.py
tools/patman/__init__.py +1 -4
@@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ __all__ = [ - 'checkpatch', 'cmdline', 'commit', 'control', 'cser_helper', 'cseries', - 'database', 'func_test', 'get_maintainer', '__main__', 'patchstream', - 'patchwork', 'project', 'send', 'series', 'settings', 'setup', 'status', - 'test_checkpatch', 'test_common', 'test_cseries', 'test_settings' + 'commit', 'get_maintainer', 'patchstream', 'series', 'settings', ]
tools/patman/checkpatch.py deleted +0 -287
287 lines not on this page · raw message
tools/patman/cmdline.py deleted +0 -516
516 lines not on this page · raw message
tools/patman/control.py deleted +0 -333
333 lines not on this page · raw message
tools/patman/cser_helper.py deleted +0 -1524
1,524 lines not on this page · raw message
tools/patman/cseries.py deleted +0 -1165
331 lines not on this page · raw message
tools/patman/database.py deleted +0 -823
823 lines not on this page · raw message
tools/patman/patchwork.py deleted +0 -852
852 lines not on this page · raw message
tools/patman/send.py deleted +0 -197
197 lines not on this page · raw message
tools/patman/status.py deleted +0 -405
405 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.43.0
Part of the diff is not shown here. View the raw message.
PATCH v2 7/11 CI: Install pylibfdt's requirements in the tool jobs
In reply to Simon GlassThe GitLab and Azure tool-test and pylint jobs build the pylibfdt bindings, which need setuptools. That currently comes only from patman's requirements.txt, which a later patch drops. Install scripts/dtc/pylibfdt/requirements.txt in those jobs, the proper source for that dependency, so setuptools survives patman's removal.
---
Changes in v2:
- New patch, split from 'CI: Stop building and testing patman', to add scripts/dtc/pylibfdt/requirements.txt for setuptools
.azure-pipelines.yml | 4 +++- .gitlab-ci.yml | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-)
.azure-pipelines.yml +3 -1
@@ -164,7 +164,8 @@ stages: -r tools/binman/requirements.txt \ -r tools/buildman/requirements.txt \ -r tools/patman/requirements.txt \ - -r tools/u_boot_pylib/requirements.txt + -r tools/u_boot_pylib/requirements.txt \ + -r scripts/dtc/pylibfdt/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}
@@ -198,6 +199,7 @@ stages: -r tools/buildman/requirements.txt \ -r tools/patman/requirements.txt \ -r tools/u_boot_pylib/requirements.txt \ + -r scripts/dtc/pylibfdt/requirements.txt \ asteval pylint==3.3.4 pyopenssl export PATH=${PATH}:~/.local/bin echo "[MASTER]" >> .pylintrc
.gitlab-ci.yml +4 -2
@@ -219,7 +219,8 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: . /tmp/venv/bin/activate; pip install -r test/py/requirements.txt -r tools/binman/requirements.txt -r tools/buildman/requirements.txt -r tools/patman/requirements.txt - -r tools/u_boot_pylib/requirements.txt; + -r tools/u_boot_pylib/requirements.txt + -r scripts/dtc/pylibfdt/requirements.txt; export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only; export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}";
@@ -245,7 +246,8 @@ Run pylint: - . /tmp/venv/bin/activate - pip install -r test/py/requirements.txt -r tools/binman/requirements.txt -r tools/buildman/requirements.txt -r tools/patman/requirements.txt - -r tools/u_boot_pylib/requirements.txt asteval pylint==3.3.4 pyopenssl + -r tools/u_boot_pylib/requirements.txt + -r scripts/dtc/pylibfdt/requirements.txt asteval pylint==3.3.4 pyopenssl - export PATH=${PATH}:~/.local/bin - echo "[MASTER]" >> .pylintrc - echo "load-plugins=pylint.extensions.docparams" >> .pylintrc
Signature · 1 line
2.43.0
Re: [PATCH v2 07/11] CI: Install pylibfdt's requirements in the tool jobs
Quoted 7 lines · Simon Glass
The GitLab and Azure tool-test and pylint jobs build the pylibfdt bindings, which need setuptools. That currently comes only from patman's requirements.txt, which a later patch drops. Install
scripts/dtc/pylibfdt/requirements.txtin those jobs, the proper source for that dependency, so setuptools survives patman's removal.Signed-off-by Simon Glass <[email protected]>
Signature · 1 line
Tom
PATCH v2 8/11 CI: Stop building and testing patman
In reply to Simon Glasspatman is now just a stub, so drop its requirements file and its 'patman test' run from the Azure and GitLab pipelines.
---
(no changes since v1)
.azure-pipelines.yml | 5 +---- .gitlab-ci.yml | 7 +++---- 2 files changed, 4 insertions(+), 8 deletions(-)
.azure-pipelines.yml +1 -4
@@ -146,7 +146,7 @@ stages: make tools-only_config envtools -j$(nproc) - job: utils - displayName: 'Run binman, buildman, dtoc, Kconfig and patman testsuites' + displayName: 'Run binman, buildman, dtoc and Kconfig testsuites' pool: vmImage: $(ubuntu_vm) container:
@@ -163,7 +163,6 @@ stages: pip install -r test/py/requirements.txt \ -r tools/binman/requirements.txt \ -r tools/buildman/requirements.txt \ - -r tools/patman/requirements.txt \ -r tools/u_boot_pylib/requirements.txt \ -r scripts/dtc/pylibfdt/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only
@@ -178,7 +177,6 @@ stages: COVERAGE_FILE=/tmp/.coverage ./tools/binman/binman ${TOOLPATH} test -T ./tools/buildman/buildman -t ./tools/dtoc/dtoc -t - ./tools/patman/patman test make O=${UBOOT_TRAVIS_BUILD_DIR} testconfig - job: pylint
@@ -197,7 +195,6 @@ stages: pip install -r test/py/requirements.txt \ -r tools/binman/requirements.txt \ -r tools/buildman/requirements.txt \ - -r tools/patman/requirements.txt \ -r tools/u_boot_pylib/requirements.txt \ -r scripts/dtc/pylibfdt/requirements.txt \ asteval pylint==3.3.4 pyopenssl
.gitlab-ci.yml +3 -4
@@ -206,7 +206,7 @@ Build allyesconfig, tools-only and envtools: make mrproper; make tools-only_config envtools -j$(nproc) -Run binman, buildman, dtoc, Kconfig and patman testsuites: +Run binman, buildman, dtoc and Kconfig testsuites: extends: .testsuites tags: - ${DEFAULT_AMD64_TAG}
@@ -218,7 +218,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: python3 -m venv /tmp/venv; . /tmp/venv/bin/activate; pip install -r test/py/requirements.txt -r tools/binman/requirements.txt - -r tools/buildman/requirements.txt -r tools/patman/requirements.txt + -r tools/buildman/requirements.txt -r tools/u_boot_pylib/requirements.txt -r scripts/dtc/pylibfdt/requirements.txt; export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only;
@@ -234,7 +234,6 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: ./tools/binman/binman ${TOOLPATH} test -T; ./tools/buildman/buildman -t; ./tools/dtoc/dtoc -t; - ./tools/patman/patman test; make testconfig # Check for any pylint regressions
@@ -245,7 +244,7 @@ Run pylint: - python3 -m venv /tmp/venv - . /tmp/venv/bin/activate - pip install -r test/py/requirements.txt -r tools/binman/requirements.txt - -r tools/buildman/requirements.txt -r tools/patman/requirements.txt + -r tools/buildman/requirements.txt -r tools/u_boot_pylib/requirements.txt -r scripts/dtc/pylibfdt/requirements.txt asteval pylint==3.3.4 pyopenssl - export PATH=${PATH}:~/.local/bin
Signature · 1 line
2.43.0
Re: [PATCH v2 08/11] CI: Stop building and testing patman
Quoted 4 lines · Simon Glass
patman is now just a stub, so drop its requirements file and its 'patman test' run from the Azure and GitLab pipelines.
Signed-off-by Simon Glass <[email protected]>
For bisectability of the CI pipeline, this (and some of the following CI related patches) should have come sooner in the series. But that's a very niche case and in the interest of expediency we'll not worry about it here, I'll just re-order when merging.
Signature · 1 line
Tom
PATCH v2 9/11 tools: docker: Drop patman from the CI image
In reply to Simon GlassThe CI runner image pre-caches pip packages by downloading each tool's requirements.txt from master. A later patch removes patman's requirements.txt from the tree, so stop fetching and installing it.
The same step already installs setuptools explicitly (patman's requirements list it too), so this needs nothing further.
This takes effect the next time someone rebuilds the image; the existing image keeps working in the meantime.
---
(no changes since v1)
tools/docker/Dockerfile | 2 -- 1 file changed, 2 deletions(-)
tools/docker/Dockerfile +0 -2
@@ -362,7 +362,6 @@ RUN wget -O /tmp/pytest-requirements.txt https://source.denx.de/u-boot/u-boot/-/ RUN wget -O /tmp/sphinx-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/doc/sphinx/requirements.txt RUN wget -O /tmp/binman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/binman/requirements.txt RUN wget -O /tmp/buildman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/buildman/requirements.txt -RUN wget -O /tmp/patman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/patman/requirements.txt RUN wget -O /tmp/u_boot_pylib-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/u_boot_pylib/requirements.txt RUN python3 -m venv /tmp/venv && \ . /tmp/venv/bin/activate && \
@@ -370,7 +369,6 @@ RUN python3 -m venv /tmp/venv && \ -r /tmp/sphinx-requirements.txt \ -r /tmp/binman-requirements.txt \ -r /tmp/buildman-requirements.txt \ - -r /tmp/patman-requirements.txt \ -r /tmp/u_boot_pylib-requirements.txt \ setuptools pytest-azurepipelines && \ deactivate && \
Signature · 1 line
2.43.0
PATCH v2 10/11 tools: Stop packaging patman as a pip module
In reply to Simon Glasspatman is no longer shipped from the U-Boot tree, so drop it from the 'make pip' target and from make_pip.sh, and remove its packaging files (setup.py, pyproject.toml, requirements.txt). Nothing else refers to them by this point in the series, so they can go.
Also fix binman's pyproject.toml, which declares package-data for a 'patman' package (a copy-paste leftover); use 'binman' instead.
---
(no changes since v1)
Makefile | 1 - scripts/make_pip.sh | 10 +++++----- tools/binman/pyproject.toml | 2 +- tools/patman/pyproject.toml | 29 ----------------------------- tools/patman/requirements.txt | 6 ------ tools/patman/setup.py | 11 ----------- 6 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 tools/patman/pyproject.toml delete mode 100644 tools/patman/requirements.txt delete mode 100644 tools/patman/setup.py
Makefile +0 -1
@@ -2692,7 +2692,6 @@ pip pip_test pip_release: _pip _pip: scripts/make_pip.sh u_boot_pylib ${PIP_ARGS} - scripts/make_pip.sh patman ${PIP_ARGS} scripts/make_pip.sh buildman ${PIP_ARGS} scripts/make_pip.sh dtoc ${PIP_ARGS} scripts/make_pip.sh binman ${PIP_ARGS}
scripts/make_pip.sh +5 -5
@@ -5,7 +5,7 @@ # # Usage: make_pip.sh <tool_name> [--real] # -# Where tool_name is one of patman, buildman, dtoc, binman, u_boot_pylib +# Where tool_name is one of buildman, dtoc, binman, u_boot_pylib # # and --real means to upload to the real server (otherwise the test one is used) #
@@ -36,10 +36,10 @@ tool="$1" shift flags="$*" -if [[ "${tool}" =~ ^(patman|buildman|dtoc|binman|u_boot_pylib)$ ]]; then +if [[ "${tool}" =~ ^(buildman|dtoc|binman|u_boot_pylib)$ ]]; then echo "Building dist package for tool ${tool}" else - echo "Unknown tool ${tool}: use u_boot_pylib, patman, buildman, dtoc or binman" + echo "Unknown tool ${tool}: use u_boot_pylib, buildman, dtoc or binman" exit 1 fi
@@ -61,8 +61,8 @@ if [ -n "${upload}" ]; then fi fi -if [[ "${tool}" =~ ^(patman|u_boot_pylib)$ ]]; then - # Leave test_util.py and patman test files alone +if [[ "${tool}" =~ ^(u_boot_pylib)$ ]]; then + # Leave test_util.py and the u_boot_pylib test files alone delete_testfiles= fi
tools/binman/pyproject.toml +1 -1
@@ -26,4 +26,4 @@ classifiers = [ binman = "binman.main:start_binman" [tool.setuptools.package-data] -patman = ["*.rst"] +binman = ["*.rst"]
tools/patman/pyproject.toml deleted +0 -29
@@ -1,29 +0,0 @@ -[build-system] -requires = ["setuptools>=78.1.1"] -build-backend = "setuptools.build_meta" - -[project] -name = "patch-manager" -version = "0.0.6" -authors = [ - { name="Simon Glass", email="[email protected]" }, -] -dependencies = ["u_boot_pylib >= 0.0.6", "aiohttp >= 3.9.1" ] -description = "Patman patch manager" -readme = "README.rst" -requires-python = ">=3.7" -classifiers = [ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", - "Operating System :: OS Independent", -] - -[project.urls] -"Homepage" = "https://docs.u-boot-project.org/en/latest/develop/patman.html" -"Bug Tracker" = "https://source.denx.de/groups/u-boot/-/issues" - -[project.scripts] -patman = "patman.__main__:run_patman" - -[tool.setuptools.package-data] -patman = ["*.rst"]
tools/patman/requirements.txt deleted +0 -6
@@ -1,6 +0,0 @@ -aiohttp==3.10.11 -ConfigParser==7.1.0 -importlib_resources==6.5.2 -pygit2==1.14.1 -requests==2.32.4 -setuptools==78.1.1
tools/patman/setup.py deleted +0 -11
@@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -from setuptools import setup -setup(name='patman', - version='1.0', - scripts=['patman'], - packages=['patman'], - package_dir={'patman': ''}, - package_data={'patman': ['README.rst']}, - classifiers=['Environment :: Console', - 'Topic :: Software Development'])
Signature · 1 line
2.43.0
PATCH v2 11/11 test: Stop running the patman tests
In reply to Simon GlassThe patman tests no longer exist in the tree, so drop them from the test/run script (used by 'make tcheck' and friends) and from the tools-testing example in the documentation.
---
(no changes since v1)
doc/develop/testing.rst | 2 +- test/run | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
doc/develop/testing.rst +1 -1
@@ -22,7 +22,7 @@ the quick ones, type this:: make qcheck -It is also possible to run just the tests for tools (patman, binman, etc.). +It is also possible to run just the tests for tools (binman, buildman, etc.). Such tests are included with those tools, i.e. no actual U-Boot unit tests are run. Type this::
test/run +0 -1
@@ -80,7 +80,6 @@ export DTC=${DTC_DIR}/dtc TOOLS_DIR=build-sandbox_spl/tools run_test "binman" ./tools/binman/binman --toolpath ${TOOLS_DIR} test -run_test "patman" ./tools/patman/patman test run_test "u_boot_pylib" ./tools/u_boot_pylib/u_boot_pylib run_test "buildman" ./tools/buildman/buildman -t ${skip}
Signature · 1 line
2.43.0
Quoted 13 lines · Simon Glass
patman is now maintained as a standalone 'patch-manager' package, so remove it from the tree. The command becomes a stub that tells people to run 'pip install patch-manager'.
buildman still imports the shared modules commit and patchstream (along with their dependencies), so this series leaves those in place. It drops the tool's code, tests, CI hooks and packaging, and removes the in-tree documentation, moving the b4 contributor guide alongside the patman note in the patch-sending docs. It also adds a .patman-defaults file so the external tool is set up for U-Boot, next to the existing .b4-config. Where the CI jobs relied on patman's requirements for the setuptools that pylibfdt needs, they now install
scripts/dtc/pylibfdt/requirements.txtinstead.
Quoted 1 line
[...]
Applied to u-boot/master, thanks!
[01/11] doc: Move the b4 guide into sending_patches
commit: 08183ba1af1953c1a4dcdea94d1f6d8f4b5254b3
[02/11] doc: Remove the patman documentation
commit: f6c56009f6600ad87336484d258849d2bf36d010
[03/11] patman: Add a .patman-defaults file for U-Boot
commit: a24a86b547700359e46b4ae87731985661fe3334
[04/11] patman: Replace the tool with a stub for patch-manager
commit: f2cf4315339271d48b40628c04c25be24c231a4f
[05/11] patman: Remove the test suite
commit: f7a4848a9ca37add093628a3f60fb79201eb5fe6
[06/11] patman: Remove the patch-management code
commit: 91b94aff149d2c6efe3afa81adaf5edcc6119221
[07/11] CI: Install pylibfdt's requirements in the tool jobs
commit: d4e3ef0b0ae95406b5c235c06ae8d4b80efdb6c5
[08/11] CI: Stop building and testing patman
commit: bb74c34fd6439463827db07d0198457f1202ada0
[09/11] tools: docker: Drop patman from the CI image
commit: 5c2d490539e9c15e863d5d8e476467724c60f87b
[10/11] tools: Stop packaging patman as a pip module
commit: c2f2085b1540146fd2a229342366622d1970cd90
[11/11] test: Stop running the patman tests
commit: c8db1555251aada7478f4fbad7e643bed02a8cbeSignature · 1 line
Tom