From 4568b4659e3b969fecc752338e808711b5793037 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Sat, 27 Jul 2024 15:26:58 +0200 Subject: [PATCH] [CI/CD] grep the version out of version.py. Instead of running `python setup.py --version`. That's because earlier versions of Python that don't fully support dynamic version specifications through `pyproject.toml` may just return `0.0.0` here. --- .drone/update-deb-packages.sh | 2 +- .drone/update-rpm-repo.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone/update-deb-packages.sh b/.drone/update-deb-packages.sh index 74264ccb9b..e561dfca92 100755 --- a/.drone/update-deb-packages.sh +++ b/.drone/update-deb-packages.sh @@ -16,7 +16,7 @@ apt install -y curl dpkg-dev gpg git python3 python3-pip python3-setuptools echo "--- Parsing metadata" git config --global --add safe.directory "$PWD" git pull --rebase origin master --tags -export VERSION=$(python3 setup.py --version) +export VERSION=$(grep -e '^__version__' "${SRCDIR}/version.py" | sed -r -e 's/^__version__\s*=\s*"([^"]+)"$/\1/') export GIT_VERSION="$VERSION-$(git log --pretty=oneline HEAD...v$VERSION | wc -l)" export GIT_BUILD_DIR="$WORKDIR/${PKG_NAME}_${GIT_VERSION}_all" export GIT_DEB="$WORKDIR/${PKG_NAME}_${GIT_VERSION}_all.deb" diff --git a/.drone/update-rpm-repo.sh b/.drone/update-rpm-repo.sh index bf6c49381b..f4f44b1932 100755 --- a/.drone/update-rpm-repo.sh +++ b/.drone/update-rpm-repo.sh @@ -26,7 +26,7 @@ mkdir -p "$RPM_ROOT" echo "--- Parsing metadata" git config --global --add safe.directory $PWD git pull --rebase origin master --tags -export VERSION=$(python3 setup.py --version) +export VERSION=$(grep -e '^__version__' "${SRCDIR}/version.py" | sed -r -e 's/^__version__\s*=\s*"([^"]+)"$/\1/') export RELNUM="$(git log --pretty=oneline HEAD...v$VERSION | wc -l)" export SPECFILE="$WORKDIR/$PKG_NAME.spec" export BUILD_DIR="$WORKDIR/build"