diff --git a/flavors/lter-life-wadden-py/environment.yaml b/flavors/lter-life-wadden-py/environment.yaml deleted file mode 100644 index 6e85d70..0000000 --- a/flavors/lter-life-wadden-py/environment.yaml +++ /dev/null @@ -1,7 +0,0 @@ -name: lter-life-wadden-py -channels: - - conda-forge -dependencies: - - ipykernel - - minio - - webdavclient3 diff --git a/flavors/lter-life-wadden-py/flavor_config.yaml b/flavors/lter-life-wadden-py/flavor_config.yaml deleted file mode 100644 index 7135c61..0000000 --- a/flavors/lter-life-wadden-py/flavor_config.yaml +++ /dev/null @@ -1,3 +0,0 @@ -flavor_name: lter-life-wadden-py -build_jupyter: True -free_disk_space: False diff --git a/flavors/lter-life-wadden/environment.yaml b/flavors/lter-life-wadden/environment.yaml new file mode 100644 index 0000000..89f18fd --- /dev/null +++ b/flavors/lter-life-wadden/environment.yaml @@ -0,0 +1,16 @@ +name: lter-life-wadden +channels: + - conda-forge +dependencies: + - ipykernel + - minio + - webdavclient3 + - r-irkernel + - r-jsonlite + - r-optparse + - r-fme + - r-desolve + - r-plot3d + - r-sf + - r-ncdf4 + - r-tidyverse \ No newline at end of file diff --git a/flavors/lter-life-wadden/flavor_config.yaml b/flavors/lter-life-wadden/flavor_config.yaml new file mode 100644 index 0000000..2b9242c --- /dev/null +++ b/flavors/lter-life-wadden/flavor_config.yaml @@ -0,0 +1,3 @@ +flavor_name: lter-life-wadden +build_jupyter: True +free_disk_space: True diff --git a/flavors/lter-life-wadden-py/naavre-cell-build.Dockerfile b/flavors/lter-life-wadden/naavre-cell-build.Dockerfile similarity index 100% rename from flavors/lter-life-wadden-py/naavre-cell-build.Dockerfile rename to flavors/lter-life-wadden/naavre-cell-build.Dockerfile diff --git a/flavors/lter-life-wadden-py/naavre-jupyter.Dockerfile b/flavors/lter-life-wadden/naavre-jupyter.Dockerfile similarity index 69% rename from flavors/lter-life-wadden-py/naavre-jupyter.Dockerfile rename to flavors/lter-life-wadden/naavre-jupyter.Dockerfile index 008dfb3..dcd25e1 100644 --- a/flavors/lter-life-wadden-py/naavre-jupyter.Dockerfile +++ b/flavors/lter-life-wadden/naavre-jupyter.Dockerfile @@ -10,8 +10,8 @@ RUN \ git clone --depth 1 https://github.com/acolite/acolite.git && \ # Acolite doesn't run on Python 3.12 yet sed -i 's/- python=3$/- python<=3.11/' acolite/environment.yml && \ - mamba env update --name lter-life-wadden-py --file ./acolite/environment.yml && \ - site_package_dir="$(/opt/conda/envs/lter-life-wadden-py/bin/python -c "import site; print(''.join(site.getsitepackages()))")" && \ + mamba env update --name lter-life-wadden --file ./acolite/environment.yml && \ + site_package_dir="$(/opt/conda/envs/lter-life-wadden/bin/python -c "import site; print(''.join(site.getsitepackages()))")" && \ cp ./acolite/acolite -r "$site_package_dir" && \ cp ./acolite/config -r "$site_package_dir" && \ cp ./acolite/data -r "$site_package_dir" diff --git a/flavors/lter-life-wadden-py/tests/test_acolite.py b/flavors/lter-life-wadden/tests/test_acolite.py similarity index 100% rename from flavors/lter-life-wadden-py/tests/test_acolite.py rename to flavors/lter-life-wadden/tests/test_acolite.py diff --git a/flavors/lter-life-wadden/tests/test_import.R b/flavors/lter-life-wadden/tests/test_import.R new file mode 100644 index 0000000..166d13d --- /dev/null +++ b/flavors/lter-life-wadden/tests/test_import.R @@ -0,0 +1,9 @@ +library(optparse) +library(jsonlite) + +library(FME) +library(deSolve) +library(plot3D) +library(sf) +library(ncdf4) +library(tidyverse) diff --git a/flavors/lter-life-wadden-py/tests/tests.sh b/flavors/lter-life-wadden/tests/tests.sh similarity index 65% rename from flavors/lter-life-wadden-py/tests/tests.sh rename to flavors/lter-life-wadden/tests/tests.sh index 48cc709..9feb2ed 100644 --- a/flavors/lter-life-wadden-py/tests/tests.sh +++ b/flavors/lter-life-wadden/tests/tests.sh @@ -3,3 +3,4 @@ set -e source /venv/bin/activate dir="${0%/*}" find "$dir" -name "*.py" -print0 | xargs --null -I "{}" python "{}" +find "$dir" -name "*.R" -print0 | xargs --null -I "{}" Rscript "{}"