Skip to content

Commit

Permalink
update to cmake 3.29.6 (#509)
Browse files Browse the repository at this point in the history
* chore: use uv if available in noxfile

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

* Update to CMake 3.29.6

---------

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
  • Loading branch information
henryiii authored Jun 20, 2024
1 parent 0ba10fc commit 238924b
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 25 deletions.
28 changes: 14 additions & 14 deletions CMakeUrls.cmake
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@

#-----------------------------------------------------------------------------
# CMake sources
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.29.5/cmake-3.29.5.tar.gz")
set(unix_source_sha256 "dd63da7d763c0db455ca232f2c443f5234fe0b11f8bd6958a81d29cc987dfd6e")
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6.tar.gz")
set(unix_source_sha256 "1391313003b83d48e2ab115a8b525a557f78d8c1544618b48d1d90184a10f0af")

set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.29.5/cmake-3.29.5.zip")
set(windows_source_sha256 "aa6e2e75926e3e82d881adfad4581f00e0d646c5e873a935bf425c4506a54fef")
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6.zip")
set(windows_source_sha256 "79e2fc075b2aa1d93bea55b606a6a053c77c964d30319ba972046bf6cd327d11")

#-----------------------------------------------------------------------------
# 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/v3.29.5/cmake-3.29.5-linux-x86_64.tar.gz")
set(linux64_binary_sha256 "92629f95e15e7c2e88726c57a984ffdc5cf248e354f7ab791bc86d2ad513903e")
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-linux-x86_64.tar.gz")
set(linux64_binary_sha256 "28fef61e64840b784da6db35218fd3ae179ff8bf0be1c8a9d075d6185a0e4fdc")

set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.5/cmake-3.29.5-macos10.10-universal.tar.gz")
set(macos10_10_binary_sha256 "a110d173ab839854fc0b19b9f29f213c1112106e2858c1a1fe7973d4bb13a536")
set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-macos10.10-universal.tar.gz")
set(macos10_10_binary_sha256 "a65f9e66c63bb79f3b6f00e4b67367b6f6c40030ee41cf06580818a74a84b3e9")

set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.5/cmake-3.29.5-windows-i386.zip")
set(win32_binary_sha256 "7587b1aaab131ca6586cb241bbf1d29a4e5e322063788a8ea260cc7f492a46bd")
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-windows-i386.zip")
set(win32_binary_sha256 "aca4abb4ad7eb7d97647a572132735af2bd35687826e96f7d23dd7f4d2d7d4a9")

set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.5/cmake-3.29.5-windows-x86_64.zip")
set(win64_binary_sha256 "f85db8361cb7eb11ceb6b2f1ee42bec7234bb8d9e487ea78c00de64771768d92")
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-windows-x86_64.zip")
set(win64_binary_sha256 "5c648eac06c33477e510bae14ce1f969e9abb38992b71f245633b182fccb474d")

set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.5/cmake-3.29.5-windows-arm64.zip")
set(winarm64_binary_sha256 "9c67d16560125ebf1278ef1b3072914a60bff780522b28c0096f364f775a8e55")
set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-windows-arm64.zip")
set(winarm64_binary_sha256 "8f0df498d8b1a076fc9305dde5a06427262a0476e89d4c670a49147b0bc30761")
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 3.29.5 <https://cmake.org/cmake/help/v3.29/index.html>`_.
The CMake python wheels provide `CMake 3.29.6 <https://cmake.org/cmake/help/v3.29/index.html>`_.

Latest Release
--------------
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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 3.29.5 <https://cmake.org/cmake/help/v3.29/index.html>`_.
The CMake python wheels provide `CMake 3.29.6 <https://cmake.org/cmake/help/v3.29/index.html>`_.

.. toctree::
:maxdepth: 2
Expand Down
12 changes: 6 additions & 6 deletions docs/update_cmake_version.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ Classic procedure:
2. Execute `scripts/update_cmake_version.py` command line tool with the desired
``X.Y.Z`` CMake version available for download. For example::

$ release=3.29.5
$ release=3.29.6
$ ./scripts/update_cmake_version.py $release
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.29.5'
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.29.6'
[...]
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.29.5' - done
Updating 'CMakeUrls.cmake' with CMake version 3.29.5
Updating 'CMakeUrls.cmake' with CMake version 3.29.5 - done
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.29.6' - done
Updating 'CMakeUrls.cmake' with CMake version 3.29.6
Updating 'CMakeUrls.cmake' with CMake version 3.29.6 - done
Updating docs/index.rst
Updating docs/index.rst - done
Updating README.rst
Expand All @@ -46,7 +46,7 @@ Classic procedure:
3. Create a topic named `update-to-cmake-X.Y.Z` and commit the changes.
For example::

release=3.29.5
release=3.29.6
git switch -c update-to-cmake-$release
git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_cmake.py docs/update_cmake_version.rst
git commit -m "Update to CMake $release"
Expand Down
2 changes: 2 additions & 0 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

import nox

nox.needs_version = ">=2024.3.2"
nox.options.default_venv_backend = "uv|virtualenv"
nox.options.sessions = ["lint", "build", "tests"]

BUILD_ENV = {
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"

[project]
name = "cmake"
version = "3.29.5.1"
version = "3.29.6"
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"
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ def _get_scripts():

@all_tools
def test_cmake_script(tool):
expected_version = "3.29.5"
expected_version = "3.29.6"
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")
assert output.splitlines()[0] == f"{tool} version {expected_version}"


def test_cmake_main():
expected_version = "3.29.5"
expected_version = "3.29.6"
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}"

0 comments on commit 238924b

Please sign in to comment.