Merge pull request #1 from ITISFoundation/fix_trash

Update JupyterLab config to disable trash
ITISFoundation · May 6, 2024 · 0f8f213 · 0f8f213
2 parents 40eb4be + 4a6c979
commit 0f8f213
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.1
+current_version = 1.0.2
 commit = False
 message = service version: {current_version} → {new_version}
 tag = False

diff --git a/.github/workflows/check-image.yml b/.github/workflows/check-image.yml
@@ -1,6 +1,6 @@
 name: Build and check image
 
-on: [push, pull_request]
+on: push
 
 jobs:
   verify-image-build:

diff --git a/.osparc/metadata.yml b/.osparc/metadata.yml
@@ -2,7 +2,7 @@ name: Jupyterlab Julia
 key: simcore/services/dynamic/jupyterlab-julia
 type: dynamic
 integration-version: 2.0.0
-version: 1.0.1
+version: 1.0.2
 description: JupyterLab coding environment for creating interactive Jupyter Notebooks with Julia (or Python)
 contact: [email protected]
 thumbnail: https://ih1.redbubble.net/image.1456778886.5914/bg,f8f8f8-flat,750x,075,f-pad,750x1000,f8f8f8.jpg

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
 
+## [1.0.2] - 6 May 2025
+### Fixed
+- Do not create `.Trash-1000` folder (caused service to fail after re-opening a study) ([#1296](https://github.com/ITISFoundation/osparc-issues/issues/1296))
 ## [1.0.1] - 23 Apr. 2024
 - First version
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ export VCS_STATUS := $(if $(shell git status -s 2> /dev/null || echo unversioned
 export BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 
 export DOCKER_IMAGE_NAME ?= jupyterlab-julia
-export DOCKER_IMAGE_TAG ?= 1.0.1
+export DOCKER_IMAGE_TAG ?= 1.0.2
 
 OSPARC_DIR:=$(CURDIR)/.osparc
 

diff --git a/boot_scripts/boot_notebook.bash b/boot_scripts/boot_notebook.bash
@@ -49,7 +49,8 @@ cat > .jupyter_config.json <<EOF
         "token": "${NOTEBOOK_TOKEN}"
     },
     "FileContentsManager": {
-        "preferred_dir": "${NOTEBOOK_BASE_DIR}/workspace/"
+        "preferred_dir": "${NOTEBOOK_BASE_DIR}/workspace/",
+        "delete_to_trash": false
     }
 }
 EOF

diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -1,6 +1,6 @@
 services:
   jupyterlab-julia:
-    image: simcore/services/dynamic/jupyterlab-julia:1.0.1
+    image: simcore/services/dynamic/jupyterlab-julia:1.0.2
     ports:
       - "8888:8888"
     environment: