diff --git a/.gitignore b/.gitignore index 743b90bb3edec57688cfe0a6ddae77939f1bc7cb..d3d9f672979a316f87e8d7f06b2202197612cd3c 100755 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,6 @@ build # Ignore Data Folder Data # ignore Sphinx documentation output -*docs/build +# *docs/build # Ignore .DS_Store .DS_Store \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/Dockerfile b/Dockerfile index 20a694bdae1148e189a28edecb84ea9953ef72c6..3c5e19303a5ece9c57052a099b31ee8ee6e74960 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,27 +25,27 @@ # CMD ["bash"] -FROM continuumio/miniconda3:latest +# FROM continuumio/miniconda3:latest -# Set working directory -WORKDIR /app +# # Set working directory +# WORKDIR /app -# Copy environment setup files -COPY requirements.txt ./ +# # Copy environment setup files +# COPY requirements.txt ./ -# Update the base environment's Python version -RUN conda install -n base python=3.12.7 -y && \ -pip install --upgrade pip==25.0 && \ -pip install -r requirements.txt +# # Update the base environment's Python version +# RUN conda install -n base python=3.12.7 -y && \ +# pip install --upgrade pip==25.0 && \ +# pip install -r requirements.txt -# # Install the required packages -# RUN pip install --upgrade pip==25.0 -# # RUN conda install vtk==9.4.0 -y -# RUN pip install -r requirements.txt -# # conda install --yes --file requirements.txt +# # # Install the required packages +# # RUN pip install --upgrade pip==25.0 +# # # RUN conda install vtk==9.4.0 -y +# # RUN pip install -r requirements.txt +# # # conda install --yes --file requirements.txt -# Use the Conda environment -CMD ["/bin/bash"] +# # Use the Conda environment +# CMD ["/bin/bash"] @@ -72,7 +72,21 @@ CMD ["/bin/bash"] # # Default to an interactive shell # CMD ["/bin/bash"] -# FROM python:3.12.7 +# Use Python base image +FROM python:3.12.7 + +# Install system dependencies +RUN apt-get update && apt-get install -y \ + git cmake ninja-build g++ gcc python3-dev + +# Clone the repository and rewrite SSH URLs to HTTPS +RUN git clone https://github.com/tataratat/splinepy.git && \ + cd splinepy && \ + git config --global url."https://github.com/".insteadOf "git@github.com:" && \ + git submodule deinit -f . && \ + git submodule update --init --recursive && \ + pip install -e . + # RUN apt-get update -y && apt-get upgrade -y @@ -85,9 +99,15 @@ CMD ["/bin/bash"] # # Install dependencies (if needed) # # RUN pip install --upgrade pyvista # # RUN pip install vtk -# RUN pip install -r requirements.txt - -# WORKDIR /root - -# CMD ["python"] - +# # RUN pip install -r requirements.txt +# # Install documentation dependencies +# RUN pip install numpy==2.0.2 kneed==0.8.5 matplotlib==3.9.3 pandas==2.2.3 scikit-learn==1.5.2 scipy==1.14.1 tensorflow==2.18.0 +# # RUN pip install setuptools --upgrade +# # RUN pip install splinepy==0.1.3 +# # Install splinepy from suorce +# RUN git clone https://github.com/tataratat/splinepy.git && cd splinepy && git submodule update --init --recursive && pip install -e . +# RUN pip install sphinx==8.2.1 myst-parser==4.0.1 sphinx-copybutton==0.5.2 sphinx-rtd-theme==3.0.2 + +WORKDIR /root + +CMD ["python"] diff --git a/requirements.txt b/requirements.txt index efee004cdd72dcc86dc298650cd6399c5c58279f..043475ca71126583bc56953239f4dd9dc9f849c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ scipy==1.14.1 tensorflow==2.18.0 gustaf==0.0.26 splinepy==0.1.3 -# vtk==9.4.0 +vtk==9.4.0 vedo==2024.5.2 sphinx==8.2.1 myst-parser==4.0.1