Merge branch 'master' into dev

joshreve · Oct 23, 2021 · 37cd60e · 37cd60e
2 parents b64d5b8 + e18d4dc
commit 37cd60e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -15,8 +15,6 @@ SHELL ["bash", "-lc"]
 
 RUN conda activate myenv
 
-RUN pip3 install solidpython
-
 RUN echo "source activate myenv" >> ~/.bashrc
 ENV PATH /opt/conda/envs/myenv/bin:$PATH
 

diff --git a/docker/environment.yml b/docker/environment.yml
@@ -26,3 +26,5 @@ dependencies:
   - numpy=1
   - scipy=1
   - cadquery
+  - pip:
+    - solidpython
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,3 +26,5 @@ dependencies: @@
       - numpy=1
       - scipy=1
       - cadquery
+      - pip:
+        - solidpython