zuul/zuul-jobs
Code Issues Proposed changes

Simplify twine invocation for PyPI uploads

Browse Source 
Modern PyPI no longer requires a separate register step, new
projects are registered at the time of upload, so drop the
registration tasks. Twine can also upload multiple artifacts in a
single invocation, and does so in the order in which they're
provided on the command line, thus there's no longer any need for
looping or different wheel and sdist tarball upload tasks.

Change-Id: I09acaf458af600137c72a70a8782c47b67937b60
This commit is contained in:
Jeremy Stanley
2020-06-16 14:48:03 +00:00
parent 7c64b4bdb3
commit 291edab5f6
1 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
roles/upload-pypi/tasks/main.yaml
View File

@@ -21,19 +21,6 @@
msg: "Found no wheels to upload: {{ found_wheels.msg }}"
when: found_wheels.files == []
- name: Register packages on the PyPI server (via wheels)
command: "{{ pypi_twine_executable }} register --config-file {{ _pypirc_tmp.path }} --repository {{ pypi_repository }} {{ zj_wheel.path }}"
with_items: "{{ found_wheels.files }}"
loop_control:
loop_var: zj_wheel
when: pypi_register_first
- name: Upload wheel with twine before tarballs
command: "{{ pypi_twine_executable }} upload --config-file {{ _pypirc_tmp.path }} -r {{ pypi_repository }} {{ zj_wheel.path }}"
with_items: "{{ found_wheels.files }}"
loop_control:
loop_var: zj_wheel
- name: Find tarballs to upload
find:
paths: "{{ pypi_path }}"
@@ -45,20 +32,8 @@
msg: "Found no tarballs to upload: {{ found_tarballs.msg }}"
when: found_tarballs.files == []
- name: Register packages on the PyPI server (via tarballs)
command: "{{ pypi_twine_executable }} register --config-file {{ _pypirc_tmp.path }} --repository {{ pypi_repository }} {{ zj_tarball.path }}"
with_items: "{{ found_tarballs.files }}"
loop_control:
loop_var: zj_tarball
when:
- pypi_register_first
- found_wheels.files == []
- name: Upload tarballs with twine
command: "{{ pypi_twine_executable }} upload --config-file {{ _pypirc_tmp.path }} -r {{ pypi_repository }} {{ zj_tarball.path }}"
with_items: "{{ found_tarballs.files }}"
loop_control:
loop_var: zj_tarball
- name: Upload wheels and sdist tarballs with twine
command: "{{ pypi_twine_executable }} upload --config-file {{ _pypirc_tmp.path }} -r {{ pypi_repository }} {{ found_wheels.files | map(attribute='path') | join(' ') }} {{ found_tarballs.files | map(attribute='path') | join(' ') }}"
- name: Delete .pypirc configuration file
file: