From 31f6029fbe35ef889899fd8f700df6b8196b70dc Mon Sep 17 00:00:00 2001
From: Jash Parekh <jash389@gmail.com>
Date: Tue, 19 Oct 2021 21:36:09 -0400
Subject: [PATCH 01/11] Add bump2version

---
 docker-compose.yaml   | 11 +++++++++++
 docs/index.md         |  2 +-
 requirements-test.txt |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 93ad777..b4e7199 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,4 +1,10 @@
 version: '3.4'
+
+x-mount-app-and-user-git-config: &mount-app-and-user-git-config
+  volumes:
+    - ./:/app
+    - ~/.gitconfig:/home/gbq/.gitconfig # allow script to commit as user
+
 services:
 
   # a fully loaded development environment to test new code
@@ -28,3 +34,8 @@ services:
   mike:
     <<: *mkdocs
     entrypoint: "mike"
+
+  bump:
+    <<: *devbox
+    <<: *mount-app-and-user-git-config
+    entrypoint: docker/bump_version.sh
diff --git a/docs/index.md b/docs/index.md
index d1f9cb7..92a8ef7 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,4 +1,4 @@
-# pygitops - 0.12.0
+# pygitops - 0.13.0
 
 [![CI pipeline status](https://github.com/wayfair-incubator/pygitops/workflows/CI/badge.svg?branch=main)][ci]
 
diff --git a/requirements-test.txt b/requirements-test.txt
index 1d25137..d57c3d9 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,5 +1,6 @@
 bandit==1.7.0
 black==21.9b0
+bump2version==1.0.1
 flake8==3.9.2
 isort==5.9.3
 mypy==0.910

From 38c4d77fb1d41c789bc8720e522305e6b9a96c80 Mon Sep 17 00:00:00 2001
From: Jash Parekh <jash389@gmail.com>
Date: Tue, 19 Oct 2021 21:41:26 -0400
Subject: [PATCH 02/11] Add python 3.10 support

---
 .github/workflows/main.yml | 4 ++--
 CHANGELOG.md               | 7 +++++++
 setup.cfg                  | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5fb0425..359d25d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
       branches: ["main"]
 
 env:
-  PYTHON_VERSION: "3.9.1"
+  PYTHON_VERSION: "3.10"
 
 jobs:
   bandit:
@@ -98,7 +98,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
     steps:
         - name: Check out code
           uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2556962..6d5a1e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+- Python version `3.10` tested during CI
+- Python version `3.10` added to package classifiers
+
 ## [0.13.0] - 2021-09-22
 
 ### Changed
diff --git a/setup.cfg b/setup.cfg
index 1b2514e..35ade43 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
 

From 94ee19c5bd959232c33e64a6f2bc89dbd118b12a Mon Sep 17 00:00:00 2001
From: Jash Parekh <jash389@gmail.com>
Date: Tue, 19 Oct 2021 21:45:24 -0400
Subject: [PATCH 03/11] Update devbox image

---
 docker/devbox.dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/devbox.dockerfile b/docker/devbox.dockerfile
index 288c9d2..7a2a4df 100644
--- a/docker/devbox.dockerfile
+++ b/docker/devbox.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.1-buster
+FROM python:3.10-buster
 
 ARG _USER="pygitops"
 ARG _UID="1001"

From ade862e4a5d651c7a488c094c3b2ddd1f9a2a52b Mon Sep 17 00:00:00 2001
From: Jash Parekh <jparekh1@wayfair.com>
Date: Tue, 19 Oct 2021 22:08:14 -0400
Subject: [PATCH 04/11] Add docs

---
 docs/development-guide.md | 64 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/docs/development-guide.md b/docs/development-guide.md
index 05b5ad3..5c959cc 100644
--- a/docs/development-guide.md
+++ b/docs/development-guide.md
@@ -86,13 +86,69 @@ grab the version from `__init__.py` without actually importing any dependencies.
 * **requirements.txt** - Lists all direct dependencies (packages imported by the library).
 * **Requirements-test.txt** - Lists all direct requirements needed to run the test suite & lints.
 
-## Publishing the Package
+## Publishing a New Version
 
-TODO: Document package publish process
+Once the package is ready to be released, there are a few things that need to be done:
+
+1. Start with a local clone of the repo on the default branch with a clean working tree.
+2. Run the version bump script with the appropriate part name (`major`, `minor`, or `patch`).
+    Example: `docker-compose run --rm bump minor`
+    
+    This wil create a new branch, updates all affected files with the new version, and commit the changes to the branch.
+
+3. Push the new branch to create a new pull request.
+4. Get the pull request approved.
+5. Merge the pull request to the default branch.
+
+Merging the pull request will trigger a GitHub Action that will create a new release. The creation of this new
+release will trigger a GitHub Action that will to build a wheel & a source distributions of the package and push them to
+[PyPI][pypi].
+
+!!! warning
+    The action that uploads the files to PyPI will not run until a repository maintainer acknowledges that the job is
+    ready to run. This is to keep the PyPI publishing token secure. Otherwise, any job would have access to the token. 
+
+In addition to uploading the files to PyPI, the documentation website will be updated to include the new version. If the
+new version is a full release, it will be made the new `latest` version.
 
 ## Continuous Integration Pipeline
 
-TODO: Add CI documentation.
+The Continuous Integration (CI) Pipeline runs to confirm that the repository is in a good state. It will run when 
+someone creates a pull request or when they push new commits to the branch for an existing pull request. The pipeline
+runs multiple different jobs that helps verify the state of the code.
+
+This same pipeline also runs on the default branch when a maintainer merges a pull request.
+
+### Lints
+
+The first set of jobs that run as part of the CI pipline are linters that perform static analysis on the code. This
+includes: [MyPy][mypy-docs], [Black][black-docs], [Isort][isort-docs], [Flake8][flake8-docs], and [Bandit][bandit-docs].
+
+### Tests
+
+The next set of jobs run the unit tests using [PyTest][pytest-docs]. The pipeline runs the tests cases across each
+supported version of Python to ensure compatibility.
+
+For each run of the test cases, the job will record the test results and code coverage information. The pipeline uploads
+the code coverage information to [CodeCov][codecov] to ensure that a pull request doesn't significantly reduce the total
+code coverage percentage or introduce a large amount of code that is untested.
+
+### Distribution Verification
+
+The next set of jobs build the wheel distribution, installs in into a virtual environment, and then runs Python to
+import the library version. This works as a smoke test to ensure that the library can be packaged correctly and used.
+The pipeline runs the tests cases across each supported version of Python to ensure compatibility.
+
+### Documentation
+
+The remaining jobs are all related to documentation.
+
+* A job runs each of the code examples that are used in the documentation to verify they produce the expected results.
+* A job builds the documentation in strict mode so that it will fail if there are any errors. The job records the
+    generated files so that the documentation website can be viewed in its rendered form.
+* When the pipeline is running as a result of a maintainer merging a pull request to the default branch, a job runs that
+    publishes the current state of the documentation to as the `dev` version. This will allow users to view the state of
+    the documentation as it has changed since a maintainer published the `latest` version.
 
 [usage-guide]: usage-guide/fundamentals.md
 [code of conduct]: https://github.com/wayfair-incubator/pygitops/blob/main/CODE_OF_CONDUCT.md
@@ -108,3 +164,5 @@ TODO: Add CI documentation.
 [isort-docs]: https://pycqa.github.io/isort/
 [flake8-docs]: http://flake8.pycqa.org/en/stable/
 [bandit-docs]: https://bandit.readthedocs.io/en/stable/
+[pypi]: https://pypi.org/project/pygitops/
+[codecov]: https://about.codecov.io/

From 8bf675d584c005e022d9abe217e39c11e3eddd7e Mon Sep 17 00:00:00 2001
From: Jash Parekh <jash389@gmail.com>
Date: Tue, 19 Oct 2021 22:18:21 -0400
Subject: [PATCH 05/11] Update dependabot.yml

---
 .github/dependabot.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 44cece1..a5fb308 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,3 +9,11 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "docker"
+    directory: "/docker"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

From 06c29410bb95aaecf8ab020a03c88621858b71b7 Mon Sep 17 00:00:00 2001
From: Jash Parekh <jparekh1@wayfair.com>
Date: Wed, 20 Oct 2021 10:02:13 -0400
Subject: [PATCH 06/11] Temp

---
 .bumpversion.cfg                          |  24 +++++
 .github/workflows/detect_version_bump.yml |  36 ++++++++
 docker/bump_version.sh                    | 104 ++++++++++++++++++++++
 3 files changed, 164 insertions(+)
 create mode 100644 .bumpversion.cfg
 create mode 100644 .github/workflows/detect_version_bump.yml
 create mode 100755 docker/bump_version.sh

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
index 0000000..54bd9b2
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,24 @@
+[bumpversion]
+current_version = 0.14.0
+commit = True
+tag = False
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<pre_release>[a-z]+))?
+serialize = 
+	{major}.{minor}.{patch}-{pre_release}
+	{major}.{minor}.{patch}
+
+[bumpversion:file:docs/index.md]
+search = pygitops - {current_version}
+replace = pygitops - {new_version}
+
+[bumpversion:file:setup.cfg]
+search = version = {current_version}
+replace = version = {new_version}
+
+[bumpversion:part:pre_release]
+optional_value = final
+values = 
+	final
+	dev
+	alpha
+	beta
diff --git a/.github/workflows/detect_version_bump.yml b/.github/workflows/detect_version_bump.yml
new file mode 100644
index 0000000..12fe39e
--- /dev/null
+++ b/.github/workflows/detect_version_bump.yml
@@ -0,0 +1,36 @@
+name: Version Bump merged
+
+on:
+  pull_request:
+    types:
+      - "closed"
+    branches:
+      - "main"
+
+jobs:
+  trigger-release:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged &&
+        startsWith(github.head_ref, 'bump_version_to_') &&
+        startsWith(github.event.pull_request.title, 'Bump version') &&
+        contains(github.event.pull_request.title, ' → ')
+    environment: Create Release
+    steps:
+      - name: Get new version
+        id: get-new-version
+        run: |
+          NEW_VERSION=$(echo ${{ github.head_ref }} | cut -d _ -f4 )
+          echo "::set-output name=version::$NEW_VERSION"
+      - name: Is prerelease?
+        id: is-prerelease
+        run: |
+          IS_PRERELEASE=$([[ "${{ steps.get-new-version.outputs.version }}" == *-[a-z]* ]] && echo true || echo false)
+          echo "::set-output name=result::$IS_PRERELEASE"
+      - name: Create Release
+        # use hash for security since this has access to the access token
+        uses: ncipollo/release-action@880be3d0a71bc0fa98db60201d2cbdc27324f547 # v1.8.6
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+          tag: v${{ steps.get-new-version.outputs.version }}
+          name: v${{ steps.get-new-version.outputs.version }} Release
+          commit: main
\ No newline at end of file
diff --git a/docker/bump_version.sh b/docker/bump_version.sh
new file mode 100755
index 0000000..ee2046b
--- /dev/null
+++ b/docker/bump_version.sh
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+DEFAULT_BRANCH="main"
+PRE_RELEASE_ARG="pre_release"
+
+DEV_RELEASE="false"
+PART=""
+
+function usage() {
+  echo "usage: bump_version.sh [--dev] pre-release|major|minor|patch"
+  echo ""
+  echo " --dev             : Update to a dev pre-release for the new version. Can't be used with pre-release."
+  echo " pre-release       : Update pre-release component for the current version."
+  echo " major|minor|patch : Part of version string to updated for a final release."
+  exit 1
+}
+
+while [[ $# -gt 0 ]]; do
+  arg="$1"
+  case $arg in
+  --dev)
+    DEV_RELEASE="true"
+    ;;
+  -h | --help)
+    usage
+    ;;
+  pre-release | major | minor | patch)
+    if [[ "${PART}" != "" ]]; then
+      echo "Part has already been given"
+      usage
+    fi
+    PART="${arg}"
+    if [[ "${PART}" == "pre-release" ]]; then
+      # part names can't have dashes, but dashes are better for a CLI
+      PART="${PRE_RELEASE_ARG}"
+    fi
+    ;;
+  "")
+    # ignore
+    ;;
+  *)
+    echo "Unexpected argument: ${arg}"
+    usage
+    ;;
+  esac
+  shift
+done
+
+if [[ "${PART}" == "" ]]; then
+  echo "Part to update not given"
+  usage
+elif [[ "${PART}" == "${PRE_RELEASE_ARG}" && "${DEV_RELEASE}" == "true" ]]; then
+  echo "pre-release and --dev can not be used at the same time"
+  usage
+fi
+
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+CURRENT_STATUS=$(git status --short --untracked-files=no)
+
+if [[ "${CURRENT_BRANCH}" != "${DEFAULT_BRANCH}" ]]; then
+  echo "A version bump must be run from the default branch."
+  echo "Run 'git switch ${DEFAULT_BRANCH}'"
+  exit 2
+elif [[ "$CURRENT_STATUS" != "" ]]; then
+  echo "The working tree has uncommitted changes."
+  echo "Commit or stash the changes before running a version bump."
+  exit 3
+fi
+
+# Capture value of new version
+NEW_VERSION=$(bump2version --dry-run --list "${PART}" | grep new_version | sed -r s,"^.*=",,)
+# bump2version currently makes it hard increment a part and start in a dev state
+# https://github.com/c4urself/bump2version/issues/63
+if [[ "${DEV_RELEASE}" == "true" ]]; then
+  NEW_VERSION="${NEW_VERSION}-dev"
+fi
+
+# Create bump branch
+BUMP_BRANCH_NAME="bump_version_to_${NEW_VERSION}"
+echo "Creating new branch ${BUMP_BRANCH_NAME}"
+echo
+git checkout --quiet -b "${BUMP_BRANCH_NAME}"
+# Update files
+bump2version --new-version "${NEW_VERSION}" "${PART}"
+
+# Updating the changelog has to be done manually
+#   - bump2version doesn't support inserting dates https://github.com/c4urself/bump2version/issues/133
+#   - It is not possible to have a multiline string in an INI file where a line after the first line starts with '#'.
+#     The config parser reads it as a comment line.
+TODAY=$(date +%Y-%m-%d)
+sed -i "s/## \[Unreleased\]/## \[Unreleased\]\n\n## \[${NEW_VERSION}\] - ${TODAY}/g" CHANGELOG.md
+
+# Add changelog to bump commit
+git add CHANGELOG.md
+git commit --amend --no-edit
+# Show effected files
+git show --pretty="" --name-only
+# Back to original branch
+git checkout --quiet "${DEFAULT_BRANCH}"
+
+echo
+echo "Run 'git push --set-upstream origin ${BUMP_BRANCH_NAME}' to create a pull request"

