From 9226633c412835b1e8b445287fd2a9ef99343676 Mon Sep 17 00:00:00 2001 From: Johannes Messner Date: Fri, 26 Aug 2022 13:54:53 +0200 Subject: [PATCH 1/2] fix(plot): be robust against non-existing subindices --- docarray/array/mixins/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docarray/array/mixins/plot.py b/docarray/array/mixins/plot.py index b9fe8909d15..86c62d50498 100644 --- a/docarray/array/mixins/plot.py +++ b/docarray/array/mixins/plot.py @@ -79,7 +79,7 @@ def summary(self): is_multimodal = all(d.is_multimodal for d in self) table.add_row('Multimodal dataclass', str(is_multimodal)) - if getattr(self, '_subindices'): + if getattr(self, '_subindices', None): table.add_row( 'Subindices', rich.markup.escape(str(tuple(self._subindices.keys()))) ) From 4c42f7df01c3f4fa95ed86a9e22582e0e3ae3353 Mon Sep 17 00:00:00 2001 From: Johannes Messner Date: Mon, 17 Oct 2022 11:38:38 +0200 Subject: [PATCH 2/2] ci: allow release from any branch --- .github/workflows/force-release.yml | 2 +- scripts/release.sh | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml index b48cebbec92..2d80f367be5 100644 --- a/.github/workflows/force-release.yml +++ b/.github/workflows/force-release.yml @@ -47,4 +47,4 @@ jobs: with: github_token: ${{ secrets.JINA_DEV_BOT }} tags: true - branch: main + branch: ${{ github.ref }} diff --git a/scripts/release.sh b/scripts/release.sh index 64f0cacd09e..0a00cb7bda8 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -58,10 +58,6 @@ function make_release_note { BRANCH=$(git rev-parse --abbrev-ref HEAD) -if [[ "$BRANCH" != "main" ]]; then - printf "You are not at main branch, exit\n"; - exit 1; -fi LAST_UPDATE=`git show --no-notes --format=format:"%H" $BRANCH | head -n 1` LAST_COMMIT=`git show --no-notes --format=format:"%H" origin/$BRANCH | head -n 1`