From c74230902c6d6ceb25e833affbdadb9a834460ef Mon Sep 17 00:00:00 2001 From: Zachary Sailer Date: Thu, 26 May 2022 11:34:19 -0700 Subject: [PATCH] Switch to Working dir when checking if git repo should be migrated (#395) * move to working dir to do migration * Bump to 0.20.5 --- data_studio_jupyter_extensions/_version.py | 2 +- deployment/bin/setup_notebook_directory.sh | 1 + pyproject.toml | 2 +- src/status.tsx | 2 +- version | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/data_studio_jupyter_extensions/_version.py b/data_studio_jupyter_extensions/_version.py index 92c39ac2a6..e443e3fbf3 100644 --- a/data_studio_jupyter_extensions/_version.py +++ b/data_studio_jupyter_extensions/_version.py @@ -1 +1 @@ -__version__ = "0.20.4" # pragma: no cover +__version__ = "0.20.5" # pragma: no cover diff --git a/deployment/bin/setup_notebook_directory.sh b/deployment/bin/setup_notebook_directory.sh index c72caa1c2f..5c17728dc6 100755 --- a/deployment/bin/setup_notebook_directory.sh +++ b/deployment/bin/setup_notebook_directory.sh @@ -95,6 +95,7 @@ if [[ ! -z $GITHUB_REPO ]]; then # This reflects the old way we used to set up the user's directory. # The first condition is checking for such a legacy setup and # automatically migrates their directory to the new location. + cd $WORKING_DIR if [[ "$(git config --get remote.origin.url)" == $GITHUB_REPO ]]; then echo "[INFO] Migrating repo to new location on disk." # Temporarily move the working directory to a temporary dir to avoid diff --git a/pyproject.toml b/pyproject.toml index eb55707287..462ec6620b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ testpaths = [ ] [tool.tbump.version] -current = "0.20.4" +current = "0.20.5" regex = ''' (?P\d+)\.(?P\d+)\.(?P\d+) ((?Pa|b|rc|.dev)(?P\d+))? diff --git a/src/status.tsx b/src/status.tsx index 322b28cdf7..4e30c2277a 100644 --- a/src/status.tsx +++ b/src/status.tsx @@ -31,7 +31,7 @@ import { ISessionContext, ReactWidget } from '@jupyterlab/apputils'; import { EventListener } from './eventlistener'; // This is managed by tbump config in pyproject.toml -const VERSION = '0.20.4'; +const VERSION = '0.20.5'; // Define the error states // https://github.pie.apple.com/pie-data-studio/notebook-service/blob/761d63604966db5918d2e491c0f89cce454b7f67/app/com/apple/datastudio/model/ResourceState.scala#L20 diff --git a/version b/version index 6dd46024a4..1b619f3482 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.20.4 +0.20.5