From 921e112d2a4cb4b35ed37672a364f5de6bb0223b Mon Sep 17 00:00:00 2001 From: RemDelaporteMathurin Date: Thu, 18 Apr 2024 17:03:57 -0400 Subject: [PATCH 1/2] use yml file in Dockerfile --- .devcontainer/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 94bc358..b97a38c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/miniconda:0-3 -RUN conda install -c conda-forge mamba -RUN mamba install -c conda-forge fenics +COPY environment.yml* . -RUN apt-get update && apt-get install -y libgl1 +RUN conda env create -f environment.yml -RUN pip install festim==1.2.1 matplotlib meshio[all] ipykernel h-transport-materials==0.12.7 numpy==1.24 +RUN apt-get update && apt-get install -y libgl1 From ee520a48f2324e637b8739a02cf63467c20267bd Mon Sep 17 00:00:00 2001 From: RemDelaporteMathurin Date: Thu, 18 Apr 2024 17:06:28 -0400 Subject: [PATCH 2/2] adapted README --- README.md | 6 ++---- requirements.txt | 7 ------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 requirements.txt diff --git a/README.md b/README.md index cef65ea..4af16b3 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,8 @@ You can [create a Codespace](https://github.com/codespaces/new?machine=standardL ``` git clone https://github.com/festim-dev/FESTIM-workshop ``` -2. [Install FESTIM](https://festim.readthedocs.io/en/latest/getting_started.html) - -3. Install dependencies +2. Create Conda environment (requires conda) ``` -pip install -r requirements.txt +conda env create -f environment.yml ``` diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 33de14b..0000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -festim==1.2 -matplotlib==3.7.1 -meshio[all] -pyparsing -# ipykernel -h-transport-materials==0.12.7 -numpy==1.24 \ No newline at end of file