Merge branch 'master' into dev

joshreve · joshreve · commit 37cd60e784f9 · 2021-10-22T20:37:28.000-04:00
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
