Merge pull request #118 from WISDEM/instructions

updating install instructions and package dependencies
WISDEM · Jun 23, 2021 · c2527f1 · c2527f1
2 parents 0ebaf03 + 1befd56
commit c2527f1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -57,20 +57,20 @@ The installation instructions below use the environment name, "weis-env," but an
 
 2.  Use conda to install the build dependencies.  Note the differences between Windows and Mac/Linux build systems. Skip to point #3 if you are on the DOE HPC system Eagle
 
-        conda install -y cmake cython geopy git jsonschema make matplotlib-base numpy numpydoc openmdao openpyxl pandas pip pytest pyyaml ruamel_yaml scipy setuptools shapely six sympy swig xlrd
+        conda install -y cmake cython control dill git jsonschema make matplotlib-base numpy openmdao openpyxl pandas pip pytest python-beneditct pyyaml ruamel_yaml scipy seaborn setuptools smt sortedcontainers swig
         conda install -y petsc4py mpi4py compilers       # (Mac / Linux only)   
         conda install -y m2w64-toolchain libpython       # (Windows only)
-        pip install simpy marmot-agents jsonmerge
+        pip install simpy marmot-agents jsonmerge fatpack
         git clone https://github.com/WISDEM/WEIS.git
         cd WEIS
         git checkout branch_name # (Only if you want to switch git branch, say develop)
         python setup.py develop
 
 3. Instructions specific for DOE HPC system Eagle
 
-        conda install -y cmake cython geopy git jsonschema make matplotlib-base numpy numpydoc openmdao openpyxl pandas pip pytest pyyaml ruamel_yaml scipy setuptools shapely six sympy swig xlrd
+        conda install -y cmake cython control dill git jsonschema make matplotlib-base numpy openmdao openpyxl pandas pip pytest python-beneditct pyyaml ruamel_yaml scipy seaborn setuptools smt sortedcontainers swig
         conda install -y petsc4py mpi4py  
-        pip install simpy marmot-agents jsonmerge
+        pip install simpy marmot-agents jsonmerge fatpack
         git clone https://github.com/WISDEM/WEIS.git
         cd WEIS
         git checkout branch_name # (Only if you want to switch git branch, say develop)

diff --git a/environment.yml b/environment.yml
@@ -9,7 +9,7 @@ dependencies:
   - cython
   - dill
   - git
-  - Jinja2<3.0
+  - Jinja2
   - jsonschema
   - make
   - pip
@@ -24,6 +24,7 @@ dependencies:
   - pytest
   - pytest-cov
   - python
+  - python-benedict
   - pyyaml
   - ruamel_yaml
   - scipy