tools: Stop packaging patman as a pip module

patman 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.

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

diff --git a/Makefile b/Makefile
index 503ac59e654ed64c61c45302822d64547dc9f3d3..9e7f97cc0db308a54093620b4541b0fc696e4e07 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2691,7 +2691,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}

diff --git a/scripts/make_pip.sh b/scripts/make_pip.sh
index 33ad51ada703ba2d8aecc5688037c259327b9d78..ffe22db199c0dd4c4465bbab18735b62b1495e5a 100755 (executable)
--- a/scripts/make_pip.sh
+++ b/scripts/make_pip.sh
@@ -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
 

diff --git a/tools/binman/pyproject.toml b/tools/binman/pyproject.toml
index 2f17588e9df43350bc20c2ca64cf84ddcd6f1384..fd43a71b02b55cd7cb3a1c64ea9b6933f2cd0f59 100644 (file)
--- a/tools/binman/pyproject.toml
+++ b/tools/binman/pyproject.toml
@@ -26,4 +26,4 @@ classifiers = [
 binman = "binman.main:start_binman"
 
 [tool.setuptools.package-data]
-patman = ["*.rst"]
+binman = ["*.rst"]

diff --git a/tools/patman/pyproject.toml b/tools/patman/pyproject.toml
deleted file mode 100644 (file)
index 0fc4b7d..0000000
--- a/tools/patman/pyproject.toml
+++ /dev/null
@@ -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="sjg@chromium.org" },
-]
-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"]

diff --git a/tools/patman/requirements.txt b/tools/patman/requirements.txt
deleted file mode 100644 (file)
index d4fcb10..0000000
--- a/tools/patman/requirements.txt
+++ /dev/null
@@ -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

diff --git a/tools/patman/setup.py b/tools/patman/setup.py
deleted file mode 100644 (file)
index bcaad69..0000000
--- a/tools/patman/setup.py
+++ /dev/null
@@ -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'])