cmake 4.4.3__tar.gz → 4.4.4__tar.gz

{cmake-4.4.3 → cmake-4.4.4}/.github/workflows/build.yml

@@ -102,16 +102,16 @@ jobs:
           fetch-depth: 0  # required for versioneer to find tags
           persist-credentials: false
 
-      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+      - uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
         with:
           enable-cache: false
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
+        uses: docker/setup-qemu-action@99012661954931238ded8c8b007157a8430204e1 # v4.4.0
         if: matrix.arch == 'ppc64le' || matrix.arch == 'riscv64' || matrix.arch == 's390x'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0
+        uses: pypa/cibuildwheel@e090b81e30c4d855ea63bf4b6e59204c09a101ae # v4.2.1
         env:
           CIBW_ARCHS: "${{ matrix.arch }}"
           CIBW_BUILD: "cp310-${{ matrix.build }}*"
@@ -134,6 +134,9 @@ jobs:
       - name: Build SDist
         run: pipx run build --sdist
 
+      - name: Check bundled CMake source archive
+        run: tar tzf dist/*.tar.gz | grep -E '/archive-cache/cmake-[0-9.]+\.tar\.gz$'
+
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: cibw-sdist
@@ -152,7 +155,7 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+      - uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
         with:
           enable-cache: false
 
@@ -171,9 +174,14 @@ jobs:
           name: cibw-sdist
           path: dist
 
-      - name: Install SDist
+      # Dead proxy blocks the CMake download; PyPI stays reachable for build deps.
+      - name: Install SDist (offline, from bundled source)
         env:
-          CMAKE_ARGS: "-DBUILD_CMAKE_FROM_SOURCE:BOOL=OFF"
+          CMAKE_ARGS: "-DBUILD_CMAKE_FROM_SOURCE:BOOL=ON"
+          CMAKE_BUILD_PARALLEL_LEVEL: "4"
+          http_proxy: "http://127.0.0.1:9"
+          https_proxy: "http://127.0.0.1:9"
+          no_proxy: "pypi.org,files.pythonhosted.org"
         run: |
           uv pip install dist/*.tar.gz
           rm -rf dist

{cmake-4.4.3 → cmake-4.4.4}/.pre-commit-config.yaml

@@ -18,13 +18,13 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 39d9ac5938dadb73df0564a45f163e25ff9fa6e2  # frozen: v0.16.1
+  rev: 321478e58f4938179c6b86e4ddfa923d1547a49b  # frozen: v0.16.6
   hooks:
   - id: ruff-check
     args: [--fix, --show-fixes]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: 41e691678310dfd3833f7ab4e180ddb014310356  # frozen: v2.3.0
+  rev: 7ff8d35ae36a7d2b968f2f90b4c723e292e594ee  # frozen: v2.3.1
   hooks:
   - id: mypy
     files: ^(src|scripts)
@@ -32,7 +32,7 @@ repos:
     args: []
 
 - repo: https://github.com/zizmorcore/zizmor-pre-commit
-  rev: 451b56af716f9f0d0c2b816503a3fd0cf8b036fa  # frozen: v1.29.0
+  rev: cef8b8350da46d8114c7e6b7272aebdccdf193ce  # frozen: v1.30.0
   hooks:
   - id: zizmor
     files: "^\\.github"

{cmake-4.4.3 → cmake-4.4.4}/CMakeLists.txt

@@ -37,7 +37,7 @@ if(CMakePythonDistributions_SUPERBUILD)
 
   set(RUN_CMAKE_TEST_EXCLUDE "BootstrapTest" CACHE STRING "CMake test suite exclusion regex")
 
-  set(CMakePythonDistributions_ARCHIVE_DOWNLOAD_DIR "${CMAKE_BINARY_DIR}"
+  set(CMakePythonDistributions_ARCHIVE_DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/archive-cache"
     CACHE PATH "Directory where to download archives"
     )
 
@@ -60,9 +60,6 @@ if(CMakePythonDistributions_SUPERBUILD)
   endfunction()
 
   set(src_archive "unix_source")
-  if(WIN32)
-    set(src_archive "windows_source")
-  endif()
   check_archive_var("${src_archive}")
 
   set(binary_archive "linux32_binary")

cmake-4.4.4/CMakeUrls.cmake

@@ -0,0 +1,26 @@
+
+#-----------------------------------------------------------------------------
+# CMake sources
+set(unix_source_url          "https://github.com/Kitware/CMake/releases/download/v4.4.4/cmake-4.4.4.tar.gz")
+set(unix_source_sha256       "bd24c30d80a7744ae84b845ff080cc8453b06c622ef01066564108e9cefc44cf")
+
+#-----------------------------------------------------------------------------
+# CMake binaries
+
+set(linux32_binary_url       "NA")  # Linux 32-bit binaries not available
+set(linux32_binary_sha256    "NA")
+
+set(linux64_binary_url       "https://github.com/Kitware/CMake/releases/download/v4.4.4/cmake-4.4.4-linux-x86_64.tar.gz")
+set(linux64_binary_sha256    "e5bb807f7728cb60cd8b27ebc97a2edb469b68655f21e844a600c3575b76f5bb")
+
+set(macos10_10_binary_url    "https://github.com/Kitware/CMake/releases/download/v4.4.4/cmake-4.4.4-macos10.10-universal.tar.gz")
+set(macos10_10_binary_sha256 "d6a8fe92599160bba0c76910ceaf8c8e38c7dcc00cc08d5a29d59da93283a558")
+
+set(win32_binary_url         "https://github.com/Kitware/CMake/releases/download/v4.4.4/cmake-4.4.4-windows-i386.zip")
+set(win32_binary_sha256      "1a791472619ae85abf95e3f52838b746a47542ec731a288abac2fee8154d5664")
+
+set(win64_binary_url         "https://github.com/Kitware/CMake/releases/download/v4.4.4/cmake-4.4.4-windows-x86_64.zip")
+set(win64_binary_sha256      "bace36e94b31c68ab6fa295f26dfa11219e0701cf7c94b0284a7d1cb13dac536")
+
+set(winarm64_binary_url      "https://github.com/Kitware/CMake/releases/download/v4.4.4/cmake-4.4.4-windows-arm64.zip")
+set(winarm64_binary_sha256   "ed673bbc4eb7c1e59b0407fd52f1680fc0ae3229a46b9b7b3ea9133764f07f67")

{cmake-4.4.3 → cmake-4.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmake
-Version: 4.4.3
+Version: 4.4.4
 Summary: CMake is an open-source, cross-platform family of tools designed to build, test and package software
 Keywords: CMake,build,c++,fortran,cross-platform,cross-compilation
 Author-Email: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
@@ -37,7 +37,7 @@ The suite of CMake tools were created by Kitware in response to the need
 for a powerful, cross-platform build environment for open-source projects
 such as ITK and VTK.
 
-The CMake python wheels provide `CMake 4.4.3 <https://cmake.org/cmake/help/v4.4/index.html>`_.
+The CMake python wheels provide `CMake 4.4.4 <https://cmake.org/cmake/help/v4.4/index.html>`_.
 
 Installation
 ------------

{cmake-4.4.3 → cmake-4.4.4}/README.rst

@@ -11,7 +11,7 @@ The suite of CMake tools were created by Kitware in response to the need
 for a powerful, cross-platform build environment for open-source projects
 such as ITK and VTK.
 
-The CMake python wheels provide `CMake 4.4.3 <https://cmake.org/cmake/help/v4.4/index.html>`_.
+The CMake python wheels provide `CMake 4.4.4 <https://cmake.org/cmake/help/v4.4/index.html>`_.
 
 Installation
 ------------

{cmake-4.4.3 → cmake-4.4.4}/_build_backend/backend.py

@@ -1,15 +1,19 @@
 from __future__ import annotations
 
 import os
+from pathlib import Path
 
 from scikit_build_core import build as _orig
 
+# Archives are downloaded here (gitignored). The sdist bundles the unix source
+# tarball in this directory so a build from the sdist needs no network.
+_ARCHIVE_DIR = Path("archive-cache")
+
 if hasattr(_orig, "prepare_metadata_for_build_editable"):
     prepare_metadata_for_build_editable = _orig.prepare_metadata_for_build_editable
 if hasattr(_orig, "prepare_metadata_for_build_wheel"):
     prepare_metadata_for_build_wheel = _orig.prepare_metadata_for_build_wheel
 build_editable = _orig.build_editable
-build_sdist = _orig.build_sdist
 get_requires_for_build_editable = _orig.get_requires_for_build_editable
 get_requires_for_build_sdist = _orig.get_requires_for_build_sdist
 
@@ -46,24 +50,66 @@ def get_requires_for_build_wheel(
     return packages
 
 
-def _bootstrap_build(temp_path: str, config_settings: dict[str, list[str] | str] | None = None) -> str:
+def _fetch_archive(kind: str, archive_dir: Path) -> Path:
+    """
+    Return the path to the ``kind`` archive listed in ``CMakeUrls.cmake``,
+    downloading it into ``archive_dir`` if it is not already there. The SHA256
+    is always verified.
+    """
     import hashlib
-    import platform
     import re
+    import urllib.request
+
+    cmake_urls = Path("CMakeUrls.cmake").read_text()
+    archive_url = re.findall(rf'set\({kind}_url\s+"(?P<data>.*)"\)$', cmake_urls, flags=re.MULTILINE)[0]
+    archive_sha256 = re.findall(rf'set\({kind}_sha256\s+"(?P<data>.*)"\)$', cmake_urls, flags=re.MULTILINE)[0]
+
+    archive_name = archive_url.rsplit("/", maxsplit=1)[1]
+    archive_path = archive_dir / archive_name
+    if not archive_path.exists():
+        archive_dir.mkdir(parents=True, exist_ok=True)
+        with urllib.request.urlopen(archive_url) as response:
+            archive_path.write_bytes(response.read())
+
+    sha256 = hashlib.sha256(archive_path.read_bytes()).hexdigest()
+    if archive_sha256.lower() != sha256.lower():
+        msg = f"Invalid sha256 for {archive_url!r}. Expected {archive_sha256!r}, got {sha256!r}"
+        raise ValueError(msg)
+
+    return archive_path
+
+
+def build_sdist(
+    sdist_directory: str,
+    config_settings: dict[str, list[str] | str] | None = None,
+) -> str:
+    archive_path = _fetch_archive("unix_source", _ARCHIVE_DIR)
+
+    settings: dict[str, list[str] | str] = dict(config_settings or {})
+    include = settings.get("sdist.include", [])
+    if isinstance(include, str):
+        include = include.split(";")
+    settings["sdist.include"] = [*include, archive_path.as_posix()]
+    return _orig.build_sdist(sdist_directory, settings)
+
+
+def _bootstrap_build(temp_path: str, config_settings: dict[str, list[str] | str] | None = None) -> str:
+    import platform
     import shutil
     import subprocess
     import tarfile
-    import urllib.request
     import zipfile
-    from pathlib import Path
 
     env = os.environ.copy()
     temp_path_ = Path(temp_path)
 
-    archive_dir = temp_path_
+    archive_dir = _ARCHIVE_DIR
     if config_settings:
-        archive_dir = Path(config_settings.get("cmake.define.CMakePythonDistributions_ARCHIVE_DOWNLOAD_DIR", archive_dir))
-        archive_dir.mkdir(parents=True, exist_ok=True)
+        archive_dir_setting = config_settings.get("cmake.define.CMakePythonDistributions_ARCHIVE_DOWNLOAD_DIR")
+        if isinstance(archive_dir_setting, list):
+            archive_dir_setting = archive_dir_setting[-1]
+        if archive_dir_setting:
+            archive_dir = Path(archive_dir_setting)
 
     if os.name == "posix":
         if "MAKE" not in env:
@@ -92,21 +138,8 @@ def _bootstrap_build(temp_path: str, config_settings: dict[str, list[str] | str]
             raise ValueError(msg)
         kind = kinds[machine]
 
-
-    cmake_urls = Path("CMakeUrls.cmake").read_text()
-    archive_url = re.findall(rf'set\({kind}_url\s+"(?P<data>.*)"\)$', cmake_urls, flags=re.MULTILINE)[0]
-    archive_sha256 = re.findall(rf'set\({kind}_sha256\s+"(?P<data>.*)"\)$', cmake_urls, flags=re.MULTILINE)[0]
-
-    archive_name = archive_url.rsplit("/", maxsplit=1)[1]
-    archive_path = archive_dir / archive_name
-    if not archive_path.exists():
-        with urllib.request.urlopen(archive_url) as response:
-            archive_path.write_bytes(response.read())
-
-    sha256 = hashlib.sha256(archive_path.read_bytes()).hexdigest()
-    if archive_sha256.lower() != sha256.lower():
-        msg = f"Invalid sha256 for {archive_url!r}. Expected {archive_sha256!r}, got {sha256!r}"
-        raise ValueError(msg)
+    archive_path = _fetch_archive(kind, archive_dir)
+    archive_name = archive_path.name
 
     if os.name == "posix":
         assert archive_name.endswith(".tar.gz")
@@ -121,6 +154,10 @@ def _bootstrap_build(temp_path: str, config_settings: dict[str, list[str] | str]
         prefix_path = temp_path_ / "cmake-install"
         cmake_path = prefix_path / "bin" / "cmake"
         bootstrap_args = [f"--prefix={prefix_path}", "--no-qt-gui", "--no-debugger", f"--parallel={parallel}", "--", "-DBUILD_TESTING=OFF", "-DBUILD_CursesDialog:BOOL=OFF"]
+        for name in ("OPENSSL_ROOT_DIR", "OPENSSL_USE_STATIC_LIBS"):
+            value = (config_settings or {}).get(f"cmake.define.{name}")
+            if value is not None:
+                bootstrap_args.append(f"-D{name}={value}")
         previous_cwd = Path().absolute()
         os.chdir(bootstrap_path.parent)
         try:

{cmake-4.4.3 → cmake-4.4.4}/docs/building.rst

@@ -43,9 +43,16 @@ wheels on PyPI are produced with `cibuildwheel <https://cibuildwheel.pypa.io>`_
 Source distribution (sdist)
 ---------------------------
 
-The source distribution contains only this project's sources; the CMake source
-or binary archive listed in ``CMakeUrls.cmake`` is downloaded when the wheel is
-built. The source distribution is generated using the following command::
+The source distribution contains this project's sources plus the CMake source
+tarball listed in ``CMakeUrls.cmake``, bundled as
+``archive-cache/cmake-<version>.tar.gz``. Building the sdist downloads that
+tarball, so it needs network access; building a wheel from the sdist with
+``BUILD_CMAKE_FROM_SOURCE=ON`` (the default on Linux) does not.
+
+``BUILD_CMAKE_FROM_SOURCE=OFF`` (the default on macOS and Windows) still
+downloads a prebuilt binary archive at wheel-build time.
+
+The source distribution is generated using the following command::
 
     python -m build --sdist
 
@@ -101,9 +108,10 @@ in two ways.
 Caching downloads
 ^^^^^^^^^^^^^^^^^
 
-To avoid the re-download of CMake sources and/or binary packages, passing the
-option ``-Ccmake.define.CMakePythonDistributions_ARCHIVE_DOWNLOAD_DIR=/path/to/cache``
-enables successive builds to re-use existing archives instead of re-downloading them.
+Archives are downloaded into ``archive-cache/`` in the source tree (gitignored)
+and re-used by later builds when their hash matches. To use a different
+location, pass
+``-Ccmake.define.CMakePythonDistributions_ARCHIVE_DOWNLOAD_DIR=/path/to/cache``.
 
 Re-using the build tree
 ^^^^^^^^^^^^^^^^^^^^^^^

{cmake-4.4.3 → cmake-4.4.4}/docs/index.rst

@@ -10,7 +10,7 @@ The suite of CMake tools were created by Kitware in response to the need
 for a powerful, cross-platform build environment for open-source projects
 such as `ITK <https://itk.org>`_ and `VTK <https://vtk.org>`_.
 
-The CMake python wheels provide `CMake 4.4.3 <https://cmake.org/cmake/help/v4.4/index.html>`_.
+The CMake python wheels provide `CMake 4.4.4 <https://cmake.org/cmake/help/v4.4/index.html>`_.
 
 .. toctree::
    :maxdepth: 2

{cmake-4.4.3 → cmake-4.4.4}/docs/make_a_release.rst

@@ -44,8 +44,8 @@ Prerequisites
 
   .. code:: console
 
-    $ git tag --sign -m 'cmake-python-distributions 4.4.3' 4.4.3 main
-    $ git push origin 4.4.3
+    $ git tag --sign -m 'cmake-python-distributions 4.4.4' 4.4.4 main
+    $ git push origin 4.4.4
 
   .. warning::
 

{cmake-4.4.3 → cmake-4.4.4}/docs/update_cmake_version.rst

@@ -27,8 +27,8 @@ Classic procedure
    inline dependency metadata, so ``uv run`` handles the ``requests``
    dependency). For example::
 
-    $ uv run scripts/update_cmake_version.py 4.4.3
-    Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.4.3'
+    $ uv run scripts/update_cmake_version.py 4.4.4
+    Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.4.4'
     [...]
 
    It updates ``CMakeUrls.cmake``, ``pyproject.toml``, ``README.rst``,

{cmake-4.4.3 → cmake-4.4.4}/pyproject.toml

@@ -5,7 +5,7 @@ backend-path = ["_build_backend"]
 
 [project]
 name = "cmake"
-version = "4.4.3"
+version = "4.4.4"
 description = "CMake is an open-source, cross-platform family of tools designed to build, test and package software"
 keywords = ["CMake", "build", "c++", "fortran", "cross-platform", "cross-compilation"]
 readme = "README.rst"

{cmake-4.4.3 → cmake-4.4.4}/scripts/manylinux-build-and-install-openssl.sh

@@ -10,8 +10,8 @@ set -o pipefail
 MY_DIR=$(dirname "${BASH_SOURCE[0]}")
 source $MY_DIR/utils.sh
 
-OPENSSL_ROOT=openssl-3.5.8
-OPENSSL_HASH=a8f84a39918ec6415ce765d9b429d313ba97b8143169c172e734b9514464f5b2
+OPENSSL_ROOT=openssl-3.5.9
+OPENSSL_HASH=603f5602e2eef00d77fbd429d34dcd5822bb301757a1bc9cdb24c670f1eb859a
 
 cd /tmp
 

{cmake-4.4.3 → cmake-4.4.4}/scripts/update_cmake_version.py

@@ -55,7 +55,6 @@ def get_cmake_archive_urls_and_sha256s(version: str, verbose: bool=False) -> dic
 
         expected_files = {
             f"cmake-{version}.tar.gz": "unix_source",
-            f"cmake-{version}.zip": "win_source",
             f"cmake-{version}-linux-x86_64.tar.gz": "linux64_binary",
             f"cmake-{version}-macos10.10-universal.tar.gz": "macos10_10_binary",
             f"cmake-{version}-windows-i386.zip": "win32_binary",
@@ -121,9 +120,6 @@ def generate_cmake_variables(urls_and_sha256s: Mapping[str, tuple[str, str]]) ->
       set(unix_source_url          "{unix_source_url}")
       set(unix_source_sha256       "{unix_source_sha256}")
 
-      set(windows_source_url       "{win_source_url}")
-      set(windows_source_sha256    "{win_source_sha256}")
-
       #-----------------------------------------------------------------------------
       # CMake binaries
 

{cmake-4.4.3 → cmake-4.4.4}/tests/test_cmake.py

@@ -64,7 +64,7 @@ def _get_scripts():
 
 @all_tools
 def test_cmake_script(tool):
-    expected_version = "4.4.3"
+    expected_version = "4.4.4"
     scripts = [script for script in _get_scripts() if script.stem == tool]
     assert len(scripts) == 1
     output = subprocess.check_output([str(scripts[0]), "--version"]).decode("ascii")
@@ -72,6 +72,6 @@ def test_cmake_script(tool):
 
 
 def test_cmake_main():
-    expected_version = "4.4.3"
+    expected_version = "4.4.4"
     output = subprocess.run([sys.executable, "-m", "cmake", "--version"], text=True, capture_output=True, check=False).stdout
     assert output.splitlines()[0] == f"cmake version {expected_version}"

cmake-4.4.3/CMakeUrls.cmake

@@ -1,29 +0,0 @@
-
-#-----------------------------------------------------------------------------
-# CMake sources
-set(unix_source_url          "https://github.com/Kitware/CMake/releases/download/v4.4.3/cmake-4.4.3.tar.gz")
-set(unix_source_sha256       "c46400618b4f1f2b43507f24fb22f3ae830c3416cf23b776e16e1d413aa892f0")
-
-set(windows_source_url       "https://github.com/Kitware/CMake/releases/download/v4.4.3/cmake-4.4.3.zip")
-set(windows_source_sha256    "bc2cc41a1097e5e8b58902209dba880d0dc3361779cb7600f5e8a92eedb45e01")
-
-#-----------------------------------------------------------------------------
-# CMake binaries
-
-set(linux32_binary_url       "NA")  # Linux 32-bit binaries not available
-set(linux32_binary_sha256    "NA")
-
-set(linux64_binary_url       "https://github.com/Kitware/CMake/releases/download/v4.4.3/cmake-4.4.3-linux-x86_64.tar.gz")
-set(linux64_binary_sha256    "d6c83076c575bc00b823522ac974bda66d0af05d6ddc30e739c12385cf32c6cc")
-
-set(macos10_10_binary_url    "https://github.com/Kitware/CMake/releases/download/v4.4.3/cmake-4.4.3-macos10.10-universal.tar.gz")
-set(macos10_10_binary_sha256 "217a8c7bef7b70e8f9dc3748e625b92b19732b3eb26f6d99f23ef3f2768a8665")
-
-set(win32_binary_url         "https://github.com/Kitware/CMake/releases/download/v4.4.3/cmake-4.4.3-windows-i386.zip")
-set(win32_binary_sha256      "018024d05e2fc77d386046da87f90345f9beea21e35c5c8ab02fd15421b7da18")
-
-set(win64_binary_url         "https://github.com/Kitware/CMake/releases/download/v4.4.3/cmake-4.4.3-windows-x86_64.zip")
-set(win64_binary_sha256      "4d52ebab7193a698651639ed80d8d04fd903358843572cf44c7fd234cb7c26ab")
-
-set(winarm64_binary_url      "https://github.com/Kitware/CMake/releases/download/v4.4.3/cmake-4.4.3-windows-arm64.zip")
-set(winarm64_binary_sha256   "7b410ddd00e24c7250eec7452da2348a4a70437aa87e9cda0a20d6a85662fcff")