Merge branch 'dev'

castelao · Aug 6, 2016 · 1196aac · 1196aac
2 parents 5489cbf + 0a4fd70
commit 1196aac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -0,0 +1,7 @@
+name: cotede
+
+dependencies:
+- python=2.7
+- numpy=1.11.1
+- netcdf4=1.2.4
+- scipy=0.18.0
diff --git a/readthedocs.yml b/readthedocs.yml
@@ -0,0 +1,2 @@
+conda:
+    file: docs/environment.yml