From f74d72162eeba03db7f04e656e742cd5b1e2ae12 Mon Sep 17 00:00:00 2001
From: Jash Parekh <jparekh1@wayfair.com>
Date: Wed, 20 Oct 2021 10:05:23 -0400
Subject: [PATCH 07/11] Revert Py3.10

---
 .bumpversion.cfg           | 2 +-
 .github/workflows/main.yml | 4 ++--
 CHANGELOG.md               | 7 -------
 docker/devbox.dockerfile   | 2 +-
 setup.cfg                  | 1 -
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 54bd9b2..3fbb8cc 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.14.0
+current_version = 0.13.0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<pre_release>[a-z]+))?
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 359d25d..5fb0425 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
       branches: ["main"]
 
 env:
-  PYTHON_VERSION: "3.10"
+  PYTHON_VERSION: "3.9.1"
 
 jobs:
   bandit:
@@ -98,7 +98,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: [3.6, 3.7, 3.8, 3.9]
     steps:
         - name: Check out code
           uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d5a1e0..2556962 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,13 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
-
-### Added
-
-- Python version `3.10` tested during CI
-- Python version `3.10` added to package classifiers
-
 ## [0.13.0] - 2021-09-22
 
 ### Changed
diff --git a/docker/devbox.dockerfile b/docker/devbox.dockerfile
index 7a2a4df..288c9d2 100644
--- a/docker/devbox.dockerfile
+++ b/docker/devbox.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-buster
+FROM python:3.9.1-buster
 
 ARG _USER="pygitops"
 ARG _UID="1001"
