From 6dce8779e9bc8eecb793d556f46a95fdee0e931b Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 18 Jul 2019 12:24:00 +0200 Subject: build_release: Improve sdist building (cherry picked from commit dfabbff63b1fba3c86a921c306883bfe39df2bdd) --- scripts/dev/build_release.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py index 0f1b49619..aa1026c0a 100755 --- a/scripts/dev/build_release.py +++ b/scripts/dev/build_release.py @@ -380,8 +380,16 @@ def github_upload(artifacts, tag): def pypi_upload(artifacts): """Upload the given artifacts to PyPI using twine.""" + utils.print_title("Uploading to PyPI...") filenames = [a[0] for a in artifacts] - subprocess.run(['twine', 'upload'] + filenames, check=True) + subprocess.run([sys.executable, '-m', 'twine', 'upload'] + filenames, + check=True) + + +def upgrade_sdist_dependencies(): + """Make sure we have the latest tools for an sdist release.""" + subprocess.run([sys.executable, '-m', 'pip', 'install', '-U', 'twine', + 'pip', 'wheel', 'setuptools'], check=True) def main(): @@ -415,6 +423,7 @@ def main(): elif sys.platform == 'darwin': artifacts = build_mac() else: + upgrade_sdist_dependencies() test_makefile() artifacts = build_sdist() upload_to_pypi = True -- cgit v1.2.3-54-g00ecf