From 37528c6cfa2a60312934bc264580e67ed3ebe7c0 Mon Sep 17 00:00:00 2001 From: Achal Shah Date: Thu, 9 Jun 2022 22:25:09 -0700 Subject: [PATCH 1/3] docs: Fix rtd docs by removing mysqlclient Signed-off-by: Achal Shah --- sdk/python/docs/Dockerfile | 0 sdk/python/docs/requirements.txt | 2 +- setup.py | 6 ++++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 sdk/python/docs/Dockerfile diff --git a/sdk/python/docs/Dockerfile b/sdk/python/docs/Dockerfile new file mode 100644 index 00000000000..e69de29bb2d diff --git a/sdk/python/docs/requirements.txt b/sdk/python/docs/requirements.txt index 388cd430a8d..55035216355 100644 --- a/sdk/python/docs/requirements.txt +++ b/sdk/python/docs/requirements.txt @@ -1 +1 @@ --e ".[ci]" \ No newline at end of file +-e ".[docs]" \ No newline at end of file diff --git a/setup.py b/setup.py index f92db4acecb..9dc5d0cc9cd 100644 --- a/setup.py +++ b/setup.py @@ -178,6 +178,11 @@ + HBASE_REQUIRED ) + +DOCS_REQUIRED = CI_REQUIRED +for _r in MYSQL_REQUIRED: + DOCS_REQUIRED.remove(_r) + DEV_REQUIRED = ["mypy-protobuf==3.1", "grpcio-testing==1.*"] + CI_REQUIRED # Get git repo root directory @@ -480,6 +485,7 @@ def copy_extensions_to_source(self): "ge": GE_REQUIRED, "hbase": HBASE_REQUIRED, "go": GO_REQUIRED, + "docs": DOCS_REQUIRED, }, include_package_data=True, license="Apache", From 522059dbd09e9a4fe4acd8d2deb8c1c05a1947b7 Mon Sep 17 00:00:00 2001 From: Achal Shah Date: Fri, 10 Jun 2022 08:15:12 -0700 Subject: [PATCH 2/3] fixes Signed-off-by: Achal Shah --- .readthedocs.yml | 2 +- setup.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index dea27e20b3a..75499aa5ddb 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -7,6 +7,6 @@ formats: - pdf python: - version: 3.7 + version: "3.8" install: - requirements: sdk/python/docs/requirements.txt \ No newline at end of file diff --git a/setup.py b/setup.py index 9dc5d0cc9cd..c261507c4a7 100644 --- a/setup.py +++ b/setup.py @@ -179,6 +179,8 @@ ) +# rtd builds fail because of mysql not being installed in their environment. +# We can add mysql there, but it's not strictly needed. This will be faster for builds. DOCS_REQUIRED = CI_REQUIRED for _r in MYSQL_REQUIRED: DOCS_REQUIRED.remove(_r) From 4c3cb2becf19a05c7c31b45c8363bebf403d6989 Mon Sep 17 00:00:00 2001 From: Achal Shah Date: Fri, 10 Jun 2022 08:29:03 -0700 Subject: [PATCH 3/3] rm dockerfile Signed-off-by: Achal Shah --- sdk/python/docs/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 sdk/python/docs/Dockerfile diff --git a/sdk/python/docs/Dockerfile b/sdk/python/docs/Dockerfile deleted file mode 100644 index e69de29bb2d..00000000000