diff --git a/setup.cfg b/setup.cfg
index 35ade43..1b2514e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,6 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
 

From 9047c431fb7afd24b9b659871b8d9b6345940bed Mon Sep 17 00:00:00 2001
From: Jash Parekh <jparekh1@wayfair.com>
Date: Wed, 20 Oct 2021 10:20:56 -0400
Subject: [PATCH 08/11] Fix typo

---
 docs/development-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development-guide.md b/docs/development-guide.md
index 5c959cc..3cc5d3e 100644
--- a/docs/development-guide.md
+++ b/docs/development-guide.md
@@ -101,7 +101,7 @@ Once the package is ready to be released, there are a few things that need to be
 5. Merge the pull request to the default branch.
 
 Merging the pull request will trigger a GitHub Action that will create a new release. The creation of this new
-release will trigger a GitHub Action that will to build a wheel & a source distributions of the package and push them to
+release will trigger a GitHub Action that will trigger a wheel build & a source distributions of the package and push them to
 [PyPI][pypi].
 
 !!! warning

From 1909a50167e950682d72df161330367bef13c8a6 Mon Sep 17 00:00:00 2001
From: Jash Parekh <jparekh1@wayfair.com>
Date: Wed, 20 Oct 2021 10:46:31 -0400
Subject: [PATCH 09/11] Only allow {major}.{minor}.{patch} versions

