WIP: continuation

Nomos11 · Jul 14, 2020 · 39dd5e6 · 39dd5e6
1 parent 9cf246a
commit 39dd5e6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -17,8 +17,12 @@ sphinx:
 # formats:
 #  - pdf
 
+conda:
+  environment: environment.yml
+
 # Optionally set the version of Python and requirements required to build your docs
 python:
   version: 3.7
   install:
+    - requirements: requirements.txt
     - requirements: doc/requirements.txt
diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -5,9 +5,3 @@ numpydoc
 sphinx_rtd_theme
 jupyter_client
 ipython
-numpy
-scipy
-pandas
-matplotlib
-qutip
-filter_functions
diff --git a/environment.yml b/environment.yml
@@ -1,4 +1,4 @@
-name: filter_functions
+name: qopt
 
 channels:
   - conda-forge
@@ -7,4 +7,4 @@ dependencies:
   - qutip
   - pip
 
-prefix: /home/docs/.conda/envs/filter_functions
+prefix: /home/docs/.conda/envs/qopt
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,11 @@
-qutip
-filter_functions
-simanneal
-pandas
 numpy
+scipy
+cython
 matplotlib
-scipy
+nose
+jupyter notebook
+spyder
+simanneal
+pandas
+qutip
+filter_functions