From 25519bdec2d2346f4b067d000107a5b4b3a67b69 Mon Sep 17 00:00:00 2001 From: Pedro Brochado Date: Tue, 21 Oct 2025 13:44:43 -0300 Subject: [PATCH 1/4] experiment --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d6c4a1f8ab..02ed8cb5a2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools >= 40.8.0", + "setuptools >= 40.8.0", # why such an old version? "wheel >= 0.29.0", ] build-backend = 'setuptools.build_meta' From 68061df67b1cfe4c45692c2ef0b2c87186bcee6b Mon Sep 17 00:00:00 2001 From: Pedro Brochado Date: Tue, 21 Oct 2025 14:03:42 -0300 Subject: [PATCH 2/4] Update oa-gen to use experimental PR --- .github/workflows/build.yml | 3 ++- .github/workflows/test.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 797454019f..298ca9829c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,8 @@ jobs: - uses: "actions/checkout@v4" with: fetch-depth: 1 - repository: "pulp/pulp-openapi-generator" + repository: "pedro-psb/pulp-openapi-generator" + ref: "pin-setuptools-build-version" path: "pulp-openapi-generator" - uses: "actions/setup-python@v5" with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d567363c1e..3f2861dc92 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,8 @@ jobs: - uses: "actions/checkout@v4" with: fetch-depth: 1 - repository: "pulp/pulp-openapi-generator" + repository: "pedro-psb/pulp-openapi-generator" + ref: "pin-setuptools-build-version" path: "pulp-openapi-generator" - uses: "actions/setup-python@v5" From 4ea852dabf758d368a3c9dd41be94a7beadd7e53 Mon Sep 17 00:00:00 2001 From: Pedro Brochado Date: Tue, 21 Oct 2025 14:24:26 -0300 Subject: [PATCH 3/4] Update build to use the "build" program --- .github/workflows/scripts/build_python_client.sh | 6 +++--- .github/workflows/scripts/script.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scripts/build_python_client.sh b/.github/workflows/scripts/build_python_client.sh index 1eec5eda7c..1ea7014bfb 100755 --- a/.github/workflows/scripts/build_python_client.sh +++ b/.github/workflows/scripts/build_python_client.sh @@ -21,7 +21,7 @@ rm -rf "pulpcore-client" ./gen-client.sh "../pulpcore/core-api.json" "core" python "pulpcore" pushd pulpcore-client -python setup.py sdist bdist_wheel --python-tag py3 +python -m build twine check "dist/pulpcore_client-"*"-py3-none-any.whl" twine check "dist/pulpcore_client-"*".tar.gz" @@ -56,7 +56,7 @@ rm -rf "pulp_file-client" ./gen-client.sh "../pulpcore/file-api.json" "file" python "pulp_file" pushd pulp_file-client -python setup.py sdist bdist_wheel --python-tag py3 +python -m build twine check "dist/pulp_file_client-"*"-py3-none-any.whl" twine check "dist/pulp_file_client-"*".tar.gz" @@ -91,7 +91,7 @@ rm -rf "pulp_certguard-client" ./gen-client.sh "../pulpcore/certguard-api.json" "certguard" python "pulp_certguard" pushd pulp_certguard-client -python setup.py sdist bdist_wheel --python-tag py3 +python -m build twine check "dist/pulp_certguard_client-"*"-py3-none-any.whl" twine check "dist/pulp_certguard_client-"*".tar.gz" diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index 9e2d796811..542e34f80a 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -72,7 +72,7 @@ pushd ../pulp-openapi-generator rm -rf "./${PACKAGE}-client" ./gen-client.sh "${COMPONENT}-api.json" "${COMPONENT}" python "${PACKAGE}" pushd "${PACKAGE}-client" - python setup.py sdist bdist_wheel --python-tag py3 + python -m build popd else if [ ! -f "${PACKAGE}-client/dist/${PACKAGE}_client-${VERSION}-py3-none-any.whl" ] From 810bfb99d50832ad879ad0280a7c1b5b8fc234de Mon Sep 17 00:00:00 2001 From: Pedro Brochado Date: Tue, 21 Oct 2025 14:29:07 -0300 Subject: [PATCH 4/4] Revert "Update oa-gen to use experimental PR" This reverts commit 68061df67b1cfe4c45692c2ef0b2c87186bcee6b. --- .github/workflows/build.yml | 3 +-- .github/workflows/test.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 298ca9829c..797454019f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,8 +26,7 @@ jobs: - uses: "actions/checkout@v4" with: fetch-depth: 1 - repository: "pedro-psb/pulp-openapi-generator" - ref: "pin-setuptools-build-version" + repository: "pulp/pulp-openapi-generator" path: "pulp-openapi-generator" - uses: "actions/setup-python@v5" with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f2861dc92..d567363c1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,8 +35,7 @@ jobs: - uses: "actions/checkout@v4" with: fetch-depth: 1 - repository: "pedro-psb/pulp-openapi-generator" - ref: "pin-setuptools-build-version" + repository: "pulp/pulp-openapi-generator" path: "pulp-openapi-generator" - uses: "actions/setup-python@v5"