Merge pull request #153 from maykinmedia/feature/bump-my-version

➕ [maykinmedia/open-api-framework#107] Add bump-my-version to dev dependencies
maykinmedia · Feb 24, 2025 · 79b4d8a · 79b4d8a
2 parents 5be4b0e + ce753ae
commit 79b4d8a
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 9 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -12,10 +12,8 @@ search = :Version: {current_version}
 replace = :Version: {new_version}
 
 [bumpversion:file:package.json]
-search = "version": "{current_version}",
-replace = "version": "{new_version}",
-
-[bumpversion:file:src/objecttypes/conf/api.py]
+search = "version": "{current_version}"
+replace = "version": "{new_version}"
 
 [bumpversion:file:publiccode.yaml]
 search = softwareVersion: {current_version}

diff --git a/bin/bump-my-version.sh b/bin/bump-my-version.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#
+# Script to bump the version. Arguments are forwarded to bump-my-version.
+#
+# Usage:
+#
+#   ./bin/bumpversion.sh bump minor|patch|pre|build
+#
+
+set -eu -o pipefail
+
+toplevel=$(git rev-parse --show-toplevel)
+cd $toplevel
+
+# Ensure a virtualenv is active.
+if [ -z $VIRTUAL_ENV ]; then
+    echo "VIRTUAL_ENV envvar is not set, you must activate your virtualenv before running this script."
+    exit 1
+fi
+
+# Forward all arguments to bump-my-version binary
+bump-my-version "$@"
+
+# Run npm install to update the package-lock.json version number
+npm i
diff --git a/requirements/dev.in b/requirements/dev.in
@@ -3,7 +3,7 @@
 
 # Helpers
 pip-tools
-bumpversion
+bump-my-version
 
 # Debug tooling
 django-debug-toolbar

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -12,6 +12,8 @@ annotated-types==0.7.0
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   pydantic
+anyio==4.8.0
+    # via httpx
 ape-pie==0.1.0
     # via
     #   -c requirements/ci.txt
@@ -64,11 +66,11 @@ boltons==23.0.0
     #   -r requirements/ci.txt
     #   face
     #   glom
+bracex==2.5.post1
+    # via wcmatch
 build==0.10.0
     # via pip-tools
-bump2version==1.0.1
-    # via bumpversion
-bumpversion==0.6.0
+bump-my-version==0.32.1
     # via -r requirements/dev.in
 cbor2==5.6.3
     # via
@@ -87,6 +89,8 @@ certifi==2024.7.4
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   elastic-apm
+    #   httpcore
+    #   httpx
     #   requests
     #   sentry-sdk
 cffi==1.15.1
@@ -104,11 +108,13 @@ click==8.1.3
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   black
+    #   bump-my-version
     #   celery
     #   click-didyoumean
     #   click-plugins
     #   click-repl
     #   pip-tools
+    #   rich-click
 click-didyoumean==0.3.0
     # via
     #   -c requirements/ci.txt
@@ -438,6 +444,12 @@ glom==23.3.0
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   mozilla-django-oidc-db
+h11==0.14.0
+    # via httpcore
+httpcore==1.0.7
+    # via httpx
+httpx==0.28.1
+    # via bump-my-version
 humanize==4.9.0
     # via
     #   -c requirements/ci.txt
@@ -447,6 +459,8 @@ idna==3.7
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   anyio
+    #   httpx
     #   requests
     #   yarl
 imagesize==1.4.1
@@ -502,6 +516,8 @@ lxml==4.9.2
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   pyquery
+markdown-it-py==3.0.0
+    # via rich
 markupsafe==2.1.2
     # via
     #   -c requirements/ci.txt
@@ -517,6 +533,8 @@ mccabe==0.7.0
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   flake8
+mdurl==0.1.2
+    # via markdown-it-py
 mozilla-django-oidc==4.0.0
     # via
     #   -c requirements/ci.txt
@@ -593,6 +611,7 @@ prompt-toolkit==3.0.38
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   click-repl
+    #   questionary
 psycopg2==2.9.9
     # via
     #   -c requirements/ci.txt
@@ -612,6 +631,7 @@ pydantic==2.9.2
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   bump-my-version
     #   django-setup-configuration
     #   pydantic-settings
 pydantic-core==2.23.4
@@ -623,14 +643,17 @@ pydantic-settings==2.6.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   bump-my-version
     #   django-setup-configuration
 pyflakes==3.2.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   flake8
 pygments==2.15.1
-    # via sphinx
+    # via
+    #   rich
+    #   sphinx
 pyjwt==2.7.0
     # via
     #   -c requirements/ci.txt
@@ -693,6 +716,8 @@ qrcode==6.1
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   django-two-factor-auth
+questionary==2.1.0
+    # via bump-my-version
 redis==4.5.5
     # via
     #   -c requirements/ci.txt
@@ -718,6 +743,12 @@ requests-mock==1.12.1
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   commonground-api-common
+rich==13.9.4
+    # via
+    #   bump-my-version
+    #   rich-click
+rich-click==1.8.5
+    # via bump-my-version
 sentry-sdk==2.12.0
     # via
     #   -c requirements/ci.txt
@@ -744,6 +775,8 @@ six==1.16.0
     #   orderedmultidict
     #   python-dateutil
     #   qrcode
+sniffio==1.3.1
+    # via anyio
 snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.4.1
@@ -782,6 +815,8 @@ tblib==1.7.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+tomlkit==0.13.2
+    # via bump-my-version
 tornado==6.4.2
     # via
     #   -c requirements/ci.txt
@@ -791,9 +826,11 @@ typing-extensions==4.11.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   anyio
     #   mozilla-django-oidc-db
     #   pydantic
     #   pydantic-core
+    #   rich-click
     #   zgw-consumers
 tzdata==2024.1
     # via
@@ -835,6 +872,8 @@ waitress==3.0.1
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   webtest
+wcmatch==10.0
+    # via bump-my-version
 wcwidth==0.2.6
     # via
     #   -c requirements/ci.txt