Merge branch 'main' into async_handler

pygfx · Nov 5, 2024 · 3b024be · 3b024be
2 parents f831e6d + 0785784
commit 3b024be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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,

diff --git 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)