From 14c0848367df203830e445d4efd64e9b6aa8c929 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Sat, 18 Aug 2018 16:36:43 +1000 Subject: [PATCH 1/4] update to new rtd requirements spec --- readthedocs.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/readthedocs.yml b/readthedocs.yml index cc7fe8799..75db84705 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -1,5 +1,8 @@ -conda: - file: rtd-environment.yml +# .readthedocs.yml + +build: + image: latest + python: - version: 3.5 - setup_py_install: true + version: 3.6 + setup_py_install: true From be8a6609837789c3e07ffbc6010e3edfc0486dab Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Sat, 18 Aug 2018 16:41:46 +1000 Subject: [PATCH 2/4] add reference to environment spec --- readthedocs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readthedocs.yml b/readthedocs.yml index 75db84705..18cc7a41a 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -6,3 +6,6 @@ build: python: version: 3.6 setup_py_install: true + +conda: + file: rtd-environment.yml \ No newline at end of file From e9f53285e7e34334f391421781fc75cdb6454a42 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Sat, 18 Aug 2018 16:47:33 +1000 Subject: [PATCH 3/4] test use of pip requirements file instead of conda --- readthedocs.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/readthedocs.yml b/readthedocs.yml index 18cc7a41a..cfb42bb61 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -7,5 +7,4 @@ python: version: 3.6 setup_py_install: true -conda: - file: rtd-environment.yml \ No newline at end of file +requirements_file: pip-requirements.txt \ No newline at end of file From 78bc993b7ca89be627ac549a068c472853e14c45 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Sat, 18 Aug 2018 16:54:09 +1000 Subject: [PATCH 4/4] remove old yml config for rtd-environment, consolidate on pip-requirements for now --- rtd-environment.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 rtd-environment.yml diff --git a/rtd-environment.yml b/rtd-environment.yml deleted file mode 100644 index aa44dd32b..000000000 --- a/rtd-environment.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: rtd -dependencies: -- python=3.5 -- sphinx -- ipython -- numpy -- numpydoc -- scipy -- pandas -- statsmodels -- sympy -- numba -- requests -- sphinx_rtd_theme -- matplotlib