From 2676d7babe1630560f73b0aeda0640ad185315bc Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Mon, 18 Sep 2023 15:49:11 +0200 Subject: [PATCH] A more resilient way of renaming site-packages to dist-packages. --- .drone.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5a39e5263..b94ed6c14 100644 --- a/.drone.yml +++ b/.drone.yml @@ -275,7 +275,6 @@ steps: - echo "--- Parsing metadata" - git config --global --add safe.directory $PWD - git pull --rebase origin master --tags - - export PY_VERSION="$(python3 --version | awk '{print $2}' | sed -r -e 's/^([0-9]+\.[0-9]+).*/\1/')" - export VERSION=$(python3 setup.py --version) - export HEAD=$(git log --pretty=format:%h HEAD...HEAD~1) - export TAG_URL="https://git.platypush.tech/platypush/platypush/archive/v$VERSION.tar.gz" @@ -286,7 +285,11 @@ steps: - echo "--- Building git package" - pip install --prefix="$GIT_BUILD_DIR/usr" --no-cache --no-deps . - - mv "$GIT_BUILD_DIR/usr/lib/python$${PY_VERSION}/site-packages" "$GIT_BUILD_DIR/usr/lib/python$${PY_VERSION}/dist-packages" + - | + find "$GIT_BUILD_DIR" -name "site-packages" | while read dir; do + base="$(dirname "$dir")" + mv "$dir" "$base/dist-packages" + done - mkdir -p "$GIT_BUILD_DIR/DEBIAN" - | @@ -334,7 +337,6 @@ steps: - echo "--- Parsing metadata" - git config --global --add safe.directory $PWD - git pull --rebase origin master --tags - - export PY_VERSION="$(python3 --version | awk '{print $2}' | sed -r -e 's/^([0-9]+\.[0-9]+).*/\1/')" - export VERSION=$(python3 setup.py --version) - export HEAD=$(git log --pretty=format:%h HEAD...HEAD~1) - export TAG_URL="https://git.platypush.tech/platypush/platypush/archive/v$VERSION.tar.gz" @@ -345,7 +347,12 @@ steps: - echo "--- Building git package" - pip install --prefix="$GIT_BUILD_DIR/usr" --no-cache --no-deps . - - mv "$GIT_BUILD_DIR/usr/lib/python$${PY_VERSION}/site-packages" "$GIT_BUILD_DIR/usr/lib/python$${PY_VERSION}/dist-packages" + - | + find "$GIT_BUILD_DIR" -name "site-packages" | while read dir; do + base="$(dirname "$dir")" + mv "$dir" "$base/dist-packages" + done + - mkdir -p "$GIT_BUILD_DIR/DEBIAN" - |