diff --git a/README.md b/README.md index 7a9293a52..fb74d4431 100644 --- a/README.md +++ b/README.md @@ -57,10 +57,10 @@ 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) @@ -68,9 +68,9 @@ The installation instructions below use the environment name, "weis-env," but an 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 index 10df7b918..33e0c902a 100644 --- 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