From b66bcea038bd613b34d5555352d0a86060967b72 Mon Sep 17 00:00:00 2001 From: the Mulhern Date: Fri, 13 Nov 2026 10:15:47 -0500 Subject: [PATCH 1/4] Require setuptools version no greater than 69 Signed-off-by: the Mulhern Assisted-by: Claude:claude-sonnet-4-5 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a5bb31c47..0fe170d6d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ [build-system] -requires = ["setuptools>=77"] +requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] name = "stratis-cli" authors = [{name = "Anne Mulhern", email = "amulhern@redhat.com"}] description = "Stratis CLI" -license = "Apache-2.0" +license = {file = "LICENSE"} classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Console", From c3ce4c4c0291dfae55e1a9d8453ca15b03b9eca3 Mon Sep 17 00:00:00 2001 From: the Mulhern Date: Fri, 13 Nov 2026 10:23:03 -0500 Subject: [PATCH 2/4] Add legacy package test to CI Signed-off-by: the Mulhern Assisted-by: Claude:claude-sonnet-4-5 --- .github/workflows/main.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb4e8c2f1..eb9d6854b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,6 +67,27 @@ jobs: - name: Run test run: ${{ matrix.task }} + legacy-package-test: + runs-on: ubuntu-latest + container: + image: quay.io/fedora/fedora:40 # RHEL 10 branch point + steps: + - uses: actions/checkout@v6 + with: + persist-credentials: false + - name: Install dependencies + run: > + dnf install -y + make + python3-build + python3-setuptools + python3-wheel + twine + - name: Display Python version + run: python3 --version + - name: Run package test + run: make -f Makefile package + test-runs: strategy: matrix: From afc114912942d898c548cc9cfe807bbda3ff90fc Mon Sep 17 00:00:00 2001 From: the Mulhern Date: Fri, 13 Nov 2026 10:58:21 -0500 Subject: [PATCH 3/4] Build the package without isolation Signed-off-by: the Mulhern --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a507a0b71..3cae4618b 100644 --- a/Makefile +++ b/Makefile @@ -74,4 +74,4 @@ yamllint: .PHONY: package package: - (umask 0022; python -m build; python -m twine check --strict ./dist/*) + (umask 0022; python3 -m build --no-isolation; python3 -m twine check --strict ./dist/*) From 5faa9ac957c88532f39a2f97559dff6f38a98ca5 Mon Sep 17 00:00:00 2001 From: the Mulhern Date: Fri, 13 Nov 2026 11:24:46 -0500 Subject: [PATCH 4/4] Only run twine check if build succeeded Signed-off-by: the Mulhern --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3cae4618b..f37e168b6 100644 --- a/Makefile +++ b/Makefile @@ -74,4 +74,4 @@ yamllint: .PHONY: package package: - (umask 0022; python3 -m build --no-isolation; python3 -m twine check --strict ./dist/*) + (umask 0022; python3 -m build --no-isolation && python3 -m twine check --strict ./dist/*)