Merge pull request #19 from esteinig/release/0.2.0

Release 0.2.0
esteinig · Jan 24, 2024 · 24a730a · 24a730a
2 parents 1d30174 + d082311
commit 24a730a
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,24 @@
+# Changelog
+All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
+
+- - -
+## 0.2.0 - 2024-01-24
+#### Features
+- **(changelog)** auto bump version config - (8448509) - esteinig
+
+- - -
+
+## 0.1.0 - 2024-01-24
+#### Bug Fixes
+- **(app)** fix session plot config reset - (d737a40) - esteinig
+- **(cli)** sort of all working - (f6754d8) - esteinig
+- **(cli)** terminal input fixes - (7f4c6b9) - esteinig
+- **(stack)** data cleaner default settings - (530c33a) - esteinig
+#### Refactoring
+- **(app)** refactor async action requests - (35f6633) - esteinig
+- **(brick)** ring store and reference selection - (88668e8) - esteinig
+- **(brick)** validators to field_validators in pydantic v2; custom 'labels in label ring schema - (c8c60d3) - esteinig
+
+- - -
+
+Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "brick",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "scripts": {
     "dev": "vite dev",

diff --git a/cog.toml b/cog.toml
@@ -1,11 +1,15 @@
 ignore_merge_commits = true
 branch_whitelist = [
-    "main", 
     "release/**"
 ]
 
 skip_untracked = false
-pre_bump_hooks = []
+pre_bump_hooks = [
+    """#!/bin/sh
+    [ "$(git rev-parse --abbrev-ref HEAD)" = "release/{{version}}" ] && echo "On branch release/{{version}}" || exit 1
+    ./scripts/pre_bump.sh {{latest}} {{version}}
+    """
+]
 post_bump_hooks = []
 pre_package_bump_hooks = []
 post_package_bump_hooks = []

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,7 +23,6 @@ services:
     environment:
       NODE_ENV: production
       ORIGIN: http://localhost:5173
-      PUBLIC_BRICK_VERSION: 0.1.0
       PRIVATE_DOCKER_API_URL: http://api:8080
     depends_on:
       - api
@@ -50,7 +49,6 @@ services:
     environment:
       NODE_ENV: development
       ORIGIN: http://localhost:5174
-      PUBLIC_BRICK_VERSION: 0.1.0
       PRIVATE_DOCKER_API_URL: http://api-dev:8080
     depends_on:
       - api-dev

diff --git a/docker/brick.env b/docker/brick.env
@@ -30,6 +30,7 @@ SESSION_MAX_FILES=10000
 
 # ORIGIN: http://localhost:5174  
 
+PUBLIC_BRICK_VERSION=0.2.0
 
 # Request size limit to Sveltekit server
 # determines maximum file and other request

diff --git a/docker/docker-compose.localhost.yml b/docker/docker-compose.localhost.yml
@@ -24,7 +24,6 @@ services:
     environment:
       NODE_ENV: production
       ORIGIN: http://brick.localhost
-      PUBLIC_BRICK_VERSION: 0.1.0
       PRIVATE_DOCKER_API_URL: http://api:8080
     depends_on:
       - api
@@ -56,7 +55,6 @@ services:
     environment:
       NODE_ENV: development
       ORIGIN: http://dev.brick.localhost
-      PUBLIC_BRICK_VERSION: 0.1.0
       PRIVATE_DOCKER_API_URL: http://api-dev:8080
     depends_on:
       - api-dev

diff --git a/docker/docker-compose.web.yml b/docker/docker-compose.web.yml
@@ -24,7 +24,6 @@ services:
     environment:
       NODE_ENV: production
       ORIGIN: https://brick.ink
-      PUBLIC_BRICK_VERSION: 0.1.0
       PRIVATE_DOCKER_API_URL: http://api:8080
     depends_on:
       - api
@@ -61,7 +60,6 @@ services:
     environment:
       NODE_ENV: development
       ORIGIN: https://dev.brick.ink
-      PUBLIC_BRICK_VERSION: 0.1.0
       PRIVATE_DOCKER_API_URL: http://api-dev:8080
     depends_on:
       - api-dev

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "brick"
-version = "0.1.0"
+version = "0.2.0"
 authors = [{name="Eike Steinig", email="eike.steinig@unimelb.edu.au"}]
 description = "BRICK implements BRIG-like interactive figures in D3 for bacterial genome visualization, annotation, comparison and exploration using a Python scripting API, CLI, REST API or UI."
 readme = "README.md"

diff --git a/scripts/pre_bump.sh b/scripts/pre_bump.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+
+LATEST=$1
+VERSION=$2
+
+
+
+# Check that all commits
+# comply with specifications
+cog check
+
+# Echo the version change
+echo "bumping $LATEST to $VERSION"
+
+# Replace docker-compose main script version
+sed -i 's/PUBLIC_BRICK_VERSION='"$LATEST"'/PUBLIC_BRICK_VERSION='"$VERSION"'/' docker/brick.env
+
+# Replace Python package version line
+sed -i 's/version = "'"${LATEST}"'"/version = "'"${VERSION}"'"/' pyproject.toml
+
+# Replace Sveltekit application version
+# `npm install` or `build` in the container will update the `package-lock.json`
+sed -i 's/"version": "'"${LATEST}"'"/"version": "'"${VERSION}"'"/' app/package.json