From 02eb832c83635a787a8b8724870aad0562c3897d Mon Sep 17 00:00:00 2001 From: Martin Folkerts Date: Sun, 22 Oct 2023 21:20:44 +0200 Subject: [PATCH] split smartcane in to smartcane and runcane --- python_app/requirements.txt | 98 +++++++++++++++++++++++++++++++++++-- runcane.sh | 22 +++++++++ smartcane.sh | 10 ---- 3 files changed, 117 insertions(+), 13 deletions(-) create mode 100755 runcane.sh diff --git a/python_app/requirements.txt b/python_app/requirements.txt index 3a60ab7..51fd989 100644 --- a/python_app/requirements.txt +++ b/python_app/requirements.txt @@ -1,28 +1,120 @@ aenum==3.1.15 +anyio==4.0.0 +appnope==0.1.3 +argon2-cffi==23.1.0 +argon2-cffi-bindings==21.2.0 +asttokens==2.4.0 +async-lru==2.0.4 +attrs==23.1.0 +Babel==2.13.0 +backcall==0.2.0 +beautifulsoup4==4.12.2 +bleach==6.1.0 certifi==2023.7.22 +cffi==1.16.0 charset-normalizer==3.3.0 click==8.1.7 +comm==0.1.4 +contourpy==1.1.1 +cycler==0.12.1 dataclasses-json==0.6.1 -GDAL==3.4.1 +debugpy==1.8.0 +decorator==5.1.1 +defusedxml==0.7.1 +exceptiongroup==1.1.3 +executing==2.0.0 +fastjsonschema==2.18.1 +fonttools==4.43.1 +GDAL==3.7.2 idna==3.4 +importlib-metadata==6.8.0 +importlib-resources==6.1.0 +ipykernel==6.25.2 +ipython==8.16.1 +ipython-genutils==0.2.0 +ipywidgets==8.1.1 +jedi==0.19.1 +Jinja2==3.1.2 +json5==0.9.14 +jsonschema==4.19.1 +jsonschema-specifications==2023.7.1 +jupyter==1.0.0 +jupyter-client==8.4.0 +jupyter-console==6.6.3 +jupyter-core==5.4.0 +jupyter-events==0.8.0 +jupyter-lsp==2.2.0 +jupyter-server==2.8.0 +jupyter-server-terminals==0.4.4 +jupyterlab==4.0.7 +jupyterlab-pygments==0.2.2 +jupyterlab-server==2.25.0 +jupyterlab-widgets==3.0.9 +kiwisolver==1.4.5 +MarkupSafe==2.1.3 marshmallow==3.20.1 +matplotlib==3.8.0 +matplotlib-inline==0.1.6 +mistune==3.0.2 mypy-extensions==1.0.0 +nbclient==0.8.0 +nbconvert==7.9.2 +nbformat==5.9.2 +nest-asyncio==1.5.8 +notebook==7.0.6 +notebook-shim==0.2.3 numpy==1.26.1 oauthlib==3.2.2 +overrides==7.4.0 packaging==23.2 +pandocfilters==1.5.0 +parso==0.8.3 +pexpect==4.8.0 +pickleshare==0.7.5 Pillow==10.1.0 +platformdirs==3.11.0 +prometheus-client==0.17.1 +prompt-toolkit==3.0.39 +psutil==5.9.6 +ptyprocess==0.7.0 +pure-eval==0.2.2 +pycparser==2.21 +Pygments==2.16.1 +pyparsing==3.1.1 pyproj==3.6.1 python-dateutil==2.8.2 +python-json-logger==2.0.7 +PyYAML==6.0.1 +pyzmq==25.1.1 +qtconsole==5.4.4 +QtPy==2.4.0 +referencing==0.30.2 requests==2.31.0 requests-oauthlib==1.3.1 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 +rpds-py==0.10.6 +Send2Trash==1.8.2 sentinelhub==3.9.1 shapely==2.0.2 six==1.16.0 +sniffio==1.3.0 +soupsieve==2.5 +stack-data==0.6.3 +terminado==0.17.1 tifffile==2023.9.26 +tinycss2==1.2.1 tomli==2.0.1 -tomli_w==1.0.0 +tomli-w==1.0.0 +tornado==6.3.3 tqdm==4.66.1 +traitlets==5.11.2 +typing-extensions==4.8.0 typing-inspect==0.9.0 -typing_extensions==4.8.0 urllib3==2.0.7 utm==0.7.0 +wcwidth==0.2.8 +webencodings==0.5.1 +websocket-client==1.6.4 +widgetsnbextension==4.0.9 +zipp==3.17.0 diff --git a/runcane.sh b/runcane.sh new file mode 100755 index 0000000..93bb555 --- /dev/null +++ b/runcane.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Directory waar de virtuele omgeving zal worden aangemaakt +VENV_DIR="./python_app/myenv" + +# Activeer de virtuele omgeving +source "$VENV_DIR/bin/activate" + +# Hier kan je verdere stappen toevoegen, zoals het uitvoeren van je Python-script of Jupyter Notebook +jupyter nbconvert --execute --to script --stdout python_app/Chemba_download.ipynb + +# Deactiveer de virtuele omgeving (optioneel) +deactivate +## Runnen van R scripts +# Kopieer de excel file met harvesting data en maak directory aan indien nodig +cd r_app +Rscript 1_harvest_data_EcoFarm_v2.R +Rscript 2_CI_data_prep.R +# +## Runnen van Rmd bestand +# -e betekent "evalueren" en -i specificeert de input file +Rscript -e "rmarkdown::render('CI_Report_dashboard_planet.Rmd', 'all')" +cd .. diff --git a/smartcane.sh b/smartcane.sh index ad69268..2bf8b26 100755 --- a/smartcane.sh +++ b/smartcane.sh @@ -46,8 +46,6 @@ else fi # Hier kan je verdere stappen toevoegen, zoals het uitvoeren van je Python-script of Jupyter Notebook -jupyter nbconvert --execute --to script --stdout python_app/Chemba_download.ipynb - # Deactiveer de virtuele omgeving (optioneel) deactivate ## Runnen van R scripts @@ -55,11 +53,3 @@ deactivate mkdir -p laravel_app/storage/app/harvesting_data cp "Current - Pivots planting date and harevsting data.xlsx" "laravel_app/storage/app/harvesting_data/" cp "pivot_20210625.geojson" "laravel_app/storage/app/Data" -cd r_app -Rscript 1_harvest_data_EcoFarm_v2.R -Rscript 2_CI_data_prep.R -# -## Runnen van Rmd bestand -# -e betekent "evalueren" en -i specificeert de input file -Rscript -e "rmarkdown::render('CI_Report_dashboard_planet.Rmd', 'all')" -cd ..