Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix tgis merge by interim results #413

Merged
merged 6 commits into from
Feb 9, 2023
Merged

fix tgis merge by interim results #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d6562f
fix tgis merge by interim results
Feb 9, 2023
4a55fa5
linting
Feb 9, 2023
5a1ea1b
linting
Feb 9, 2023
cdfb3b9
add debugging command
Feb 9, 2023
91ee799
fix other debugging command
Feb 9, 2023
f065d81
linting
Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/actinia_core/core/common/process_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def enqueue_job(timeout, func, *args):
# from ...rest.ephemeral_processing import \
# AsyncEphemeralResource
# from ...processing.common.ephemeral_processing import start_job
# from ...processing.actinia_processing.ephemeral.ephemeral_processing \
# from ...processing.actinia_processing.ephemeral_processing \
# import EphemeralProcessing
# processing = EphemeralProcessing(*args)
# processing.run()
Expand Down
6 changes: 6 additions & 0 deletions src/actinia_core/core/grass_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ def get(self):
)

def set(self):
# # for debugging in ephemeral_processing.py (s. also process_queue.py)
# for var in [
# 'GISRC', 'GISBASE', 'LD_LIBRARY_PATH',
# 'GRASS_ADDON_PATH', 'GIS_LOCK']:
# if var in os.environ:
# del os.environ[var]
for key in self.env:
try:
value = self.env[key]
Expand Down
6 changes: 5 additions & 1 deletion src/actinia_core/core/mapset_merge_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,12 @@ def change_mapsetname(
)
elif directory == "tgis":
target_tgis_db = None
if os.path.isdir(os.path.join(target_path, "tgis")):
if target_path and os.path.isdir(
os.path.join(target_path, "tgis")
):
target_tgis_db = os.path.join(target_path, "tgis", "sqlite.db")
else:
target_path = None
_change_mapsetname_in_tgis(
source_path,
source_mapset,
Expand Down