Pendulum issue

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

app/Dockerfiles/Dockerfile.dev

@@ -11,7 +11,7 @@ COPY . .
 
 # App dependencies
 RUN pip install -r requirements.dev.txt
-RUN pip install --src /opt/spine -r requirements.spine.txt
+RUN pip install --src /opt/resilience_calculator/spine -r requirements.spine.txt
 ENV PATH=$PATH:/opt/spine
 
 # # Config
@@ -20,9 +20,7 @@ COPY ./install/SpineToolbox.conf /root/.spinetoolbox/SpineProject
 
 # # Julia
 WORKDIR /opt
-RUN wget https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.3-linux-x86_64.tar.gz
-RUN tar zxvf julia-1.9.3-linux-x86_64.tar.gz
-ENV PATH=$PATH:/opt/julia-1.9.3/bin
+RUN python3 -m jill install --confirm
 RUN . ./resilience_calculator/install/julia.sh
 
 # Environment

app/entrypoint.local.sh

@@ -1,9 +1,4 @@
 #!/bin/sh
 # Copyright 2023, Battelle Energy Alliance, LLC
 
-mv /opt/spine/spine-engine /opt/resilience_calculator/spine/
-mv /opt/spine/spine-items /opt/resilience_calculator/spine/
-mv /opt/spine/spinedb-api /opt/resilience_calculator/spine/
-mv /opt/spine/spinetoolbox /opt/resilience_calculator/spine/
-
-tail -f /dev/null
+flask run --host=0.0.0.0 --no-reload --debugger

app/install/julia.sh

@@ -1,3 +1,5 @@
+julia -e 'using Pkg; Pkg.rm("SpineInterface")' || true
+julia -e 'using Pkg; Pkg.rm("SpineOpt")' || true
 julia -e 'using Pkg; Pkg.add(url="https://github.com/spine-tools/SpineInterface.jl.git")'
 julia -e 'using Pkg; Pkg.add(url="https://github.com/spine-tools/SpineOpt.jl.git")'
-julia -e 'using Pkg; Pkg.add(["XLSX", "DataFrames", "Distributions", "CSV", "Revise", "Cbc", "Clp"])'
+julia -e 'using Pkg; Pkg.add(["XLSX", "DataFrames", "Distributions", "CSV", "Revise", "Cbc", "Clp"])'

app/spine/.gitignore

@@ -0,0 +1,4 @@
+spine-engine
+spine-items
+spinedb-api
+spinetoolbox