From 2c1724a5a60a5ba268d1def58ff8cd6e8a2d23ac Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 20:38:16 +0000 Subject: [PATCH 01/14] add netlify deploy preview --- netlify.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 netlify.toml diff --git a/netlify.toml b/netlify.toml new file mode 100644 index 00000000000000..b26e4e08089d6e --- /dev/null +++ b/netlify.toml @@ -0,0 +1,3 @@ +[build] + command = "make -C Doc/ venv html" + publish = "html" \ No newline at end of file From ebf24e1b7b0f7fb5bc149802a4b939d704568850 Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 20:39:45 +0000 Subject: [PATCH 02/14] fix publish path --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index b26e4e08089d6e..d5cd71720f762f 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] command = "make -C Doc/ venv html" - publish = "html" \ No newline at end of file + publish = "Doc/build/html" \ No newline at end of file From 5312c6f69d473863b27d6d3820d4a1dc115aeab5 Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 20:41:53 +0000 Subject: [PATCH 03/14] install python3 venv --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index d5cd71720f762f..da5cac5a82db05 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] - command = "make -C Doc/ venv html" + command = "apt-get install python3-venv && make -C Doc/ venv html" publish = "Doc/build/html" \ No newline at end of file From 80a6bbfb9ae5a5d247adab16c03e302f2f59486f Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 20:44:26 +0000 Subject: [PATCH 04/14] add sudo --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index da5cac5a82db05..6f9f6169f92d3e 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] - command = "apt-get install python3-venv && make -C Doc/ venv html" + command = "sudo apt-get install python3-venv && make -C Doc/ venv html" publish = "Doc/build/html" \ No newline at end of file From 748253348ac013215915832d77df2bdc43eed35a Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 20:52:35 +0000 Subject: [PATCH 05/14] try without venv --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 6f9f6169f92d3e..8d6c7bc7cef159 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] - command = "sudo apt-get install python3-venv && make -C Doc/ venv html" + command = "make -C Doc/ html" publish = "Doc/build/html" \ No newline at end of file From 7458e2a8985f532a1d0494f7cfab024e6280694f Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 20:54:47 +0000 Subject: [PATCH 06/14] install right dependencies --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 8d6c7bc7cef159..0ea2597a7e323c 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] - command = "make -C Doc/ html" + command = "python -m pip install sphinx==2.0.1 blurb python-docs-theme && make -C Doc/ html" publish = "Doc/build/html" \ No newline at end of file From a75c028d668a8e11bf7e05fe6ecea91e31362ee1 Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 20:56:50 +0000 Subject: [PATCH 07/14] use python3, not python --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 0ea2597a7e323c..08684d41ca1877 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] - command = "python -m pip install sphinx==2.0.1 blurb python-docs-theme && make -C Doc/ html" + command = "python3 -m pip install sphinx==2.0.1 blurb python-docs-theme && make -C Doc/ html" publish = "Doc/build/html" \ No newline at end of file From 24f3a20cf335c9a1687bd9329646c26a174844b1 Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 20:58:15 +0000 Subject: [PATCH 08/14] use pip3 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 08684d41ca1877..39ad35dcdacca0 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] - command = "python3 -m pip install sphinx==2.0.1 blurb python-docs-theme && make -C Doc/ html" + command = "pip3 install sphinx==2.0.1 blurb python-docs-theme && make -C Doc/ html" publish = "Doc/build/html" \ No newline at end of file From 3e8f9bd5d991c64ad2385b316b268c5e10f39d52 Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 21:00:19 +0000 Subject: [PATCH 09/14] python3.7 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 39ad35dcdacca0..dbc1a6d864d15d 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] - command = "pip3 install sphinx==2.0.1 blurb python-docs-theme && make -C Doc/ html" + command = "python3.7 -m pip install sphinx==2.0.1 blurb python-docs-theme && make -C Doc/ html" publish = "Doc/build/html" \ No newline at end of file From 73c2b39ac3cbef6ae3276a576241c47264389189 Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 21:02:37 +0000 Subject: [PATCH 10/14] use requirements.txt --- netlify.toml | 2 +- requirements.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 requirements.txt diff --git a/netlify.toml b/netlify.toml index dbc1a6d864d15d..8d6c7bc7cef159 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] - command = "python3.7 -m pip install sphinx==2.0.1 blurb python-docs-theme && make -C Doc/ html" + command = "make -C Doc/ html" publish = "Doc/build/html" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000000000..d29fbd61dd010a --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +# Requirements for docs build on netlify +sphinx==2.0.1 +blurb +python-docs-theme \ No newline at end of file From 706382c62827dec8186493547d6a9d74dd718201 Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 21:03:30 +0000 Subject: [PATCH 11/14] move requirements.txt to Doc --- requirements.txt => Doc/requirements.txt | 0 netlify.toml | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename requirements.txt => Doc/requirements.txt (100%) diff --git a/requirements.txt b/Doc/requirements.txt similarity index 100% rename from requirements.txt rename to Doc/requirements.txt diff --git a/netlify.toml b/netlify.toml index 8d6c7bc7cef159..387c8f954ada3c 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,4 @@ [build] - command = "make -C Doc/ html" + base = "Doc/" + command = "make html" publish = "Doc/build/html" \ No newline at end of file From 087a79d9f90db892379d9a449c93dad891896559 Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 21:05:20 +0000 Subject: [PATCH 12/14] use python 3.7 in runtime.txt --- runtime.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 runtime.txt diff --git a/runtime.txt b/runtime.txt new file mode 100644 index 00000000000000..548d71365f0ec7 --- /dev/null +++ b/runtime.txt @@ -0,0 +1 @@ +3.7 \ No newline at end of file From f5b228076120c6217c2b22180647548a27ae682c Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 14 Aug 2019 21:08:34 +0000 Subject: [PATCH 13/14] move runtime.txt --- runtime.txt => Doc/runtime.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename runtime.txt => Doc/runtime.txt (100%) diff --git a/runtime.txt b/Doc/runtime.txt similarity index 100% rename from runtime.txt rename to Doc/runtime.txt From 31fc12d2159d74d6819c552f36275580af10beba Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Tue, 20 Aug 2019 21:52:39 -0700 Subject: [PATCH 14/14] Update requirements.txt --- Doc/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index d29fbd61dd010a..e0d7ca869af8c0 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -1,4 +1,5 @@ # Requirements for docs build on netlify +# Pin sphinx to version specified in .travis.yml sphinx==2.0.1 blurb -python-docs-theme \ No newline at end of file +python-docs-theme