Skip to content

Missed a spot for the PEP-625 fix. #989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ggainey wants to merge 1 commit into from
Closed

Missed a spot for the PEP-625 fix. #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion templates/github/.github/workflows/scripts/build_python_client.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Copy link
Member

@pedro-psb pedro-psb Oct 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pulp-openapi-generator generates the client code in a dir named "{{ plugin.name | snake }}-client". Here.

I'm not saying we must update it there, because I understand that the problem is with the python built artifact (source distribution tar) name. And I don't think this dir name affects the artifact name, I don't know.

Anyway, those are two different things.


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"

Expand Down
2 changes: 1 addition & 1 deletion templates/github/.github/workflows/scripts/publish_client_pypi.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
;
2 changes: 1 addition & 1 deletion templates/github/.github/workflows/scripts/script.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/github/.github/workflows/test.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Loading