From 4ac6fc38ce7eb3313fa16d0a73bf10a6af85f2ae Mon Sep 17 00:00:00 2001 From: eliott <eliott.sammier@tetras-libre.fr> Date: Mon, 29 Jul 2024 17:16:26 +0200 Subject: [PATCH] Add .env file so that debugger follows mcli environment --- mcli | 10 ++++++++++ tetras_extraction/script/.gitignore | 1 + tetras_extraction/script/.vscode/launch.json | 12 ++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/mcli b/mcli index 7245bb0a..ea8a5c24 100755 --- a/mcli +++ b/mcli @@ -53,6 +53,8 @@ count-all [-f|--force] If -f or --force is given, refresh indexes before counting (equivalent to count-streams and index-extensions) setup Initialize Python environment required by extractors +setup-debug + (Re)create .env file used by the Python debugger launch config extract-rdf Run the extractor to generate RDF from text sources extract-mp3 [-y|--yes-overwrite] @@ -238,6 +240,14 @@ count-all) setup) "$SCRIPTS_DIR/setup.sh" ;; +setup-debug) + envfile="$SCRIPTS_DIR/.env" + echo "VERSION='$VERSION'" > "$envfile" + echo "MACAO_ROOT='$MACAO_ROOT'" >> "$envfile" + echo "SOURCES_DIR='$SOURCES_DIR'" >> "$envfile" + echo "SCRIPTS_DIR='$SCRIPTS_DIR'" >> "$envfile" + echo "RESULTS_DIR='$RESULTS_DIR'" >> "$envfile" + ;; convert) activate_venv python "$SCRIPTS_DIR/src/main.py" diff --git a/tetras_extraction/script/.gitignore b/tetras_extraction/script/.gitignore index 7e7d3fc5..be2b20a3 100644 --- a/tetras_extraction/script/.gitignore +++ b/tetras_extraction/script/.gitignore @@ -1,3 +1,4 @@ # Python cache and runtime env __pycache__/ venv/ +.env diff --git a/tetras_extraction/script/.vscode/launch.json b/tetras_extraction/script/.vscode/launch.json index 15f1806c..a98355be 100644 --- a/tetras_extraction/script/.vscode/launch.json +++ b/tetras_extraction/script/.vscode/launch.json @@ -9,28 +9,32 @@ "type": "debugpy", "request": "launch", "program": "src/extract.py", - "console": "integratedTerminal" + "console": "integratedTerminal", + "envFile": "${workspaceFolder}/.env" }, { "name": "Python: transform", "type": "debugpy", "request": "launch", "program": "src/transform.py", - "console": "integratedTerminal" + "console": "integratedTerminal", + "envFile": "${workspaceFolder}/.env" }, { "name": "Python: export", "type": "debugpy", "request": "launch", "program": "src/export.py", - "console": "integratedTerminal" + "console": "integratedTerminal", + "envFile": "${workspaceFolder}/.env" }, { "name": "Python: main", "type": "debugpy", "request": "launch", "program": "src/main.py", - "console": "integratedTerminal" + "console": "integratedTerminal", + "envFile": "${workspaceFolder}/.env" } ] } \ No newline at end of file -- GitLab