From f0aca673ba3f2e5e10aefa4505ebd14ede01139d Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Wed, 11 May 2022 08:33:48 -0600 Subject: Add back "sdist" zipfile [skip appveyor] Uncommented the code building a zipfile of the release. This is done "the old way" (calling setup.py with args), since the "build" tool doesn't handle this. Signed-off-by: Mats Wichmann --- ReleaseConfig | 6 +++--- SConstruct | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ReleaseConfig b/ReleaseConfig index 2b80306..1d5455d 100755 --- a/ReleaseConfig +++ b/ReleaseConfig @@ -27,9 +27,9 @@ # The version tuple that will be used for the release. The fields are # (major, minor, micro, type, patchlevel). The release level is one of -# 'alpha', 'beta', 'candidate', or 'final'. If the release type is not -# 'final', the patchlevel is set to the release date. This value is -# mandatory and must be present in this file. +# 'a' (alpha), 'b' (beta), 'rc' (release candidate), or 'final'. +# If the release type is not 'final', the patchlevel is set to the +# release date. This value is mandatory and must be present in this file. #version_tuple = (2, 2, 0, 'final', 0) version_tuple = (4, 5, 2, 'a', 0) diff --git a/SConstruct b/SConstruct index bd090d5..46cb814 100644 --- a/SConstruct +++ b/SConstruct @@ -209,10 +209,13 @@ wheel = env.Command( action='$PYTHON -m build --outdir $DISTDIR', ) -# Do we actually need this one? -# zip_file = env.Command('$DISTDIR/SCons-${VERSION}.zip', ['setup.cfg', 'setup.py', 'SCons/__init__.py']+man_pages, -# #'$PYTHON setup.py sdist --format=zip') -# '$PYTHON setup.py sdist --format=zip') +# TODO: this is built the old way, because "build" doesn't make zipfiles, +# and it deletes its isolated env so we can't just zip that one up. +zip_file = env.Command( + target='$DISTDIR/SCons-${VERSION}.zip', + source=['setup.cfg', 'setup.py', 'SCons/__init__.py'] + man_pages, + action='$PYTHON setup.py sdist --format=zip', +) # Now set depends so the above run in a particular order # NOTE: 'build' with default options builds sdist, then whl from sdist, -- cgit v0.12