From e8595ab0071709bf8d56616ce83a13d140f675fa Mon Sep 17 00:00:00 2001 From: Hector Hernandez Guzman Date: Thu, 26 Mar 2020 11:38:59 -0700 Subject: [PATCH 1/4] Adding doc requirements --- .readthedocs.yml | 14 ++++++++++++++ docs-requirements.txt | 4 ++++ tox.ini | 1 + 3 files changed, 19 insertions(+) create mode 100644 .readthedocs.yml create mode 100644 docs-requirements.txt diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 0000000..3dcf0e5 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,14 @@ +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details +version: 2 + +sphinx: + configuration: docs/conf.py + +build: + image: latest + +python: + version: 3.8 + install: + - requirements: docs-requirements.txt diff --git a/docs-requirements.txt b/docs-requirements.txt new file mode 100644 index 0000000..92377a0 --- /dev/null +++ b/docs-requirements.txt @@ -0,0 +1,4 @@ +sphinx~=2.4 +sphinx-rtd-theme~=0.4 +sphinx-autodoc-typehints~=1.10.2 + diff --git a/tox.ini b/tox.ini index 1e23387..5a9de73 100644 --- a/tox.ini +++ b/tox.ini @@ -57,6 +57,7 @@ commands = [testenv:docs] deps = -c dev-requirements.txt + -c docs-requirements.txt sphinx sphinx-rtd-theme sphinx-autodoc-typehints From c0219207e03f7195ad7a4b599594ccbeb6ce68d6 Mon Sep 17 00:00:00 2001 From: Hector Hernandez Guzman Date: Thu, 26 Mar 2020 11:44:10 -0700 Subject: [PATCH 2/4] Updating requirements --- docs-requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs-requirements.txt b/docs-requirements.txt index 92377a0..4a4bbd8 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -1,4 +1,8 @@ sphinx~=2.4 sphinx-rtd-theme~=0.4 sphinx-autodoc-typehints~=1.10.2 +# External +opentelemetry-api +opentelemetry-sdk +psutil From 05555381c60ca97a37812b173e82685a9bef184e Mon Sep 17 00:00:00 2001 From: Hector Hernandez Guzman Date: Fri, 27 Mar 2020 11:29:24 -0700 Subject: [PATCH 3/4] Adding missing versions in req file --- docs-requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index 4a4bbd8..b9ffedb 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -2,7 +2,7 @@ sphinx~=2.4 sphinx-rtd-theme~=0.4 sphinx-autodoc-typehints~=1.10.2 # External -opentelemetry-api -opentelemetry-sdk -psutil +opentelemetry-api>= 0.5b0 +opentelemetry-sdk>= 0.5b0 +psutil>= 5.6.3 From ba531244fa1c6c842e9686bf7b4a3cd85ed06561 Mon Sep 17 00:00:00 2001 From: Hector Hernandez Guzman Date: Fri, 27 Mar 2020 11:33:50 -0700 Subject: [PATCH 4/4] Addressing comments --- dev-requirements.txt | 3 --- tox.ini | 1 - 2 files changed, 4 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 6ce5479..3ffaba9 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -3,8 +3,5 @@ flake8~=3.7 isort~=4.3 black>=19.3b0,==19.* mypy==0.740 -sphinx~=2.1 -sphinx-rtd-theme~=0.4 -sphinx-autodoc-typehints~=1.10.2 pytest!=5.2.3 pytest-cov>=2.8 diff --git a/tox.ini b/tox.ini index 5a9de73..3968186 100644 --- a/tox.ini +++ b/tox.ini @@ -56,7 +56,6 @@ commands = [testenv:docs] deps = - -c dev-requirements.txt -c docs-requirements.txt sphinx sphinx-rtd-theme