---
 docker/bump_version.sh | 71 +++++++-----------------------------------
 1 file changed, 11 insertions(+), 60 deletions(-)

diff --git a/docker/bump_version.sh b/docker/bump_version.sh
index ee2046b..bf74821 100755
--- a/docker/bump_version.sh
+++ b/docker/bump_version.sh
@@ -3,60 +3,21 @@
 set -eo pipefail
 
 DEFAULT_BRANCH="main"
-PRE_RELEASE_ARG="pre_release"
-
-DEV_RELEASE="false"
-PART=""
 
 function usage() {
-  echo "usage: bump_version.sh [--dev] pre-release|major|minor|patch"
+  echo "usage: bump_version.sh major|minor|patch"
   echo ""
-  echo " --dev             : Update to a dev pre-release for the new version. Can't be used with pre-release."
-  echo " pre-release       : Update pre-release component for the current version."
-  echo " major|minor|patch : Part of version string to updated for a final release."
+  echo " major|minor|patch : Part of version string to updated."
   exit 1
 }
 
-while [[ $# -gt 0 ]]; do
-  arg="$1"
-  case $arg in
-  --dev)
-    DEV_RELEASE="true"
-    ;;
-  -h | --help)
-    usage
-    ;;
-  pre-release | major | minor | patch)
-    if [[ "${PART}" != "" ]]; then
-      echo "Part has already been given"
-      usage
-    fi
-    PART="${arg}"
-    if [[ "${PART}" == "pre-release" ]]; then
-      # part names can't have dashes, but dashes are better for a CLI
-      PART="${PRE_RELEASE_ARG}"
-    fi
-    ;;
-  "")
-    # ignore
-    ;;
-  *)
-    echo "Unexpected argument: ${arg}"
-    usage
-    ;;
-  esac
-  shift
-done
-
-if [[ "${PART}" == "" ]]; then
-  echo "Part to update not given"
-  usage
-elif [[ "${PART}" == "${PRE_RELEASE_ARG}" && "${DEV_RELEASE}" == "true" ]]; then
-  echo "pre-release and --dev can not be used at the same time"
+if [[ $# != 1 || ! "${1}" =~ major|minor|patch ]]; then
   usage
+else
+  PART="${1}"
 fi
 
-CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+CURRENT_BRANCH=$(git branch --show-current)
 CURRENT_STATUS=$(git status --short --untracked-files=no)
 
 if [[ "${CURRENT_BRANCH}" != "${DEFAULT_BRANCH}" ]]; then
@@ -68,22 +29,15 @@ elif [[ "$CURRENT_STATUS" != "" ]]; then
   echo "Commit or stash the changes before running a version bump."
   exit 3
 fi
-
+# Ensure on default branch
+git switch --no-guess main
 # Capture value of new version
 NEW_VERSION=$(bump2version --dry-run --list "${PART}" | grep new_version | sed -r s,"^.*=",,)
-# bump2version currently makes it hard increment a part and start in a dev state
-# https://github.com/c4urself/bump2version/issues/63
-if [[ "${DEV_RELEASE}" == "true" ]]; then
-  NEW_VERSION="${NEW_VERSION}-dev"
-fi
-
 # Create bump branch
 BUMP_BRANCH_NAME="bump_version_to_${NEW_VERSION}"
-echo "Creating new branch ${BUMP_BRANCH_NAME}"
-echo
-git checkout --quiet -b "${BUMP_BRANCH_NAME}"
+git switch -c "${BUMP_BRANCH_NAME}"
 # Update files
-bump2version --new-version "${NEW_VERSION}" "${PART}"
+bump2version "${PART}"
 
 # Updating the changelog has to be done manually
 #   - bump2version doesn't support inserting dates https://github.com/c4urself/bump2version/issues/133
@@ -97,8 +51,5 @@ git add CHANGELOG.md
 git commit --amend --no-edit
 # Show effected files
 git show --pretty="" --name-only
-# Back to original branch
-git checkout --quiet "${DEFAULT_BRANCH}"
 
-echo
-echo "Run 'git push --set-upstream origin ${BUMP_BRANCH_NAME}' to create a pull request"
+echo "Run 'git push --set-upstream origin ${BUMP_BRANCH_NAME}' to "

From f7a47e247da2c251cd833b6591e50a305d1a7ad7 Mon Sep 17 00:00:00 2001
From: Jash Parekh <jparekh1@wayfair.com>
Date: Wed, 20 Oct 2021 10:48:46 -0400
Subject: [PATCH 10/11] Only allow {major}.{minor}.{patch} versions

---
 .bumpversion.cfg | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 3fbb8cc..df08d81 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -2,10 +2,6 @@
 current_version = 0.13.0
 commit = True
 tag = False
-parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<pre_release>[a-z]+))?
-serialize = 
-	{major}.{minor}.{patch}-{pre_release}
-	{major}.{minor}.{patch}
 
 [bumpversion:file:docs/index.md]
 search = pygitops - {current_version}
@@ -14,11 +10,3 @@ replace = pygitops - {new_version}
 [bumpversion:file:setup.cfg]
 search = version = {current_version}
 replace = version = {new_version}
-
-[bumpversion:part:pre_release]
-optional_value = final
-values = 
-	final
-	dev
-	alpha
-	beta

From c0d5d1add7937084633751700da8071e333423d4 Mon Sep 17 00:00:00 2001
From: Jash Parekh <jash389@gmail.com>
Date: Wed, 20 Oct 2021 10:59:24 -0400
Subject: [PATCH 11/11] Update bump_version.sh

---
 docker/bump_version.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/bump_version.sh b/docker/bump_version.sh
index bf74821..a047342 100755
--- a/docker/bump_version.sh
+++ b/docker/bump_version.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# Referenced From: https://github.com/wayfair-incubator/columbo/blob/main/docker/bump_version.sh
+
 set -eo pipefail
 
 DEFAULT_BRANCH="main"