From b7017c3dad16fe961e4f7ec4facaca8ba8c19e3b Mon Sep 17 00:00:00 2001 From: Dean Moldovan Date: Sun, 12 Mar 2017 22:36:48 +0100 Subject: [PATCH] Fix readthedocs build (#721) RTD updated their build environment which broke the 1.8.14.dev build of doxygen that we were using. The update also breaks the conda-forge build of 1.8.13 (but that version has other issues). Luckily, the RTD update did bring their doxygen version up to 1.8.11 which is enough to parse the C++11 code we need (ref qualifiers) and it also avoids the segfault found in 1.8.13. Since we're using the native doxygen, conda isn't required anymore and we can simplify the RTD configuration. [skip ci] --- .readthedocs.yml | 5 +++-- docs/environment.yml | 12 ------------ docs/requirements.txt | 1 + 3 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 docs/environment.yml create mode 100644 docs/requirements.txt diff --git a/.readthedocs.yml b/.readthedocs.yml index 004a03ae..c9c61617 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,2 +1,3 @@ -conda: - file: docs/environment.yml +python: + version: 3 +requirements_file: docs/requirements.txt diff --git a/docs/environment.yml b/docs/environment.yml deleted file mode 100644 index 879afc43..00000000 --- a/docs/environment.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: rtd -channels: -- dean0x7d -- defaults -dependencies: -- python==3.5 -- sphinx==1.5.1 -- sphinx_rtd_theme==0.1.9 -- doxygen -- pip -- pip: - - breathe diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 00000000..3818fe80 --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1 @@ +breathe == 4.5.0