From 2c4e1d2c1110f1b70168211e106253ffe10061aa Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 14 Apr 2024 22:23:22 +0200 Subject: [PATCH] CI: adapt for setuptools >= 65.3 setuptools 65.3 has https://github.com/pypa/setuptools/issues/3593 "Implement PEP 625 - File Name of a Source Distribution" which modifies the source tarball. Adapt for it --- .github/workflows/cmake_builds.yml | 2 +- HOWTO-RELEASE | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml index e63bf933e025..5c3525b7079b 100644 --- a/.github/workflows/cmake_builds.yml +++ b/.github/workflows/cmake_builds.yml @@ -234,7 +234,7 @@ jobs: - name: Standalone Python bindings build from source run: | (cd $GITHUB_WORKSPACE/superbuild/build/gdal/swig/python && python setup.py sdist) - mv $GITHUB_WORKSPACE/superbuild/build/gdal/swig/python/dist/GDAL-*.tar.gz gdal-python.tar.gz + mv $GITHUB_WORKSPACE/superbuild/build/gdal/swig/python/dist/gdal-*.tar.gz gdal-python.tar.gz mv $GITHUB_WORKSPACE/superbuild/build/gdal/swig/python gdal-swig-python python3 -m venv myvenv source myvenv/bin/activate diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE index f57e3894800a..9a743f4402f0 100644 --- a/HOWTO-RELEASE +++ b/HOWTO-RELEASE @@ -216,14 +216,14 @@ the GDAL package by one of the current owners : HowardB/FrankW/EvenR) c) python3 setup.py sdist - d) Check the output: - twine check dist/GDAL-*.gz + d) Check the output (this assumes setuptools >= 65.3.0, otherwise the filename is GDAL-*.gz): + twine check dist/gdal-*.gz e) For trial : - twine upload dist/GDAL-*.gz -r pypitest + twine upload dist/gdal-*.gz -r pypitest f) For real : - twine upload dist/GDAL-*.gz + twine upload dist/gdal-*.gz 15.3) create gdal-utils wheel and upload to pypi: