376 remove depsi group

CHANGELOG.md

@@ -25,7 +25,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -
 
 -->
-## [v4.0.1](https://github.com/TUDelftGeodesy/caroline/tree/main) (28-Sep-2026, [diff](https://github.com/TUDelftGeodesy/caroline/compare/c9f7b7d368cc1b0305c6808d4ff0e7759df7f8b2...main))
+## [v4.1.0](https://github.com/TUDelftGeodesy/caroline/tree/main) (29-Sep-2026, [diff](https://github.com/TUDelftGeodesy/caroline/compare/116e9fc9beec8dc57165fc2c096da0b60ce7415c...main))
+
+### Added
+- Dependency on the public repository [DePSI](https://github.com/TUDelftGeodesy/DePSI), on the branch `caroline-clone-branch`
+
+### Changed
+- Parameter `merge_to_stack_python:depsi_group-code-directory` renamed to `merge_to_stack_python:depsi-code-directory`
+- Parameter `merge_to_stack_matlab:depsi_group-code-directory` renamed to `merge_to_stack_matlab:depsi-code-directory`
+- Parameter `reduce_slc_python:depsi_group-code-directory` renamed to `reduce_slc_python:depsi-code-directory`
+- Parameter `generate_partitioned_stm:depsi_group-code-directory` renamed to `generate_partitioned_stm:depsi-code-directory`
+- Default for parameter `merge_to_stack_python:depsi-code-directory` changed from `**CAROLINE_PLUGINS_DIRECTORY**/DePSI_group` to `**CAROLINE_PLUGINS_DIRECTORY**/DePSI`
+- Default for parameter `merge_to_stack_matlab:depsi-code-directory` changed from `**CAROLINE_PLUGINS_DIRECTORY**/DePSI_group` to `**CAROLINE_PLUGINS_DIRECTORY**/DePSI`
+- Default for parameter `reduce_slc_python:depsi-code-directory` changed from `**CAROLINE_PLUGINS_DIRECTORY**/DePSI_group` to `**CAROLINE_PLUGINS_DIRECTORY**/DePSI`
+- Default for parameter `generate_partitioned_stm:depsi-code-directory` changed from `**CAROLINE_PLUGINS_DIRECTORY**/DePSI_group` to `**CAROLINE_PLUGINS_DIRECTORY**/DePSI`
+
+### Removed
+- Dependency on the private repository DePSI_group, replaced by the public repository [DePSI](https://github.com/TUDelftGeodesy/DePSI)
+- Optional `plugins` dependency on `scipy` and `ruptures`, as these are already requested through the dependency on [DePSI](https://github.com/TUDelftGeodesy/DePSI)
+
+## [v4.0.1](https://github.com/TUDelftGeodesy/caroline/tree/116e9fc9beec8dc57165fc2c096da0b60ce7415c) (28-Sep-2026, [diff](https://github.com/TUDelftGeodesy/caroline/compare/c9f7b7d368cc1b0305c6808d4ff0e7759df7f8b2...116e9fc9beec8dc57165fc2c096da0b60ce7415c))
 
 ### Added
 - Documentation on how to update the changelog

caroline/preparation.py

@@ -1704,7 +1704,7 @@ def prepare_generate_partitioned_stm(parameter_file: str, do_track: int | list |
             parameter_file=parameter_file,
             parameter_file_parameters=[
                 "generate_partitioned_stm:general:AoI-name",
-                "reduce_slc_python:general:depsi_group-code-directory",
+                "reduce_slc_python:general:depsi-code-directory",
             ],
             config_parameters=[
                 "caroline_work_directory",
@@ -1787,7 +1787,7 @@ def prepare_merge_to_stack_matlab(parameter_file: str, do_track: int | list | No
             parameter_file=parameter_file,
             parameter_file_parameters=[
                 "merge_to_stack_matlab:general:AoI-name",
-                "merge_to_stack_matlab:general:depsi_group-code-directory",
+                "merge_to_stack_matlab:general:depsi-code-directory",
             ],
             config_parameters=[
                 "caroline_work_directory",
@@ -1870,7 +1870,7 @@ def prepare_merge_to_stack_python(parameter_file: str, do_track: int | list | No
             parameter_file=parameter_file,
             parameter_file_parameters=[
                 "merge_to_stack_python:general:AoI-name",
-                "merge_to_stack_python:general:depsi_group-code-directory",
+                "merge_to_stack_python:general:depsi-code-directory",
             ],
             config_parameters=[
                 "caroline_work_directory",
@@ -2089,7 +2089,7 @@ def prepare_reduce_slc_python(parameter_file: str, do_track: int | list | None =
             parameter_file=parameter_file,
             parameter_file_parameters=[
                 "reduce_slc_python:general:AoI-name",
-                "reduce_slc_python:general:depsi_group-code-directory",
+                "reduce_slc_python:general:depsi-code-directory",
             ],
             config_parameters=[
                 "caroline_work_directory",

config/parameter-files/default-job-param-file-generate_partitioned_stm.yaml

@@ -5,7 +5,7 @@ generate_partitioned_stm:
     AoI-name: "**AoI_name**"
     directory: '/project/caroline/Share/stms_zarr'
     partition: 'normal'
-    depsi_group-code-directory: '**CAROLINE_PLUGINS_DIRECTORY**/DePSI_group'
+    depsi-code-directory: '**CAROLINE_PLUGINS_DIRECTORY**/DePSI'
 
   generate_partitioned_stm-settings:
 

config/parameter-files/default-job-param-file-merge_to_stack_matlab.yaml

@@ -5,6 +5,6 @@ merge_to_stack_matlab:
     AoI-name: "**AoI_name**"
     directory: '/project/caroline/Share/crops'
     partition: 'normal'
-    depsi_group-code-directory: '**CAROLINE_PLUGINS_DIRECTORY**/DePSI_group'
+    depsi-code-directory: '**CAROLINE_PLUGINS_DIRECTORY**/DePSI'
 
 

config/parameter-files/default-job-param-file-merge_to_stack_python.yaml

@@ -5,4 +5,4 @@ merge_to_stack_python:
     AoI-name: "**AoI_name**"
     directory: '/project/caroline/Share/stacks_zarr'
     partition: 'normal'
-    depsi_group-code-directory: '**CAROLINE_PLUGINS_DIRECTORY**/DePSI_group'
+    depsi-code-directory: '**CAROLINE_PLUGINS_DIRECTORY**/DePSI'

config/parameter-files/default-job-param-file-reduce_slc_python.yaml

@@ -5,4 +5,4 @@ reduce_slc_python:
     AoI-name: "**AoI_name**"
     directory: '/project/caroline/Share/stacks_zarr'
     partition: 'normal'
-    depsi_group-code-directory: '**CAROLINE_PLUGINS_DIRECTORY**/DePSI_group'
+    depsi-code-directory: '**CAROLINE_PLUGINS_DIRECTORY**/DePSI'

config/plugin-definitions.yaml

@@ -15,8 +15,8 @@ github:
     repo: "git@bitbucket.org:grsradartudelft/deinsar.git"
     tag: "v0.3.4"
 
-  DePSI_group:
-    repo: "git@github.com:TUDelftGeodesy/DePSI_group.git"
+  DePSI:
+    repo: "git@github.com:TUDelftGeodesy/DePSI.git"
     branch: "caroline-clone-branch"
 
   snap_toolbox:

docs/parameter-file.md

@@ -157,9 +157,9 @@ These parameters are used in the job `reduce_slc_python`. Defaults in [the defau
 - `reduce_slc_python:general:partition`
   - Function: specify the partition on which the [job](glossary.md#jobs) `reduce_slc_python` should be run
   - Possible values: `'short'` (10h time limit, max 2 jobs), `'normal'` (5 day time limit), `'infinite'` (30 day time limit)
-- `reduce_slc_python:general:depsi_group-code-directory`
-  - Function: specify where the DePSI_group code is, containing the functionality for `reduce_slc_python`
-  - Possible values: `string` with the absolute path to the base directory of `DePSI_group`
+- `reduce_slc_python:general:depsi-code-directory`
+  - Function: specify where the depsi code is, containing the functionality for `reduce_slc_python`
+  - Possible values: `string` with the absolute path to the base directory of `depsi`
 
 ## doris_v4 parameters
 
@@ -407,9 +407,9 @@ These parameters are used in the job `generate_partitioned_stm`. Defaults in [th
 - `generate_partitioned_stm:general:partition`
   - Function: specify the partition on which the [job](glossary.md#jobs) `generate_partitioned_stm` should be run
   - Possible values: `'short'` (10h time limit, max 2 jobs), `'normal'` (5 day time limit), `'infinite'` (12 day time limit)
-- `generate_partitioned_stm:general:depsi_group-code-directory`
-  - Function: specify where the DePSI_group code is, containing the functionality for `generate_partitioned_stm`
-  - Possible values: `string` with the absolute path to the base directory of `DePSI_group`
+- `generate_partitioned_stm:general:depsi-code-directory`
+  - Function: specify where the depsi code is, containing the functionality for `generate_partitioned_stm`
+  - Possible values: `string` with the absolute path to the base directory of `depsi`
 
 - `generate_partitioned_stm:generate_partitioned_stm-settings:ps-selection:mode`
   - Function: specify the mode to be used for the time frame selection during the PS selection
@@ -427,7 +427,7 @@ These parameters are used in the job `generate_partitioned_stm`. Defaults in [th
   - Function: set the threshold for when a point is considered a PS (all PS below the threshold are accepted)
   - Possible values: any positive `float` 
 - `generate_partitioned_stm:generate_partitioned_stm-settings:incremental-statistics:increment-mode`
-  - Function: specify the mode to add either the [incremental or recalibration](https://github.com/TUDelftGeodesy/DePSI_group/blob/dev/depsi/point_quality.py#L148) NAD or NMAD (based on `stm_ps_selection_method`)
+  - Function: specify the mode to add either the [incremental or recalibration](https://github.com/TUDelftGeodesy/DePSI/blob/caroline-clone-branch/depsi/point_quality.py#L148) NAD or NMAD (based on `stm_ps_selection_method`)
   - Possible values: `'incremental'` (update every epoch), `'recalibration'` (update every `stm_nad_nmad_recalibration_jump_size` epochs)
 - `generate_partitioned_stm:generate_partitioned_stm-settings:incremental-statistics:recal-jump-size`
   - Function: specify the jump size to be used for `recalibration` mode for the updating NAD or NMAD
@@ -487,9 +487,9 @@ These parameters are used in the job `merge_to_stack_matlab`. Defaults in [the d
 - `merge_to_stack_matlab:general:partition`
   - Function: specify the partition on which the [job](glossary.md#jobs) `merge_to_stack_matlab` should be run
   - Possible values: `'short'` (10h time limit, max 2 jobs), `'normal'` (5 day time limit), `'infinite'` (30 day time limit)
-- `merge_to_stack_matlab:general:depsi_group-code-directory`
-  - Function: specify where the DePSI_group code is, containing the functionality for `merge_to_stack_matlab`
-  - Possible values: `string` with the absolute path to the base directory of `DePSI_group`
+- `merge_to_stack_matlab:general:depsi-code-directory`
+  - Function: specify where the depsi code is, containing the functionality for `merge_to_stack_matlab`
+  - Possible values: `string` with the absolute path to the base directory of `depsi`
 
 ## merge_to_stack_python parameters
 
@@ -505,7 +505,7 @@ These parameters are used in the job `merge_to_stack_python`. Defaults in [the d
 - `merge_to_stack_python:general:partition`
   - Function: specify the partition on which the [job](glossary.md#jobs) `merge_to_stack_python` should be run
   - Possible values: `'short'` (10h time limit, max 2 jobs), `'normal'` (5 day time limit), `'infinite'` (12 day time limit)
-- `merge_to_stack_python:general:depsi_group-code-directory`
-  - Function: specify where the DePSI_group code is, containing the functionality for `merge_to_stack_python`
-  - Possible values: `string` with the absolute path to the base directory of `DePSI_group`
+- `merge_to_stack_python:general:depsi-code-directory`
+  - Function: specify where the depsi code is, containing the functionality for `merge_to_stack_python`
+  - Possible values: `string` with the absolute path to the base directory of `depsi`
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Caroline"
-version = "4.0.1"
+version = "4.1.0"
 requires-python = ">=3.10"
 dependencies = [
     "apache-airflow",
@@ -15,7 +15,7 @@ dependencies = [
     "sarxarray>=1.4.0b2",
     "caroline-download@git+https://github.com/TUDelftGeodesy/caroline-download.git@v0.2.0rc2",
     "snap-run@git+ssh://git@github.com/TUDelftGeodesy/snap-coregistration.git@caroline-clone-branch",
-    "depsi@git+ssh://git@github.com/TUDelftGeodesy/DePSI_group.git@caroline-clone-branch",
+    "depsi@git+https://git@github.com/TUDelftGeodesy/DePSI.git@caroline-clone-branch",
     "asf_search>=13.0.0"
 ]
 description = "End-to-end processing of Interferometric Synthetic Aperture Radar (InSAR) data"
@@ -52,10 +52,8 @@ docs = [
     "mkdocs-gen-files",
 ]
 plugins = [
-    "scipy", # necessary for Doris v5
     "gdal==3.4.1", # necessary for Doris v5, version 3.4.1 since that reflects the status of libgdal on Spider
     "dask_jobqueue", # necessary for reduce_slc_python
-    "ruptures",  # necessary for generate_partitioned_stm
 ]
 
 [tool.setuptools]

templates/generate-partitioned-stm/generate-partitioned-stm.sh

@@ -14,8 +14,8 @@ source **caroline_virtual_environment_directory**/bin/activate
 
 echo "$(date '+%Y-%m-%dT%H:%M:%S'): $(whoami) in $(pwd) has started generate_partitioned_stm.sh (AoI **generate_partitioned_stm:general:AoI-name**, track **track**) with slurm-ID $SLURM_JOB_ID)" >> **caroline_work_directory**/submitted_jobs.log
 
-export PATH="**reduce_slc_python:general:depsi_group-code-directory**:$PATH"
-export PYTHONPATH="**reduce_slc_python:general:depsi_group-code-directory**:$PYTHONPATH"
+export PATH="**reduce_slc_python:general:depsi-code-directory**:$PATH"
+export PYTHONPATH="**reduce_slc_python:general:depsi-code-directory**:$PYTHONPATH"
 
 python3 generate-partitioned-stm.py || exit 5
 

templates/merge-to-stack-matlab/merge-to-stack-matlab.sh

@@ -14,8 +14,8 @@ source **caroline_virtual_environment_directory**/bin/activate
 
 echo "$(date '+%Y-%m-%dT%H:%M:%S'): $(whoami) in $(pwd) has started merge-to-stack-matlab.sh (AoI **merge_to_stack_matlab:general:AoI-name**, track **track**) with slurm-ID $SLURM_JOB_ID)" >> **caroline_work_directory**/submitted_jobs.log
 
-export PATH="**merge_to_stack_matlab:general:depsi_group-code-directory**:$PATH"
-export PYTHONPATH="**merge_to_stack_matlab:general:depsi_group-code-directory**:$PYTHONPATH"
+export PATH="**merge_to_stack_matlab:general:depsi-code-directory**:$PATH"
+export PYTHONPATH="**merge_to_stack_matlab:general:depsi-code-directory**:$PYTHONPATH"
 
 python3 merge-to-stack-matlab.py || exit 5
 

templates/merge-to-stack-python/merge-to-stack-python.sh

@@ -14,8 +14,8 @@ source **caroline_virtual_environment_directory**/bin/activate
 
 echo "$(date '+%Y-%m-%dT%H:%M:%S'): $(whoami) in $(pwd) has started merge-to-stack-python.sh (AoI **merge_to_stack_python:general:AoI-name**, track **track**) with slurm-ID $SLURM_JOB_ID)" >> **caroline_work_directory**/submitted_jobs.log
 
-export PATH="**merge_to_stack_python:general:depsi_group-code-directory**:$PATH"
-export PYTHONPATH="**merge_to_stack_python:general:depsi_group-code-directory**:$PYTHONPATH"
+export PATH="**merge_to_stack_python:general:depsi-code-directory**:$PATH"
+export PYTHONPATH="**merge_to_stack_python:general:depsi-code-directory**:$PYTHONPATH"
 
 python3 merge-to-stack-python.py || exit 5
 

templates/reduce-slc-python/reduce-slc-python.sh

@@ -14,8 +14,8 @@ source **caroline_virtual_environment_directory**/bin/activate
 
 echo "$(date '+%Y-%m-%dT%H:%M:%S'): $(whoami) in $(pwd) has started reduce-slc-python.sh (AoI **reduce_slc_python:general:AoI-name**, track **track**) with slurm-ID $SLURM_JOB_ID)" >> **caroline_work_directory**/submitted_jobs.log
 
-export PATH="**reduce_slc_python:general:depsi_group-code-directory**:$PATH"
-export PYTHONPATH="**reduce_slc_python:general:depsi_group-code-directory**:$PYTHONPATH"
+export PATH="**reduce_slc_python:general:depsi-code-directory**:$PATH"
+export PYTHONPATH="**reduce_slc_python:general:depsi-code-directory**:$PYTHONPATH"
 
 python3 reduce-slc-python.py || exit 5