From 65858cee361c9f5d8e8be5be9f356fe53df272e3 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 5 Nov 2024 02:58:41 -0500 Subject: [PATCH 1/2] do not confound STDERR and STDOUT (#638) * do not confound STDERR and STDOUT super minor. * Update hatch_build.py --- tools/hatch_build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/hatch_build.py b/tools/hatch_build.py index 6c006c4a..0925d67d 100644 --- a/tools/hatch_build.py +++ b/tools/hatch_build.py @@ -25,7 +25,7 @@ import os import sys -from subprocess import run, PIPE, STDOUT +from subprocess import run, PIPE from hatchling.builders.hooks.plugin.interface import BuildHookInterface @@ -74,7 +74,7 @@ def is_git_repo(): def check_git_status(): p = run( - "git status --porcelain", shell=True, cwd=root_dir, stdout=PIPE, stderr=STDOUT + "git status --porcelain", shell=True, cwd=root_dir, stdout=PIPE, stderr=PIPE ) git_status = p.stdout.decode(errors="ignore") # print("Git status:\n" + git_status) From 0785784415c58506c75be3f59ea870e7935a968b Mon Sep 17 00:00:00 2001 From: Almar Klein Date: Tue, 5 Nov 2024 15:16:17 +0100 Subject: [PATCH 2/2] Alwats use rtd theme (#639) --- docs/conf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index d1117b29..de459765 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -158,8 +158,7 @@ def resolve_crossrefs(text): # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -if not (os.getenv("READTHEDOCS") or os.getenv("CI")): - html_theme = "sphinx_rtd_theme" +html_theme = "sphinx_rtd_theme" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files,