From a5e0340a11854c87ed04bdbec11209a3e9aaae12 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 7 Jun 2024 16:57:19 -0400 Subject: [PATCH 1/5] deploy-data: support rsync src_dir already absolute path --- birdhouse/deployment/deploy-data | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/birdhouse/deployment/deploy-data b/birdhouse/deployment/deploy-data index cc1e88792..525bac4c9 100755 --- a/birdhouse/deployment/deploy-data +++ b/birdhouse/deployment/deploy-data @@ -151,6 +151,13 @@ for GIT_REPO_URL in $GIT_REPO_URLS; do echo "sync '$SRC_DIR' to '$DEST_DIR'" DEST_DIR_PARENT="`dirname "$DEST_DIR"`" SRC_DIR_ABS_PATH="`pwd`/$SRC_DIR" + if [ ! -e "$SRC_DIR_ABS_PATH" ]; then + # SRC_DIR could already be absolute. + # Support rsync from source outside of current checkout, from other + # checkouts in same config file because config file can have + # multiple checkouts. + SRC_DIR_ABS_PATH="$SRC_DIR" + fi USER_ID="`id -u`" GROUP_ID="`id -g`" RSYNC_USER_GRP="$USER_ID:$GROUP_ID" From d6289d2f2d59ef37f607803b61514cda43dfa7ee Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 7 Jun 2024 17:39:30 -0400 Subject: [PATCH 2/5] CHANGES: deploy-data more flexible --- CHANGES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 44e423220..3c1f7b34e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,9 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Changes +- deploy-data: allow more flexibility to deploy files from other checkout in same config file + [1.42.2](https://github.com/bird-house/birdhouse-deploy/tree/1.42.2) (2023-12-08) ------------------------------------------------------------------------------------------------------------------ From ba6111a06d2dfd424e92b9e07b2405bfff18e839 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Mon, 10 Jun 2024 13:40:59 -0400 Subject: [PATCH 3/5] CHANGES: better explain the reasoning behind additional deploy-data additional flexibility --- CHANGES.md | 7 +++++++ birdhouse/deployment/deploy-data | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2fa836977..22864c9d7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,13 @@ ## Changes - deploy-data: allow more flexibility to deploy files from other checkout in same config file + Given the config file can specify multiple checkouts, this flexibility will + allow one checkout to take files from other checkouts. + + Possible use-case: re-organize the layout of various files from the various + checkouts in an intermediate location before rsyncing this intermediate + location to the final destination. + [2.4.1](https://github.com/bird-house/birdhouse-deploy/tree/2.4.1) (2024-06-05) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/deployment/deploy-data b/birdhouse/deployment/deploy-data index 525bac4c9..9c382c135 100755 --- a/birdhouse/deployment/deploy-data +++ b/birdhouse/deployment/deploy-data @@ -153,9 +153,10 @@ for GIT_REPO_URL in $GIT_REPO_URLS; do SRC_DIR_ABS_PATH="`pwd`/$SRC_DIR" if [ ! -e "$SRC_DIR_ABS_PATH" ]; then # SRC_DIR could already be absolute. - # Support rsync from source outside of current checkout, from other - # checkouts in same config file because config file can have - # multiple checkouts. + # Support rsync from source outside of current checkout, ex: from + # other checkouts in same config file because config file can have + # multiple checkouts or from intermediate location used to + # re-organize the layout before the final rsync to destination. SRC_DIR_ABS_PATH="$SRC_DIR" fi USER_ID="`id -u`" From 1b6c785bb5987dedaaa282230ce95adafa73bc75 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Mon, 10 Jun 2024 13:49:59 -0400 Subject: [PATCH 4/5] CHANGES: better explain what SRC_DIR in deploy-data can take as argument --- CHANGES.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 22864c9d7..ffff63896 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,8 +18,11 @@ ## Changes - deploy-data: allow more flexibility to deploy files from other checkout in same config file - Given the config file can specify multiple checkouts, this flexibility will - allow one checkout to take files from other checkouts. + Given the config file can specify multiple checkouts, this flexibility to + have `SRC_DIR` be an absolute path will allow one checkout to take files from + other checkouts, using absolute path to the other checkouts. `SRC_DIR` can + still be a relative path of the current checkout, as before, to preserve + backward-compatibility. Possible use-case: re-organize the layout of various files from the various checkouts in an intermediate location before rsyncing this intermediate From 304a2a813238b70c32767ea7371b9f27469fcb04 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 12 Jun 2024 16:14:04 -0400 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20version:=202.4.1=20=E2=86=92=202.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 +++++ Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 965055dca..8a6dd58d6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.4.1 +current_version = 2.4.2 commit = True tag = False tag_name = {new_version} @@ -30,11 +30,11 @@ search = {current_version} replace = {new_version} [bumpversion:file:RELEASE.txt] -search = {current_version} 2024-06-05T22:22:08Z +search = {current_version} 2024-06-12T20:14:03Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-06-05T22:22:08Z +values = 2024-06-12T20:14:03Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index ffff63896..c0b37e2bb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,11 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ +[//]: # (list changes here, using '-' for each new entry, remove this when items are added) + +[2.4.2](https://github.com/bird-house/birdhouse-deploy/tree/2.4.2) (2024-06-12) +------------------------------------------------------------------------------------------------------------------ + ## Changes - deploy-data: allow more flexibility to deploy files from other checkout in same config file diff --git a/Makefile b/Makefile index 446cd102d..ce881de09 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.4.1 +override APP_VERSION := 2.4.2 # utility to remove comments after value of an option variable override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g") diff --git a/README.rst b/README.rst index 860af920e..391853a67 100644 --- a/README.rst +++ b/README.rst @@ -18,13 +18,13 @@ for a full-fledged production platform. * - citation - | |citation| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.4.1.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.4.2.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.4.1...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.4.2...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.4.1-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.4.2-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.4.1 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.4.2 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version) diff --git a/RELEASE.txt b/RELEASE.txt index c0824ee0c..79233af4f 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.4.1 2024-06-05T22:22:08Z +2.4.2 2024-06-12T20:14:03Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index 8cdc6b9cd..9885259eb 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/canarie-api/docker_configuration.py.template @@ -108,8 +108,8 @@ SERVICES = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.4.1', - 'releaseTime': '2024-06-05T22:22:08Z', + 'version': '2.4.2', + 'releaseTime': '2024-06-12T20:14:03Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', @@ -141,8 +141,8 @@ PLATFORMS = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.4.1', - 'releaseTime': '2024-06-05T22:22:08Z', + 'version': '2.4.2', + 'releaseTime': '2024-06-12T20:14:03Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index dccaf0031..9c3024af6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.4.1' +version = '2.4.2' # The full version, including alpha/beta/rc tags. -release = '2.4.1' +release = '2.4.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.