From acca7b3c2d4a20629c9ac813d844ee1bbd75172d Mon Sep 17 00:00:00 2001 From: Chris Granade Date: Thu, 9 Aug 2018 14:24:54 -0700 Subject: [PATCH 1/5] Add Cython to ReadTheDocs reqs for QuTiP. --- doc/rtd-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/rtd-requirements.txt b/doc/rtd-requirements.txt index fe7d12f..88c0d7f 100644 --- a/doc/rtd-requirements.txt +++ b/doc/rtd-requirements.txt @@ -1,3 +1,4 @@ +cython numpy scipy scikit-learn From 42b49eb25bd53f588993267a9a236ee61c5527ae Mon Sep 17 00:00:00 2001 From: Christopher Granade Date: Thu, 9 Aug 2018 14:33:31 -0700 Subject: [PATCH 2/5] Moved RTD support to YAML. --- doc/environment.yml | 20 ++++++++++++++++++++ doc/readthedocs.yml | 13 +++++++++++++ doc/rtd-requirements.txt | 18 ------------------ 3 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 doc/environment.yml create mode 100644 doc/readthedocs.yml delete mode 100644 doc/rtd-requirements.txt diff --git a/doc/environment.yml b/doc/environment.yml new file mode 100644 index 0000000..0b24e53 --- /dev/null +++ b/doc/environment.yml @@ -0,0 +1,20 @@ +name: qinfer +dependencies: + - cython + - numpy + - scipy + - scikit-learn + - ipython + - future>=0.15 + - matplotlib + - pytest + - pytest-cov + - pytest-xdist + - coveralls + - pylint + - pip: + # We also add additional tools for plotting. + - mpltools + # We use the PyPI version of QuTiP here since the conda version + # is on the wrong channel for use with RTD. + - qutip diff --git a/doc/readthedocs.yml b/doc/readthedocs.yml new file mode 100644 index 0000000..a5df7c1 --- /dev/null +++ b/doc/readthedocs.yml @@ -0,0 +1,13 @@ +build: + image: latest + +python: + version: 3.5 + setup_py_install: true + +formats: + - epub + - pdf + +conda: + file: environment.yml \ No newline at end of file diff --git a/doc/rtd-requirements.txt b/doc/rtd-requirements.txt deleted file mode 100644 index 88c0d7f..0000000 --- a/doc/rtd-requirements.txt +++ /dev/null @@ -1,18 +0,0 @@ -cython -numpy -scipy -scikit-learn -ipython -future>=0.15 -matplotlib -qutip - -# We also add additional tools for plotting. -mpltools - -pytest -pytest-cov -pytest-xdist - -coveralls -pylint From 397bcf72f41f8975daec7d38f708816e56bf50d3 Mon Sep 17 00:00:00 2001 From: Christopher Granade Date: Thu, 9 Aug 2018 14:34:34 -0700 Subject: [PATCH 3/5] Moved RTD yaml to root. --- doc/readthedocs.yml => readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename doc/readthedocs.yml => readthedocs.yml (79%) diff --git a/doc/readthedocs.yml b/readthedocs.yml similarity index 79% rename from doc/readthedocs.yml rename to readthedocs.yml index a5df7c1..be5e72e 100644 --- a/doc/readthedocs.yml +++ b/readthedocs.yml @@ -10,4 +10,4 @@ formats: - pdf conda: - file: environment.yml \ No newline at end of file + file: doc/environment.yml \ No newline at end of file From 203d35994978cc0c42c0b8360e699bb4c29d034a Mon Sep 17 00:00:00 2001 From: Christopher Granade Date: Thu, 9 Aug 2018 14:35:31 -0700 Subject: [PATCH 4/5] Fixed path to env.yml. --- readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readthedocs.yml b/readthedocs.yml index be5e72e..8d979de 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -10,4 +10,4 @@ formats: - pdf conda: - file: doc/environment.yml \ No newline at end of file + file: ./doc/environment.yml \ No newline at end of file From 778514827806c044fb01d894fae0751c65e92f37 Mon Sep 17 00:00:00 2001 From: Christopher Granade Date: Thu, 9 Aug 2018 15:04:51 -0700 Subject: [PATCH 5/5] Forgot that rtd-requirements.txt is still used for DOCTEST on Travis. --- doc/rtd-requirements.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/rtd-requirements.txt diff --git a/doc/rtd-requirements.txt b/doc/rtd-requirements.txt new file mode 100644 index 0000000..fe7d12f --- /dev/null +++ b/doc/rtd-requirements.txt @@ -0,0 +1,17 @@ +numpy +scipy +scikit-learn +ipython +future>=0.15 +matplotlib +qutip + +# We also add additional tools for plotting. +mpltools + +pytest +pytest-cov +pytest-xdist + +coveralls +pylint