Skip to content

Commit 552707d

Browse files
Change the name of our release archives to lowercase
This will be required by PyPI in the future and is defined in the respective Python standards. Fixes #1131.
1 parent 6262e2d commit 552707d

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ SPDX-License-Identifier: Apache-2.0
99

1010
# BenchExec Changelog
1111

12+
## Changes planned for the next release
13+
14+
- The name of the wheel and tar archives in BenchExec releases
15+
changes from `BenchExec-$VERSION*` to `benchexec-$VERSION*`
16+
in accordance with Python standard PEP 625 and PyPI requirements.
17+
1218
## BenchExec 3.28 - 2025-03-01
1319

1420
- Some new and improved tool-info modules.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
[build-system]
99
requires = [
1010
# Require versions that support our license files
11-
# but produce the same names for artifacts as we always had.
12-
'setuptools == 69.2.0',
11+
# and produce the expected file names or archives.
12+
'setuptools >= 69.3.0',
1313
'wheel >= 0.32.0',
1414
]
1515
build-backend = 'setuptools.build_meta'

release.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,22 @@ rm -rf "$TEMP3"
9191

9292

9393
# Build Debian package
94-
TAR="BenchExec-$VERSION.tar.gz"
94+
TAR="benchexec-$VERSION.tar.gz"
9595

9696
TEMP_DEB="$(mktemp -d)"
9797
cp "$DIST_DIR/$TAR" "$TEMP_DEB"
9898
pushd "$TEMP_DEB"
9999
tar xf "$TAR"
100-
cp -r "$DIR/debian" "$TEMP_DEB/BenchExec-$VERSION"
101-
cd "BenchExec-$VERSION"
100+
cp -r "$DIR/debian" "$TEMP_DEB/benchexec-$VERSION"
101+
cd "benchexec-$VERSION"
102102

103103
dh_make -p "benchexec_$VERSION" --createorig -f "../$TAR" -i -c apache || true
104104

105105
dpkg-buildpackage --build=source -sa "--sign-key=$DEBKEY"
106106
podman run --security-opt unmask=/sys/fs/cgroup --cgroups=split \
107107
--security-opt unmask=/proc/* --security-opt seccomp=unconfined --device /dev/fuse \
108108
--rm -w "$(pwd)" -v "$TEMP_DEB:$TEMP_DEB:rw" --rm ubuntu:20.04 \
109-
"$TEMP_DEB/BenchExec-$VERSION/test/setup_cgroupsv2_in_container.sh" bash -c '
109+
"$TEMP_DEB/benchexec-$VERSION/test/setup_cgroupsv2_in_container.sh" bash -c '
110110
apt-get update
111111
apt-get install -y --no-install-recommends dpkg-dev
112112
TZ=UTC DEBIAN_FRONTEND=noninteractive apt-get install -y $(dpkg-checkbuilddeps 2>&1 | grep -o "Unmet build dependencies:.*" | cut -d: -f2- | sed "s/([^)]*)//g")
@@ -116,7 +116,7 @@ popd
116116
cp "$TEMP_DEB/benchexec_$VERSION"{.orig.tar.gz,-1_all.deb,-1.dsc,-1.debian.tar.xz,-1_source.buildinfo,-1_source.changes} "$DIST_DIR"
117117
rm -rf "$TEMP_DEB"
118118

119-
for f in "$DIST_DIR/BenchExec-$VERSION"*.{whl,tar.gz} "$DIST_DIR/benchexec_$VERSION"*.deb; do
119+
for f in "$DIST_DIR/benchexec-$VERSION"*.{whl,tar.gz} "$DIST_DIR/benchexec_$VERSION"*.deb; do
120120
gpg --detach-sign -a -u "$DEBKEY" "$f"
121121
done
122122
git tag -s "$VERSION" -m "Release $VERSION"
@@ -130,7 +130,7 @@ if ! [[ $REPLY =~ ^[Yy]$ ]]; then
130130
fi
131131

132132
git push --tags
133-
twine upload "$DIST_DIR/BenchExec"*
133+
twine upload "$DIST_DIR/benchexec-$VERSION"*.{whl,whl.asc,tar.gz,tar.gz.asc}
134134
dput ppa:sosy-lab/benchmarking "$DIST_DIR/benchexec_$VERSION-1_source.changes"
135135

136136
REPLY=
@@ -143,6 +143,6 @@ git commit benchexec/__init__.py -m"Prepare version number for next development
143143

144144
echo
145145
echo "Please create a release on GitHub and add content from CHANGELOG.md and the following files:"
146-
ls -1 "$DIST_DIR/BenchExec-$VERSION"*.{whl,whl.asc,tar.gz,tar.gz.asc} "$DIST_DIR/benchexec_$VERSION"*.{deb,deb.asc}
146+
ls -1 "$DIST_DIR/benchexec-$VERSION"*.{whl,whl.asc,tar.gz,tar.gz.asc} "$DIST_DIR/benchexec_$VERSION"*.{deb,deb.asc}
147147
echo "=> https://github.com/sosy-lab/benchexec/releases/new?tag=$VERSION&title=Release%20$VERSION"
148148
echo "Please also copy the binary PPA packages to all newer supported Ubuntu versions after they have been built by going to https://launchpad.net/%7Esosy-lab/+archive/ubuntu/benchmarking/+copy-packages"

0 commit comments

Comments
 (0)