From c61623c647bcbb18bcc7b4da2520f45056aba1bf Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Wed, 22 Dec 2021 17:05:37 +1000 Subject: [PATCH] Update version from v2021.12.22 to vv2021.12.22. --- README.md | 2 +- eris/setup.py | 2 +- fill3/setup.py | 2 +- lscolors/setup.py | 2 +- packaging/make-readme.py | 2 +- packaging/update-version | 6 +++++- termstr/setup.py | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6aacf05..4923808 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase. Install eris directly using pip, and apt install the tools eris relies on: - pip install git+https://github.com/ahamilton/eris@v2021.12.22#subdirectory=eris + pip install git+https://github.com/ahamilton/eris@vv2021.12.22#subdirectory=eris eris --apt-install-tools Or install from source: (including tools) diff --git a/eris/setup.py b/eris/setup.py index 0e05c81..b53ae3b 100755 --- a/eris/setup.py +++ b/eris/setup.py @@ -10,7 +10,7 @@ except ImportError: REPO_PATH = os.path.dirname(os.getcwd()) setup(name="eris", - version="v2021.12.22", + version="vv2021.12.22", description=("Eris maintains an up-to-date set of reports for every file in a codebase."), url="https://github.com/ahamilton/eris", author="Andrew Hamilton", diff --git a/fill3/setup.py b/fill3/setup.py index 528c4a5..144c895 100755 --- a/fill3/setup.py +++ b/fill3/setup.py @@ -10,7 +10,7 @@ except ImportError: REPO_PATH = os.path.dirname(os.getcwd()) setup(name="fill3", - version="v2021.12.22", + version="vv2021.12.22", description=("Fill3 provides basic widgets for a tui."), url="https://github.com/ahamilton/eris", author="Andrew Hamilton", diff --git a/lscolors/setup.py b/lscolors/setup.py index d8c6346..c075461 100755 --- a/lscolors/setup.py +++ b/lscolors/setup.py @@ -8,7 +8,7 @@ except ImportError: setup(name="lscolors", - version="v2021.12.22", + version="vv2021.12.22", description=("Give coloring for file types as in the ls command."), url="https://github.com/ahamilton/eris", author="Andrew Hamilton", diff --git a/packaging/make-readme.py b/packaging/make-readme.py index 8bb934c..fcf20f0 100755 --- a/packaging/make-readme.py +++ b/packaging/make-readme.py @@ -26,7 +26,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase. Install eris directly using pip, and apt install the tools eris relies on: - pip install git+https://github.com/ahamilton/eris@v2021.12.22#subdirectory=eris + pip install git+https://github.com/ahamilton/eris@vv2021.12.22#subdirectory=eris eris --apt-install-tools Or install from source: (including tools) diff --git a/packaging/update-version b/packaging/update-version index 7c39c13..02da574 100755 --- a/packaging/update-version +++ b/packaging/update-version @@ -9,12 +9,16 @@ set -e [ -e README.md ] -NEW_VERSION=$(date "+v%Y.%m.%d") +NEW_VERSION=$(date "+vv%Y.%m.%d") CURRENT_VERSION=$(git describe --tags --abbrev=0) if [ $NEW_VERSION == $CURRENT_VERSION ]; then + echo "Tag already exists. Retagging to HEAD." git tag --delete $CURRENT_VERSION else + echo "Commiting change to versions:" git grep -l $CURRENT_VERSION | xargs sed -i "s/$CURRENT_VERSION/$NEW_VERSION/g" + git diff git commit --all --message="Update version from $CURRENT_VERSION to $NEW_VERSION." fi git tag $NEW_VERSION +git log --max-count=1 diff --git a/termstr/setup.py b/termstr/setup.py index 757a0ce..dc689fe 100755 --- a/termstr/setup.py +++ b/termstr/setup.py @@ -8,7 +8,7 @@ except ImportError: setup(name="termstr", - version="v2021.12.22", + version="vv2021.12.22", description=("Termstr provides strings with extra terminal styling."), url="https://github.com/ahamilton/eris", author="Andrew Hamilton",