From 3163d46d2dbd94d81dbefbd381f761d527a265bf Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Wed, 27 Jan 2016 17:05:57 +0000 Subject: [PATCH 1/4] Use conda on Readthedocs --- docs/conda_env.yml | 8 ++++++++ readthedocs.yml | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 docs/conda_env.yml create mode 100644 readthedocs.yml diff --git a/docs/conda_env.yml b/docs/conda_env.yml new file mode 100644 index 000000000..58c96dba9 --- /dev/null +++ b/docs/conda_env.yml @@ -0,0 +1,8 @@ +name: notebook_docs +dependencies: +- sphinx_rtd_theme +- jinja2 +- tornado +- nbformat +- jupyter_client +- ipykernel diff --git a/readthedocs.yml b/readthedocs.yml new file mode 100644 index 000000000..176c4bf60 --- /dev/null +++ b/readthedocs.yml @@ -0,0 +1,2 @@ +conda: + file: docs/conda_env.yml From 73a9d04c78fc3ccdfad9a975df4de03bb4f8cbbc Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Wed, 27 Jan 2016 17:08:13 +0000 Subject: [PATCH 2/4] Install the notebook package itself in the env for building docs --- readthedocs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readthedocs.yml b/readthedocs.yml index 176c4bf60..d7245f77f 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -1,2 +1,5 @@ conda: file: docs/conda_env.yml +python: + version: 3 + setup_py_install: true From 0c39bf28485a4f9f4f4cefd23184988f1f2229b9 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Wed, 27 Jan 2016 17:08:31 +0000 Subject: [PATCH 3/4] Remove requirements.txt file for docs --- docs/requirements.txt | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 docs/requirements.txt diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index 32ca6a6de..000000000 --- a/docs/requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -jupyter -sphinx_rtd_theme -jinja2 -tornado --e git+https://github.com/ipython/ipython_genutils.git#egg=ipython_genutils --e git+https://github.com/ipython/traitlets.git#egg=traitlets --e git+https://github.com/jupyter/jupyter_core.git#egg=jupyter_core --e git+https://github.com/jupyter/nbformat.git#egg=nbformat --e git+https://github.com/jupyter/jupyter_client.git#egg=jupyter_client --e git+https://github.com/ipython/ipython.git#egg=ipython --e git+https://github.com/ipython/ipykernel.git#egg=ipykernel From 85b49fcb90f21646d1ecc9214d7c060b8ca79723 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Wed, 27 Jan 2016 18:03:11 +0000 Subject: [PATCH 4/4] Ensure that conda 1.3 is installed --- docs/conda_env.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/conda_env.yml b/docs/conda_env.yml index 58c96dba9..d10495b71 100644 --- a/docs/conda_env.yml +++ b/docs/conda_env.yml @@ -1,5 +1,6 @@ name: notebook_docs dependencies: +- sphinx>=1.3 - sphinx_rtd_theme - jinja2 - tornado