fool uv into using some black version

Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>
give up on putting docs dir in a variable somewhere
2025-05-06 13:09:00 +02:00 · 2025-05-06 13:09:00 +02:00 · 2025-05-06 13:09:00 +02:00 · 2025-05-06 13:09:00 +02:00
3 changed files with 16 additions and 11 deletions
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -6,6 +6,17 @@ build:
    - graphviz
  tools:
    python: "3.11"
+  jobs:
+    create_environment:
+      - asdf plugin add uv
+      - asdf install uv latest
+      - asdf global uv latest
+      - uv venv
+    install:
+      - uv pip install -r lib/spack/docs/requirements.txt
+    build:
+      html:
+        - uv run sphinx-build -T -b html docs $READTHEDOCS_OUTPUT/html

 sphinx:
  configuration: lib/spack/docs/conf.py
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name="spack"
 description="The spack package manager"
-requires-python=">=3.6"
+requires-python=">=3.6.2"
 dependencies=[
  "clingo",
  "setuptools",
--- a/var/spack/repos/spack_repo/builtin/packages/vtk/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/vtk/package.py
@@ -156,13 +156,7 @@ class Vtk(CMakePackage):
    depends_on("libxt", when="^[virtuals=gl] glx platform=linux")

    # VTK will need Qt5OpenGL, and qt needs '-opengl' for that
-    depends_on("qmake", when="@9.1: +qt")
-    with when("^[virtuals=qmake] qt-base"):
-        depends_on("qt-base+opengl+widgets")
-        depends_on("qt-quick3d")
-    with when("^[virtuals=qmake] qt"):
-        depends_on("qt+opengl")
-    depends_on("qt+opengl", when="@:9.0 +qt")
+    depends_on("qt+opengl", when="+qt")

    depends_on("boost", when="+xdmf")
    depends_on("boost+mpi", when="+xdmf +mpi")
@@ -386,8 +380,8 @@ def cmake_args(self):
            cmake_args.extend(["-DCMAKE_MACOSX_RPATH=ON"])

        if "+qt" in spec:
-            qt_ver = spec["qmake"].version.up_to(1)
-            qt_bin = spec["qmake"].prefix.bin
+            qt_ver = spec["qt"].version.up_to(1)
+            qt_bin = spec["qt"].prefix.bin
            qmake_exe = os.path.join(qt_bin, "qmake")

            # https://github.com/martijnkoopman/Qt-VTK-viewer/blob/master/doc/Build-VTK.md
@@ -412,7 +406,7 @@ def cmake_args(self):
            # NOTE: The following definitions are required in order to allow
            # VTK to build with qt~webkit versions (see the documentation for
            # more info: http://www.vtk.org/Wiki/VTK/Tutorials/QtSetup).
-            if "~webkit" in spec["qmake"]:
+            if "~webkit" in spec["qt"]:
                if spec.satisfies("@:8"):
                    cmake_args.extend(
                        [
Author	SHA1	Message	Date
Todd Gamblin	a846631e87	fool uv into using some black version Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>	2025-05-06 13:09:00 +02:00
Todd Gamblin	2d40b9e346	give up on putting docs dir in a variable somewhere Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>	2025-05-06 13:09:00 +02:00
Todd Gamblin	423717345b	fix docs location Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>	2025-05-06 13:09:00 +02:00
Todd Gamblin	693f5256d7	readthedocs: use `uv` to build instead of `pip` `uv` is faster than `pip`, and `pip install` can take a while in our readthedocs builds in CI. Try using `uv` instead. See [readthedocs's docs](https://docs.readthedocs.com/platform/stable/build-customization.html#install-dependencies-with-uv) for details. Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>	2025-05-06 13:09:00 +02:00