From 1003c3c09fd39148193ccd98e72c143b8c6b7c2e Mon Sep 17 00:00:00 2001
From: David Souther <davidsouther+github@gmail.com>
Date: Tue, 1 Oct 2024 10:42:31 +0200
Subject: [PATCH 1/5] Update instructions to use YYYY.WW.REV for release
 versions.

---
 README.md | 29 ++++++++++-------------------
 setup.py  |  2 +-
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 5ab9843..26d3547 100644
--- a/README.md
+++ b/README.md
@@ -89,27 +89,18 @@ There are two stages, testing and deployment.
 
 1. **Update the -tools version**: Once the tests pass, update the `setup.py` version and create a tag in the -tools repository at the same SHA you identified earlier.
 
-   - Determine the next [semver](https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers) number as appropriate for the changes in this release. e.g. `1.1.4`
-   - Create a local version identifier, with the format `YYYY-MM-DD-A`, where `YYYY-MM-DD` represents release date, and `-A` is used for the first release of the day (followed by `-B`, `-C`, etc., for subsequent same-day releases). e.g. `2024-08-24-A`
-
-     - Here is a command line script to generate the local identifier, tested on Mac:
-
-     ```
-     TAG_NAME=$(date +%Y-%m-%d)-A && \
-       SHA=$(git rev-parse HEAD) && \
-       git tag -a "$TAG_NAME" "$SHA" -m "Release $TAG_NAME" && \
-       git push origin "$TAG_NAME"
-     ```
-
-   - The new version will be `{NEXT_SEMVER}+{LOCAL_VERSION}`, e.g. `1.1.4+2024-08-24-A`
-     - **Update `setup.py` with this version.**
-   - Create a tag at the SHA from the testing phase, using the local version identifier.
-
-2. **Update your testing PR branch**: Remove SHA and add tag to [validate-doc-metadata.yml](https://github.com/awsdocs/aws-doc-sdk-examples/blob/main/.github/workflows/validate-doc-metadata.yml)
+  - Determine the next [stamp](https://blog.aspect.build/versioning-releases-from-a-monorepo) (which is valid [semver](https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers)) number as appropriate for the changes in this release. e.g. `2024.40.2`.
+  - Get the current year and week with `date +%Y.%W`. Increment or roll over the version number as necessary.
+  - **Update `setup.py` with this version.**
+  - Create a local version identifier, with the format `YYYY-WW-REV`.
+  - Create a tag at the SHA from the testing phase, using the local version identifier.
+  <!-- TODO: Create a script using Python setuptools, `import pkg_resources; version = pkg_resources.require("MyProject")[0].version` and auto-increment/roll over versions.>
+
+1. **Update your testing PR branch**: Remove SHA and add tag to [validate-doc-metadata.yml](https://github.com/awsdocs/aws-doc-sdk-examples/blob/main/.github/workflows/validate-doc-metadata.yml)
    - NOTE: Remove the SHA from [.doc_gen/validation.yaml](https://github.com/awsdocs/aws-doc-sdk-examples/blob/main/.doc_gen/validation.yaml)
    - This is easily accomplished in the UI.
-3. **Create a release**: Use the automated ["Create release from tag" button](https://github.com/awsdocs/aws-doc-sdk-examples-tools/releases/new) to create a new release with the new tag.
-4. **Perform internal update process**.
+2. **Create a release**: Use the automated ["Create release from tag" button](https://github.com/awsdocs/aws-doc-sdk-examples-tools/releases/new) to create a new release with the new tag.
+3. **Perform internal update process**.
 
 ## Security
 
diff --git a/setup.py b/setup.py
index 62cbb2f..b6ab446 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="aws_doc_sdk_examples_tools",
-    version="1.0.4+2024-09-20-A",
+    version="2024.40.0",
     packages=["aws_doc_sdk_examples_tools"],
     package_data={"aws_doc_sdk_examples_tools": ["config/*.yaml"]},
     entry_points={

From ce531ee0c59d70044fedb4dd78962508d2d5360d Mon Sep 17 00:00:00 2001
From: David Souther <davidsouther+github@gmail.com>
Date: Tue, 1 Oct 2024 16:05:44 +0200
Subject: [PATCH 2/5] Add stamp.sh file to more sanely advance the version
 number.

---
 setup.py |  2 +-
 stamp.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100755 stamp.sh

diff --git a/setup.py b/setup.py
index b6ab446..c8a8a36 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="aws_doc_sdk_examples_tools",
-    version="2024.40.0",
+    version="2024.40.2",
     packages=["aws_doc_sdk_examples_tools"],
     package_data={"aws_doc_sdk_examples_tools": ["config/*.yaml"]},
     entry_points={
diff --git a/stamp.sh b/stamp.sh
new file mode 100755
index 0000000..6722b7f
--- /dev/null
+++ b/stamp.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+set -e # Exit on errors
+# set -x # Shell debugging
+
+# First, check that we're on the main branch.
+BRANCH=$(git rev-parse --abbrev-rev HEAD)
+if [ "$BRANCH" != "main" ] ; then 
+    echo "Not on main, exiting!" 
+    exit 1
+fi 
+
+# And check that the main branch is clean
+STATUS=$(git status --porcelain)
+if [ -n "${STATUS}" ] ; then
+    echo "Repository is not clean, exiting!" 
+    exit 1
+fi 
+
+# VERSION and DATE have the format YYYY.WW.REV, where YYYY is the current year,
+# WW is the current week, and REV is the number of releases this week.
+# The next revision compares the two, in this way
+# - If DATE is later than VERSION in all fields, accept date.
+# - Otherwise, return VERSION, with one added to REV.
+#
+# THIS FUNCTION IS NOT TRANSITIVE! It must be called with
+# `compare_versions CURRENT NEXT`
+compare_versions() {
+    IFS='.' read -r y1 w1 r1 <<< "$1"
+    IFS='.' read -r y2 w2 r2 <<< "$2"
+
+    if [ "$y1" -lt "$y2" ] || \
+       [ "$w1" -lt "$w2" ] || \
+       [ "$r1" -lt "$r2" ]; then
+        echo "$2"
+    else
+        r1=$((r1 + 1))
+        echo "${y1}.${w1}.${r1}"
+    fi
+}
+
+# compare_versions 2024.44.4 2024.44.0 # 2024.44.5
+# compare_versions 2024.44.4 2024.45.0 # 2024.45.0
+# compare_versions 2024.44.4 2025.1.0 # 2025.1.0
+
+CURRENT=$(grep version= setup.py | awk -F\" '{print $2}')
+NEXT=$(date +%Y.%W.0)
+VERSION=$(compare_versions "$CURRENT" "$NEXT")
+echo "Releasing $VERSION..."
+sed -i '' "/version=/ s/$CURRENT/$VERSION/" setup.py
+git diff
+git add setup.py
+git commit --message "Release ${VERSION}"
+git tag $VERSION main
+git push origin $VERSION
+git push origin main
\ No newline at end of file

From 3264a5324ef07b2cab81b7730fc310f411aac633 Mon Sep 17 00:00:00 2001
From: David Souther <davidsouther+github@gmail.com>
Date: Tue, 1 Oct 2024 16:10:02 +0200
Subject: [PATCH 3/5] Update README and add --release flag

---
 README.md |  8 ++------
 stamp.sh  | 15 +++++++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 26d3547..c437862 100644
--- a/README.md
+++ b/README.md
@@ -90,15 +90,11 @@ There are two stages, testing and deployment.
 1. **Update the -tools version**: Once the tests pass, update the `setup.py` version and create a tag in the -tools repository at the same SHA you identified earlier.
 
   - Determine the next [stamp](https://blog.aspect.build/versioning-releases-from-a-monorepo) (which is valid [semver](https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers)) number as appropriate for the changes in this release. e.g. `2024.40.2`.
-  - Get the current year and week with `date +%Y.%W`. Increment or roll over the version number as necessary.
-  - **Update `setup.py` with this version.**
-  - Create a local version identifier, with the format `YYYY-WW-REV`.
-  - Create a tag at the SHA from the testing phase, using the local version identifier.
-  <!-- TODO: Create a script using Python setuptools, `import pkg_resources; version = pkg_resources.require("MyProject")[0].version` and auto-increment/roll over versions.>
+  - Run `stamp.sh` to automatically perform this action. Use `--release` to additionally create a tag and push to main.
 
 1. **Update your testing PR branch**: Remove SHA and add tag to [validate-doc-metadata.yml](https://github.com/awsdocs/aws-doc-sdk-examples/blob/main/.github/workflows/validate-doc-metadata.yml)
    - NOTE: Remove the SHA from [.doc_gen/validation.yaml](https://github.com/awsdocs/aws-doc-sdk-examples/blob/main/.doc_gen/validation.yaml)
-   - This is easily accomplished in the UI.
+   - This is easily accomplished in the Github UI.
 2. **Create a release**: Use the automated ["Create release from tag" button](https://github.com/awsdocs/aws-doc-sdk-examples-tools/releases/new) to create a new release with the new tag.
 3. **Perform internal update process**.
 
diff --git a/stamp.sh b/stamp.sh
index 6722b7f..335f1f5 100755
--- a/stamp.sh
+++ b/stamp.sh
@@ -7,14 +7,14 @@ set -e # Exit on errors
 BRANCH=$(git rev-parse --abbrev-rev HEAD)
 if [ "$BRANCH" != "main" ] ; then 
     echo "Not on main, exiting!" 
-    exit 1
+    # exit 1
 fi 
 
 # And check that the main branch is clean
 STATUS=$(git status --porcelain)
 if [ -n "${STATUS}" ] ; then
     echo "Repository is not clean, exiting!" 
-    exit 1
+    # exit 1
 fi 
 
 # VERSION and DATE have the format YYYY.WW.REV, where YYYY is the current year,
@@ -48,9 +48,12 @@ NEXT=$(date +%Y.%W.0)
 VERSION=$(compare_versions "$CURRENT" "$NEXT")
 echo "Releasing $VERSION..."
 sed -i '' "/version=/ s/$CURRENT/$VERSION/" setup.py
-git diff
+git --no-pager diff
 git add setup.py
 git commit --message "Release ${VERSION}"
-git tag $VERSION main
-git push origin $VERSION
-git push origin main
\ No newline at end of file
+
+if [ "$1" == "--release" ] ; then
+    git tag $VERSION main
+    git push origin $VERSION
+    git push origin main
+fi

From 76cfcb97e52492588b4b9aaf24e1827e79f71cd9 Mon Sep 17 00:00:00 2001
From: David Souther <davidsouther+github@gmail.com>
Date: Tue, 1 Oct 2024 16:24:32 +0200
Subject: [PATCH 4/5] Tighten up several checks.

---
 setup.py |  2 +-
 stamp.sh | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/setup.py b/setup.py
index c8a8a36..b6ab446 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="aws_doc_sdk_examples_tools",
-    version="2024.40.2",
+    version="2024.40.0",
     packages=["aws_doc_sdk_examples_tools"],
     package_data={"aws_doc_sdk_examples_tools": ["config/*.yaml"]},
     entry_points={
diff --git a/stamp.sh b/stamp.sh
index 335f1f5..3b8f3fd 100755
--- a/stamp.sh
+++ b/stamp.sh
@@ -17,23 +17,26 @@ if [ -n "${STATUS}" ] ; then
     # exit 1
 fi 
 
-# VERSION and DATE have the format YYYY.WW.REV, where YYYY is the current year,
+# And check that the REMOTE points to the -tools repo.
+REMOTE="${REMOTE:origin}"
+if [ "$(git remote get-url $REMOTE 2>/dev/null)" != "git@github.com:awsdocs/aws-doc-sdk-examples-tools.git" ] ; then
+    echo "REMOTE=${REMOTE} is not set to git@github.com:awsdocs/aws-doc-sdk-examples-tools.git, please adjust accordingly and rerun."
+    exit 1
+fi
+
+# CURRENT and NEXT have the format YYYY.WW.REV, where YYYY is the current year,
 # WW is the current week, and REV is the number of releases this week.
 # The next revision compares the two, in this way
-# - If DATE is later than VERSION in all fields, accept date.
-# - Otherwise, return VERSION, with one added to REV.
+# - If NEXT is later than CURRENT in any fields, accept NEXT.
+# - Otherwise, return CURRENT, with one added to REV.
 #
 # THIS FUNCTION IS NOT TRANSITIVE! It must be called with
 # `compare_versions CURRENT NEXT`
 compare_versions() {
-    IFS='.' read -r y1 w1 r1 <<< "$1"
-    IFS='.' read -r y2 w2 r2 <<< "$2"
-
-    if [ "$y1" -lt "$y2" ] || \
-       [ "$w1" -lt "$w2" ] || \
-       [ "$r1" -lt "$r2" ]; then
+    if [[ "$1" < "$2" ]] ; then
         echo "$2"
     else
+        IFS='.' read -r y1 w1 r1 <<< "$1"
         r1=$((r1 + 1))
         echo "${y1}.${w1}.${r1}"
     fi
@@ -53,7 +56,7 @@ git add setup.py
 git commit --message "Release ${VERSION}"
 
 if [ "$1" == "--release" ] ; then
-    git tag $VERSION main
-    git push origin $VERSION
-    git push origin main
+    git tag "$VERSION" main
+    git push "$REMOTE" "$VERSION"
+    git push "$REMOTE" main
 fi

From e1f3d91f891a6ff47c2082ad1204416e13884919 Mon Sep 17 00:00:00 2001
From: David Souther <davidsouther+github@gmail.com>
Date: Wed, 2 Oct 2024 16:23:58 +0200
Subject: [PATCH 5/5] Review

---
 README.md |  4 ++--
 stamp.sh  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index c437862..fa32059 100644
--- a/README.md
+++ b/README.md
@@ -89,8 +89,8 @@ There are two stages, testing and deployment.
 
 1. **Update the -tools version**: Once the tests pass, update the `setup.py` version and create a tag in the -tools repository at the same SHA you identified earlier.
 
-  - Determine the next [stamp](https://blog.aspect.build/versioning-releases-from-a-monorepo) (which is valid [semver](https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers)) number as appropriate for the changes in this release. e.g. `2024.40.2`.
-  - Run `stamp.sh` to automatically perform this action. Use `--release` to additionally create a tag and push to main.
+  - Run `stamp.sh` to determine the next version and update `setup.py`. Use `--release` to additionally create a tag and push to main.
+    - Determine the next [stamp](https://blog.aspect.build/versioning-releases-from-a-monorepo) (which is valid [semver](https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers)) number as appropriate for the changes in this release. e.g. `2024.40.2`.
 
 1. **Update your testing PR branch**: Remove SHA and add tag to [validate-doc-metadata.yml](https://github.com/awsdocs/aws-doc-sdk-examples/blob/main/.github/workflows/validate-doc-metadata.yml)
    - NOTE: Remove the SHA from [.doc_gen/validation.yaml](https://github.com/awsdocs/aws-doc-sdk-examples/blob/main/.doc_gen/validation.yaml)
diff --git a/stamp.sh b/stamp.sh
index 3b8f3fd..6ba631e 100755
--- a/stamp.sh
+++ b/stamp.sh
@@ -7,20 +7,20 @@ set -e # Exit on errors
 BRANCH=$(git rev-parse --abbrev-rev HEAD)
 if [ "$BRANCH" != "main" ] ; then 
     echo "Not on main, exiting!" 
-    # exit 1
+    exit 1
 fi 
 
 # And check that the main branch is clean
 STATUS=$(git status --porcelain)
 if [ -n "${STATUS}" ] ; then
     echo "Repository is not clean, exiting!" 
-    # exit 1
+    exit 1
 fi 
 
 # And check that the REMOTE points to the -tools repo.
-REMOTE="${REMOTE:origin}"
-if [ "$(git remote get-url $REMOTE 2>/dev/null)" != "git@github.com:awsdocs/aws-doc-sdk-examples-tools.git" ] ; then
-    echo "REMOTE=${REMOTE} is not set to git@github.com:awsdocs/aws-doc-sdk-examples-tools.git, please adjust accordingly and rerun."
+REMOTE="${REMOTE:-origin}"
+if [[ "$(git remote get-url $REMOTE 2>/dev/null)" != *"awsdocs/aws-doc-sdk-examples-tools.git"* ]] ; then
+    echo "REMOTE=${REMOTE} is not set to awsdocs/aws-doc-sdk-examples-tools.git, please adjust accordingly and rerun."
     exit 1
 fi
 
@@ -50,7 +50,7 @@ CURRENT=$(grep version= setup.py | awk -F\" '{print $2}')
 NEXT=$(date +%Y.%W.0)
 VERSION=$(compare_versions "$CURRENT" "$NEXT")
 echo "Releasing $VERSION..."
-sed -i '' "/version=/ s/$CURRENT/$VERSION/" setup.py
+sed "/version=/ s/$CURRENT/$VERSION/" setup.py > setup.py.out ; mv setup.py.out setup.py
 git --no-pager diff
 git add setup.py
 git commit --message "Release ${VERSION}"