From f86ab673206dc66064bd99274081f4dd6c2fa4a0 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Sun, 12 Nov 2023 15:04:22 -0800 Subject: [PATCH 1/2] __VERSION__ -> __version__ in script/release --- script/release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/release b/script/release index 35b6419..2c8e336 100755 --- a/script/release +++ b/script/release @@ -33,7 +33,7 @@ fi # Set so that setup.py will create a public release style version number export OCTODNS_RELEASE=1 -VERSION="$(grep "^__VERSION__" "$ROOT/octodns_spf/__init__.py" | sed -e "s/.* = '//" -e "s/'$//")" +VERSION="$(grep "^__version__" "$ROOT/octodns_spf/__init__.py" | sed -e "s/.* = '//" -e "s/'$//")" git tag -s "v$VERSION" -m "Release $VERSION" git push origin "v$VERSION" From ae63352034fa7aa2db1d9d28feda1eb6ee4843fc Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Sun, 12 Nov 2023 15:45:32 -0800 Subject: [PATCH 2/2] Remove stale script/sdist script --- script/sdist | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100755 script/sdist diff --git a/script/sdist b/script/sdist deleted file mode 100755 index 6d3e053..0000000 --- a/script/sdist +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail - -cd "$(dirname "$0")"/.. -ROOT=$(pwd) - -if ! git diff-index --quiet HEAD --; then - echo "Changes in local directory, commit or clear" >&2 - exit 1 -fi - -VERSION="$(grep __VERSION__ "$ROOT/octodns_spf/__init__.py" | sed -e "s/.* = '//" -e "s/'$//")" -SHA=$(git rev-parse HEAD) -python setup.py sdist -TARBALL="dist/octodns-spf-$SHA.tar.gz" -mv dist/octodns-spf-$VERSION.tar.gz "$TARBALL" - -echo "Created $TARBALL"