Skip to content

Commit faf7366

Browse files
authored
CI: fix release scripts to work with PEP 625 (#1050)
With version 69.3.0, setuptools started naming dist archives according to PEP 625. This broke our release scripts. Signed-off-by: Grant Lodge <6323995+thelonelyvulpes@users.noreply.github.com>
1 parent 903755b commit faf7366

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

bin/check-dist

+7-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@ then
1313
exit 1
1414
else
1515
source "${ROOT}/bin/dist-functions"
16-
check_file "${DIST}/neo4j-driver-${VERSION}.tar.gz"
17-
check_file "${DIST}/neo4j-${VERSION}.tar.gz"
16+
for PACKAGE in "neo4j-driver" "neo4j"; do
17+
NORMALIZED_PACKAGE="$(normalize_dist_name "$PACKAGE")"
18+
if ! (check_file "${DIST}/${NORMALIZED_PACKAGE}-${VERSION}.tar.gz" \
19+
|| check_file "${DIST}/${PACKAGE}-${VERSION}.tar.gz"); then
20+
STATUS=1
21+
fi
22+
done
1823
fi
1924

2025
exit ${STATUS}

bin/dist-functions

+14-3
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,23 @@ function set_deprecated {
3939
sed -i 's/^deprecated_package = .*/deprecated_package = '$1'/g' "${SRC}/neo4j/_meta.py"
4040
}
4141

42+
# distribution normalization according to PEP 625 https://peps.python.org/pep-0625/
43+
function normalize_dist_name
44+
{
45+
echo $1 | sed 's/[._-]\+/_/g' | tr '[:upper:]' '[:lower:]'
46+
}
47+
4248
function check_file
4349
{
4450
FILE=$1
45-
echo -n "Checking file $(basename ${FILE})... "
51+
echo -n "Checking file $(basename "${FILE}")... "
4652
if [ -f "${FILE}" ]
4753
then
4854
echo "OK"
55+
return 0
4956
else
5057
echo "missing"
51-
STATUS=1
58+
return 1
5259
fi
5360
}
5461

@@ -100,7 +107,11 @@ function set_metadata_and_setup
100107
find . -name *.pyc -delete
101108
rm -rf "${SRC}/*.egg-info" 2> /dev/null
102109
python -m build $*
103-
check_file "${DIST}/${PACKAGE}-${VERSION}.tar.gz"
110+
NORMALIZED_PACKAGE="$(normalize_dist_name $PACKAGE)"
111+
if ! (check_file "${DIST}/${NORMALIZED_PACKAGE}-${VERSION}.tar.gz" \
112+
|| check_file "${DIST}/${PACKAGE}-${VERSION}.tar.gz"); then
113+
STATUS=1
114+
fi
104115

105116
trap - EXIT
106117
cleanup

0 commit comments

Comments
 (0)