From dbe34e65db91884b86c0f683203e8c09429be643 Mon Sep 17 00:00:00 2001
From: Grant Gainey <ggainey@redhat.com>
Date: Tue, 21 Oct 2025 07:38:07 -0400
Subject: [PATCH] Missed a spot for the PEP-625 fix.

---
 .../.github/workflows/scripts/build_python_client.sh.j2       | 3 ++-
 .../.github/workflows/scripts/publish_client_pypi.sh.j2       | 2 +-
 templates/github/.github/workflows/scripts/script.sh.j2       | 2 +-
 templates/github/.github/workflows/test.yml.j2                | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/github/.github/workflows/scripts/build_python_client.sh.j2 b/templates/github/.github/workflows/scripts/build_python_client.sh.j2
index 5842c268..ae54d9c5 100755
--- a/templates/github/.github/workflows/scripts/build_python_client.sh.j2
+++ b/templates/github/.github/workflows/scripts/build_python_client.sh.j2
@@ -12,13 +12,14 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 
 pushd ../pulp-openapi-generator
 {%- for plugin in plugins %}
-rm -rf "{{ plugin.name | snake }}-client"
+rm -rf "{{ plugin.name | snake }}_client"
 
 ./gen-client.sh "../{{ plugin_name }}/{{ plugin.app_label }}-api.json" "{{ plugin.app_label }}" python "{{ plugin.name | snake }}"
 
 pushd {{ plugin.name | snake }}-client
 python setup.py sdist bdist_wheel --python-tag py3
 
+ls dist/
 twine check "dist/{{ plugin.name | snake }}_client-"*"-py3-none-any.whl"
 twine check "dist/{{ plugin.name | snake }}_client-"*".tar.gz"
 
diff --git a/templates/github/.github/workflows/scripts/publish_client_pypi.sh.j2 b/templates/github/.github/workflows/scripts/publish_client_pypi.sh.j2
index 99f398d7..18709f7a 100755
--- a/templates/github/.github/workflows/scripts/publish_client_pypi.sh.j2
+++ b/templates/github/.github/workflows/scripts/publish_client_pypi.sh.j2
@@ -18,6 +18,6 @@ fi
 twine upload -u __token__ -p "${PYPI_API_TOKEN}" \
 {%- for plugin in plugins %}
 "dist/{{ plugin.name | snake }}_client-${VERSION}-py3-none-any.whl" \
-"dist/{{ plugin.name | snake }}-client-${VERSION}.tar.gz" \
+"dist/{{ plugin.name | snake }}_client-${VERSION}.tar.gz" \
 {%- endfor %}
 ;
diff --git a/templates/github/.github/workflows/scripts/script.sh.j2 b/templates/github/.github/workflows/scripts/script.sh.j2
index 9ccc2b67..56966efc 100755
--- a/templates/github/.github/workflows/scripts/script.sh.j2
+++ b/templates/github/.github/workflows/scripts/script.sh.j2
@@ -64,7 +64,7 @@ pushd ../pulp-openapi-generator
     cmd_prefix pulpcore-manager openapi --bindings --component "${COMPONENT}" > "${COMPONENT}-api.json"
     if [[ ! " ${BUILT_CLIENTS} " =~ "${COMPONENT}" ]]
     then
-      rm -rf "./${PACKAGE}-client"
+      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
diff --git a/templates/github/.github/workflows/test.yml.j2 b/templates/github/.github/workflows/test.yml.j2
index 854b8ed8..a6c4e73c 100644
--- a/templates/github/.github/workflows/test.yml.j2
+++ b/templates/github/.github/workflows/test.yml.j2
@@ -60,8 +60,8 @@ jobs:
         working-directory: "pulp-openapi-generator"
         run: |
           {%- for plugin in plugins %}
-          mkdir -p "{{ plugin.name | snake }}-client"
-          pushd "{{ plugin.name | snake }}-client"
+          mkdir -p "{{ plugin.name | snake }}_client"
+          pushd "{{ plugin.name | snake }}_client"
           tar xvf "../../{{ plugin_name }}/{{ plugin.app_label }}-python-client.tar"
           popd
           {%- endfor %}