From e75a50420464d918716fe1ddb3e75d3d00f54255 Mon Sep 17 00:00:00 2001 From: jalving Date: Wed, 25 Oct 2023 21:46:16 -0700 Subject: [PATCH 1/7] update RTD yml --- .readthedocs.yml | 67 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 29c410e7..adac860d 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,9 +1,64 @@ -# Read the Docs configuration file +# Read the Docs configuration file for Sphinx projects + # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details -conda: - file: docs/environment.yml -python: - version: 3.8 - setup_py_install: true +# Required + +version: 2 + + +# Set the OS, Python version and other tools you might need + +build: + + os: ubuntu-22.04 + + tools: + + python: "3.9" + + # You can also specify other tool versions: + + # nodejs: "20" + + # rust: "1.70" + + # golang: "1.20" + + +# Build documentation in the "docs/" directory with Sphinx + +sphinx: + + configuration: docs/conf.py + + # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs + + # builder: "dirhtml" + + # Fail on all warnings to avoid broken references + + # fail_on_warning: true + + +# Optionally build your docs in additional formats such as PDF and ePub + +# formats: + +# - pdf + +# - epub + + +# Optional but recommended, declare the Python requirements required + +# to build your documentation + +# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html + +# python: + +# install: + +# - requirements: docs/requirements.txt \ No newline at end of file From cb560fe9c07a96222038b7a256c960535bd760e7 Mon Sep 17 00:00:00 2001 From: jalving Date: Wed, 25 Oct 2023 21:59:02 -0700 Subject: [PATCH 2/7] add requirement.txt --- docs/requirements.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docs/requirements.txt diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 00000000..51a98171 --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,3 @@ +# Required dependencies for Sphinx documentation +sphinx +sphinx-rtd-theme \ No newline at end of file From 1366a3a5de6aadd2d5dead5cb81e7dba3de693fb Mon Sep 17 00:00:00 2001 From: jalving Date: Sat, 28 Oct 2023 15:29:25 -0700 Subject: [PATCH 3/7] uncomment requirements line --- .readthedocs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index adac860d..ebcd5eba 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -57,8 +57,8 @@ sphinx: # See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html -# python: +python: -# install: + install: -# - requirements: docs/requirements.txt \ No newline at end of file + - requirements: docs/requirements.txt \ No newline at end of file From b172b95e7a6970d1ff82fbca707dbfe27d4b1209 Mon Sep 17 00:00:00 2001 From: jalving Date: Sat, 28 Oct 2023 15:45:50 -0700 Subject: [PATCH 4/7] comment out environment.yml --- docs/environment.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/environment.yml b/docs/environment.yml index 4044f80e..78185e70 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -1,11 +1,11 @@ -name: omlt -channels: - - conda-forge -dependencies: - - python=3.8 - - numpy - - pyomo - - networkx - - onnx - - tensorflow - - importlib-metadata \ No newline at end of file +# name: omlt +# channels: +# - conda-forge +# dependencies: +# - python=3.8 +# - numpy +# - pyomo +# - networkx +# - onnx +# - tensorflow +# - importlib-metadata \ No newline at end of file From e1d4842521f7401a09e58773734bf78bf4f6b1c5 Mon Sep 17 00:00:00 2001 From: jalving Date: Sat, 28 Oct 2023 15:59:34 -0700 Subject: [PATCH 5/7] update doc requirements --- .readthedocs.yml | 2 +- docs/requirements.txt | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index ebcd5eba..6e41af22 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -16,7 +16,7 @@ build: tools: - python: "3.9" + python: "3.8" # You can also specify other tool versions: diff --git a/docs/requirements.txt b/docs/requirements.txt index 51a98171..ce42941c 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,9 @@ # Required dependencies for Sphinx documentation sphinx -sphinx-rtd-theme \ No newline at end of file +sphinx-rtd-theme +numpy +pyomo +networkx +onnx +tensorflow +importlib-metadata \ No newline at end of file From 500b521e8b218799a3032110c7c90043944f4d66 Mon Sep 17 00:00:00 2001 From: jalving Date: Sat, 28 Oct 2023 16:17:24 -0700 Subject: [PATCH 6/7] add linear tree --- docs/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index ce42941c..6305e50b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -6,4 +6,5 @@ pyomo networkx onnx tensorflow +linear-tree importlib-metadata \ No newline at end of file From 8728025e9a681b79160b16bdb7919fd512dc26f2 Mon Sep 17 00:00:00 2001 From: jalving Date: Sat, 28 Oct 2023 16:24:35 -0700 Subject: [PATCH 7/7] remove old docs/environment.yml --- docs/environment.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 docs/environment.yml diff --git a/docs/environment.yml b/docs/environment.yml deleted file mode 100644 index 78185e70..00000000 --- a/docs/environment.yml +++ /dev/null @@ -1,11 +0,0 @@ -# name: omlt -# channels: -# - conda-forge -# dependencies: -# - python=3.8 -# - numpy -# - pyomo -# - networkx -# - onnx -# - tensorflow -# - importlib-metadata \ No newline at end of file