From f1430ecd07fad9370dbecd226180a9bc5e0d69a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 21:50:50 -0500 Subject: [PATCH 001/112] chore(deps): bump cmake from 3.24.3 to 3.25.0 (#317) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.24.3 to 3.25.0. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.24.3...3.25.0) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index 0f2e50971..4312037de 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.24.3 +cmake==3.25.0 ninja==1.11.1 From 6c85e6605db439f6ce627c3217533a281ec96aeb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Dec 2022 11:51:10 +0100 Subject: [PATCH 002/112] chore(deps): bump pypa/gh-action-pypi-publish from 1.5.1 to 1.5.2 (#319) Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.1 to 1.5.2. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.5.1...v1.5.2) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3954c7648..52d787f44 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,6 +221,6 @@ jobs: path: dist - name: Upload to PyPI - uses: pypa/gh-action-pypi-publish@v1.5.1 + uses: pypa/gh-action-pypi-publish@v1.5.2 with: password: ${{ secrets.PYPI_RELEASE_PASSWORD }} From c4bde6c51fb8261bbd698832a54e40fdffad1e48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 08:39:12 +0100 Subject: [PATCH 003/112] chore(deps): bump pypa/gh-action-pypi-publish from 1.5.2 to 1.6.1 (#320) Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.2 to 1.6.1. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.5.2...v1.6.1) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52d787f44..b155cc7ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,6 +221,6 @@ jobs: path: dist - name: Upload to PyPI - uses: pypa/gh-action-pypi-publish@v1.5.2 + uses: pypa/gh-action-pypi-publish@v1.6.1 with: password: ${{ secrets.PYPI_RELEASE_PASSWORD }} From ac3415f98d9a4881a889125de48e87b02fe9634d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 08:21:10 +0100 Subject: [PATCH 004/112] chore(deps): bump pypa/gh-action-pypi-publish from 1.6.1 to 1.6.4 (#323) Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.6.1 to 1.6.4. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.6.1...v1.6.4) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b155cc7ba..cd391f40e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,6 +221,6 @@ jobs: path: dist - name: Upload to PyPI - uses: pypa/gh-action-pypi-publish@v1.6.1 + uses: pypa/gh-action-pypi-publish@v1.6.4 with: password: ${{ secrets.PYPI_RELEASE_PASSWORD }} From bd13db16da74ade9e84cd79a3f35dec89f62fc4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 15:13:55 -0500 Subject: [PATCH 005/112] chore(deps): bump pypa/cibuildwheel from 2.11.2 to 2.11.3 (#321) * chore(deps): bump pypa/cibuildwheel from 2.11.2 to 2.11.3 Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.11.2 to 2.11.3. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.11.2...v2.11.3) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * fix: limit wheel * style: pre-commit fixes * Update requirements-test.txt Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- requirements-repair.txt | 1 + requirements-test.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd391f40e..4cca7d473 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.11.2 + uses: pypa/cibuildwheel@v2.11.3 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -132,7 +132,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.11.2 + uses: pypa/cibuildwheel@v2.11.3 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" diff --git a/requirements-repair.txt b/requirements-repair.txt index 6a357b865..489b6e9f3 100644 --- a/requirements-repair.txt +++ b/requirements-repair.txt @@ -1 +1,2 @@ +wheel<0.38 wheeltools @ git+https://github.com/jcfr/wheeltools.git@wheeltools-2018-10-28-a2f174d0e#egg=wheeltools diff --git a/requirements-test.txt b/requirements-test.txt index c6b5a67ea..12133ee8a 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -9,4 +9,4 @@ pytest-virtualenv>=1.7.0 scikit-build>=0.10.0 setuptools>=28.0.0 virtualenv>=15.0.3 -wheel +wheel<0.38 From d21893f022da0e023e9aec68cbe2a12a5ab6f595 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 21:08:59 +0000 Subject: [PATCH 006/112] chore(deps): update pre-commit hooks (#322) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.3.0 → v4.4.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.3.0...v4.4.0) - [github.com/PyCQA/isort: 5.10.1 → 5.11.1](https://github.com/PyCQA/isort/compare/5.10.1...5.11.1) - [github.com/asottile/pyupgrade: v2.38.2 → v3.3.1](https://github.com/asottile/pyupgrade/compare/v2.38.2...v3.3.1) - [github.com/PyCQA/flake8: 5.0.4 → 6.0.0](https://github.com/PyCQA/flake8/compare/5.0.4...6.0.0) Signed-off-by: Henry Schreiner Signed-off-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f5cf2e36e..75bf02a76 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ ci: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/PyCQA/isort - rev: 5.10.1 + rev: 5.11.1 hooks: - id: isort @@ -29,7 +29,7 @@ repos: - id: pyupgrade - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 additional_dependencies: [flake8-bugbear] From 6674721c1866485093cddb0da5223e7ae3ac3e12 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 20 Dec 2022 10:03:33 -0500 Subject: [PATCH 007/112] feat: cross-compile to Windows ARM (#326) * feat: cross-compile to Windows ARM * fix: add support for winarm download Signed-off-by: Henry Schreiner Signed-off-by: Henry Schreiner --- .github/workflows/build.yml | 4 ++++ CMakeLists.txt | 8 ++++++-- CMakeUrls.cmake | 3 +++ scripts/update_cmake_version.py | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cca7d473..92479d2e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,6 +84,10 @@ jobs: arch: "AMD64" build: "" use_qemu: false + - os: windows-2022 + arch: "ARM64" + build: "" + use_qemu: false - os: windows-2019 arch: "x86" build: "" diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a1ace243..7a3a1347e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,8 +78,12 @@ if(CMakePythonDistributions_SUPERBUILD) endif() if(WIN32) set(binary_archive "win32_binary") - if((CMAKE_SIZEOF_VOID_P EQUAL 8) AND NOT(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64")) - set(binary_archive "win64_binary") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64" OR "$ENV{SETUPTOOLS_EXT_SUFFIX}" MATCHES arm64) + set(binary_achive "winarm64_binary") + else() + set(binary_archive "win64_binary") + endif() endif() endif() check_archive_var("${binary_archive}") diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 4b77b35ab..2e2544be0 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -24,3 +24,6 @@ set(win32_binary_sha256 "ddd115257a19ff3dd18fc63f32a00ae742f8b62d2e39bc3546 set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-windows-x86_64.zip") set(win64_binary_sha256 "b46030c10cab1170355952f9ac59f7e6dabc248070fc53f15dff11d4ed2910f8") + +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-windows-arm64.zip") +set(winarm64_binary_sha256 "350e4a6361329cb6245b59a5eeb59ce96e2980ce5d149cd5384f6009eec04c9f") diff --git a/scripts/update_cmake_version.py b/scripts/update_cmake_version.py index 6ff261d06..eaaf924ab 100755 --- a/scripts/update_cmake_version.py +++ b/scripts/update_cmake_version.py @@ -54,6 +54,7 @@ def get_cmake_archive_urls_and_sha256s(version, verbose=False): "cmake-%s-macos10.10-universal.tar.gz" % version: "macos10_10_binary", "cmake-%s-windows-i386.zip" % version: "win32_binary", "cmake-%s-windows-x86_64.zip" % version: "win64_binary", + "cmake-%s-windows-arm64.zip" % version: "winarm64_binary", } # Get SHA256s for each asset @@ -137,6 +138,9 @@ def generate_cmake_variables(urls_and_sha256s): set(win64_binary_url "{win64_binary_url}") set(win64_binary_sha256 "{win64_binary_sha256}") + + set(winarm64_binary_url "{winarm64_binary_url}") + set(winarm64_binary_sha256 "{winarm64_binary_sha256}") """ ).format(**template_inputs) From 92a5d670881145939fee202c860bd8ec17be7c2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Dec 2022 10:21:48 +0100 Subject: [PATCH 008/112] chore(deps): bump pypa/cibuildwheel from 2.11.3 to 2.11.4 (#328) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.11.3 to 2.11.4. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.11.3...v2.11.4) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92479d2e7..2c4de0b36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.11.3 + uses: pypa/cibuildwheel@v2.11.4 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.11.3 + uses: pypa/cibuildwheel@v2.11.4 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From 8fc6197464d59d8421e53a228d925eef330620e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 07:04:42 +0100 Subject: [PATCH 009/112] chore(deps): bump pypa/cibuildwheel from 2.11.4 to 2.12.0 (#330) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.11.4 to 2.12.0. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.11.4...v2.12.0) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c4de0b36..46992fc1a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.11.4 + uses: pypa/cibuildwheel@v2.12.0 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.11.4 + uses: pypa/cibuildwheel@v2.12.0 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From 561861c2a865fdaba4864c876ba17193a0d6ef7a Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 21 Jan 2023 12:01:49 -0500 Subject: [PATCH 010/112] update to cmake 3.25.2 (#331) * Update to CMake 3.25.1 * Update to CMake 3.25.2 --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 2e2544be0..6044ae767 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0.tar.gz") -set(unix_source_sha256 "306463f541555da0942e6f5a0736560f70c487178b9d94a5ae7f34d0538cdd48") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2.tar.gz") +set(unix_source_sha256 "c026f22cb931dd532f648f087d587f07a1843c6e66a3dfca4fb0ea21944ed33c") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0.zip") -set(windows_source_sha256 "45f1668b543ea2022387321930ad22cbcb5e6cef5e7e786f68f2ffc7fd2d66b5") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2.zip") +set(windows_source_sha256 "2781c207c3c64ea8a829b8fc0229374fc874b68fb1264cff99055e5bce79bbae") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "45f1668b543ea2022387321930ad22cbcb5e6cef5e7e786f68 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.25.0/cmake-3.25.0-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "ac634d6f0a81d7089adc7be5acff66a6bee3b08615f9a947858ce92a9ef59c8b") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "783da74f132fd1fea91b8236d267efa4df5b91c5eec1dea0a87f0cf233748d99") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "d0e0849e8198f4637c0c863704d214af8eeabfaaa3a4f72725f3f8c10338bf92") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "a988e2a69c1d105987f12782ee0fa80d6be941b3e1a68b4bd6a661f0fdb56d75") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-windows-i386.zip") -set(win32_binary_sha256 "ddd115257a19ff3dd18fc63f32a00ae742f8b62d2e39bc354629903512f99783") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-windows-i386.zip") +set(win32_binary_sha256 "833abaa21bb673491def058cc38834fbd606d525ab271f37a3b8a3aed586c4a0") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-windows-x86_64.zip") -set(win64_binary_sha256 "b46030c10cab1170355952f9ac59f7e6dabc248070fc53f15dff11d4ed2910f8") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-windows-x86_64.zip") +set(win64_binary_sha256 "0db9d3cebf894f64751141253fb9d9e310f325e2e03044f61249a359d6adf301") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-windows-arm64.zip") -set(winarm64_binary_sha256 "350e4a6361329cb6245b59a5eeb59ce96e2980ce5d149cd5384f6009eec04c9f") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-windows-arm64.zip") +set(winarm64_binary_sha256 "c54fb253ae184b391d5366b958c38b282d5f9b6a5854643c28e6887f5fd92590") diff --git a/README.rst b/README.rst index dd048ee5f..a7040fef8 100644 --- a/README.rst +++ b/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 3.25.0 `_. +The CMake python wheels provide `CMake 3.25.2 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 95613876f..c94f4526a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.25.0 `_. +The CMake python wheels provide `CMake 3.25.2 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 75dfe2f2f..2e23ccfb6 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.25.0 + $ release=3.25.2 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.0' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.2' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.0' - done - Updating 'CMakeUrls.cmake' with CMake version 3.25.0 - Updating 'CMakeUrls.cmake' with CMake version 3.25.0 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.2' - done + Updating 'CMakeUrls.cmake' with CMake version 3.25.2 + Updating 'CMakeUrls.cmake' with CMake version 3.25.2 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.25.0 + release=3.25.2 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index c279223c4..b698fe9e8 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.25.0" + expected_version = "3.25.2" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From bf25ec052b772fb726b053b5cdfc439b9e06d3d2 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 31 Jan 2023 11:36:42 -0500 Subject: [PATCH 011/112] chore: fix issue with isort and latest poetry-core --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 75bf02a76..a07530eca 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/PyCQA/isort - rev: 5.11.1 + rev: 5.12.0 hooks: - id: isort From 140bf79d11d0a8151476aa15e03feb40f921e65d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 10:12:44 -0500 Subject: [PATCH 012/112] chore(deps): update pre-commit hooks (#329) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/PyCQA/isort: 5.11.1 → 5.12.0](https://github.com/PyCQA/isort/compare/5.11.1...5.12.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> From 39ae35c01ea06271b3d7bcdc8184f3eb8efd541a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 17:09:05 -0500 Subject: [PATCH 013/112] chore(deps): bump cmake from 3.25.0 to 3.25.2 (#332) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.25.0 to 3.25.2. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.25.0...3.25.2) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index 4312037de..4ae9bdca0 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.25.0 +cmake==3.25.2 ninja==1.11.1 From 14658dae43b8ad990c0854d5da36104c0f084be6 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 11 Mar 2023 02:47:43 -0800 Subject: [PATCH 014/112] chore: switch to ruff (#334) Signed-off-by: Henry Schreiner --- .pre-commit-config.yaml | 18 ++------ docs/conf.py | 1 - pyproject.toml | 43 +++++++++++++++++++- scripts/convert_to_generic_platform_wheel.py | 9 ++-- scripts/repair_wheel.py | 12 +++--- scripts/update_cmake_version.py | 4 +- setup.cfg | 11 ----- setup.py | 2 +- src/cmake/__init__.pyi | 2 +- tests/test_cmake.py | 2 +- 10 files changed, 58 insertions(+), 46 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a07530eca..d3193b468 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,18 +18,8 @@ repos: - id: trailing-whitespace - id: fix-encoding-pragma -- repo: https://github.com/PyCQA/isort - rev: 5.12.0 +- repo: https://github.com/charliermarsh/ruff-pre-commit + rev: "v0.0.253" hooks: - - id: isort - -- repo: https://github.com/asottile/pyupgrade - rev: v2.38.2 - hooks: - - id: pyupgrade - -- repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 - hooks: - - id: flake8 - additional_dependencies: [flake8-bugbear] + - id: ruff + args: [--fix, --show-fixes] diff --git a/docs/conf.py b/docs/conf.py index 2c42ae9e8..d201f63d8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # CMake Python Distributions documentation build configuration file, created by diff --git a/pyproject.toml b/pyproject.toml index ad0717088..fb20c9391 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,5 +49,44 @@ environment = { SKBUILD_CONFIGURE_OPTIONS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ [tool.cibuildwheel.macos.environment] MACOSX_DEPLOYMENT_TARGET = "10.10" -[tool.isort] -profile = "black" + +[tool.ruff] +select = [ + "E", "F", "W", # flake8 + "B", # flake8-bugbear + "I", # isort + "ARG", # flake8-unused-arguments + "C4", # flake8-comprehensions + "ICN", # flake8-import-conventions + "ISC", # flake8-implicit-str-concat + "G", # flake8-logging-format + "PGH", # pygrep-hooks + "PIE", # flake8-pie + "PL", # pylint + "PT", # flake8-pytest-style + "RET", # flake8-return + "RUF", # Ruff-specific + "SIM", # flake8-simplify + "EXE", # flake8-executable + "NPY", # NumPy specific rules + "PD", # pandas-vet +] +extend-ignore = [ + "PLR", # Design related pylint codes + "E501", # Line too long + "RUF005", # Python 3 needed + "B904", # Python 3 needed + "SIM105", # Python 3 needed +] +src = ["src"] +unfixable = [ + "T20", # Removes print statements + "F841", # Removes unused variables +] +exclude = ["versioneer.py", "src/cmake/_version.py"] +flake8-unused-arguments.ignore-variadic-names = true + +[tool.ruff.per-file-ignores] +"docs/conf.py" = ["E402"] +"*.pyi" = ["ARG001"] +"noxfile.py" = ["PLW0603"] # Could be fixed if Python 2 dropped diff --git a/scripts/convert_to_generic_platform_wheel.py b/scripts/convert_to_generic_platform_wheel.py index 0a0598d5c..efc64f564 100644 --- a/scripts/convert_to_generic_platform_wheel.py +++ b/scripts/convert_to_generic_platform_wheel.py @@ -4,9 +4,8 @@ import os import sys from itertools import product -from os.path import abspath, basename, dirname, isfile +from os.path import abspath, basename, dirname, isfile, splitext from os.path import join as pjoin -from os.path import splitext try: from wheel.install import WheelFile @@ -78,7 +77,7 @@ def _convert_to_generic_platform_wheel(wheel_ctx, py2_py3, additional_platforms) platform_tags = fparts['plat'].split('.') logger.debug('Previous platform tags: %s', ', '.join(platform_tags)) if additional_platforms: - platform_tags = list(sorted(set(platform_tags + [p for p in additional_platforms]))) + platform_tags = sorted(set(platform_tags + list(additional_platforms))) fparts['plat'] = '.'.join(platform_tags) logger.debug('New platform tags ....: %s', ', '.join(platform_tags)) else: @@ -98,7 +97,7 @@ def _convert_to_generic_platform_wheel(wheel_ctx, py2_py3, additional_platforms) if py2_py3: if len({"py2", "py3"} & set(pyver_tags)) == 0: raise ValueError("pyver_tags does not contain py2 nor py3") - pyver_tags = list(sorted(set(pyver_tags + ["py2", "py3"]))) + pyver_tags = sorted(set(pyver_tags + ["py2", "py3"])) if pyver_tags != original_pyver_tags: logger.debug('New pyver tags ....: %s', ', '.join(pyver_tags)) fparts['pyver'] = '.'.join(pyver_tags) @@ -160,7 +159,7 @@ def convert_to_generic_platform_wheel(wheel_path, out_dir='./dist/', remove_orig ctx.out_wheel = _convert_to_generic_platform_wheel(ctx, py2_py3, additional_platforms) if remove_original: - logger.info('Removed original wheel %s' % wheel_path) + logger.info('Removed original wheel %s', wheel_path) os.remove(wheel_path) diff --git a/scripts/repair_wheel.py b/scripts/repair_wheel.py index 703a0e8f6..cd5149834 100755 --- a/scripts/repair_wheel.py +++ b/scripts/repair_wheel.py @@ -45,13 +45,11 @@ def main(): if os_ == "linux": subprocess.run(["auditwheel", "repair", "-w", str(tmpdir), str(file)], check=True, stdout=subprocess.PIPE) elif os_ == "macos": - # delocate does not pass for now: https://github.com/matthew-brett/delocate/issues/105 - # subprocess.run( - # ["delocate-wheel", "--require-archs", "arm64,x86_64", "-w", str(tmpdir), str(file)], - # check=True, - # stdout=subprocess.PIPE, - # ) - shutil.copyfile(file, tmpdir / file.name) + subprocess.run( + ["delocate-wheel", "--require-archs", "arm64,x86_64", "-w", str(tmpdir), str(file)], + check=True, + stdout=subprocess.PIPE, + ) elif os_ == "windows": # no specific tool, just copy shutil.copyfile(file, tmpdir / file.name) diff --git a/scripts/update_cmake_version.py b/scripts/update_cmake_version.py index eaaf924ab..4f1e76c4e 100755 --- a/scripts/update_cmake_version.py +++ b/scripts/update_cmake_version.py @@ -111,7 +111,7 @@ def generate_cmake_variables(urls_and_sha256s): template_inputs["%s_url" % var_prefix] = urls_and_sha256s_values[0] template_inputs["%s_sha256" % var_prefix] = urls_and_sha256s_values[1] - cmake_variables = textwrap.dedent( + return textwrap.dedent( """ #----------------------------------------------------------------------------- # CMake sources @@ -144,8 +144,6 @@ def generate_cmake_variables(urls_and_sha256s): """ ).format(**template_inputs) - return cmake_variables - def update_cmake_urls_script(version): content = generate_cmake_variables(get_cmake_archive_urls_and_sha256s(version)) diff --git a/setup.cfg b/setup.cfg index 9c05375ed..6376f3192 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,14 +1,3 @@ -[flake8] -max-line-length: 130 -# Whether to display the pep8 instructions on failure (can be quite verbose) -show-pep8: False -# Whether to show source code for each failure -show-source: True -# Maximum cyclomatic complexity allowed -max-complexity: 14 -format: pylint -exclude: .git,.idea,.eggs,__pycache__,.tox,docs/conf.py,_skbuild,CMake-src,versioneer.py,_version.py,.venv,.nox - [tool:pytest] testpaths = tests addopts = -v --cov --cov-report xml diff --git a/setup.py b/setup.py index 706e0a9eb..d0434f8e2 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def parse_requirements(filename): test_requirements = parse_requirements('requirements-test.txt') -try: # noqa: C901 +try: setup( name='cmake', diff --git a/src/cmake/__init__.pyi b/src/cmake/__init__.pyi index 4aba0de7b..7bb53539f 100644 --- a/src/cmake/__init__.pyi +++ b/src/cmake/__init__.pyi @@ -1,4 +1,4 @@ -from typing import NoReturn +from typing import Iterator, NoReturn __version__: tuple[int, int, int] | tuple[int, int, int, str, str] diff --git a/tests/test_cmake.py b/tests/test_cmake.py index 4c71f1a36..db4a0e5b9 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -13,7 +13,7 @@ def _run(program, args): args = ["%s.py" % program] + args with push_argv(args), pytest.raises(SystemExit) as excinfo: func() - assert 0 == excinfo.value.code + assert excinfo.value.code == 0 def test_cmake_module(): From b80eeb2c6a762c00c4e516f3455247e5a8480d8b Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 11 Mar 2023 18:17:45 +0100 Subject: [PATCH 015/112] Update to OpenSSL 3.0.8 (#336) --- scripts/manylinux-build-and-install-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/manylinux-build-and-install-openssl.sh b/scripts/manylinux-build-and-install-openssl.sh index f66405ec4..f6e44890e 100755 --- a/scripts/manylinux-build-and-install-openssl.sh +++ b/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.0.7 -OPENSSL_HASH=83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e +OPENSSL_ROOT=openssl-3.0.8 +OPENSSL_HASH=6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e cd /tmp From 4c0bb8d651592703e2e43c38f75d582f33114317 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 08:30:50 +0100 Subject: [PATCH 016/112] chore(deps): bump pypa/cibuildwheel from 2.12.0 to 2.12.1 (#339) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.12.0 to 2.12.1. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.12.0...v2.12.1) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46992fc1a..e206223bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.12.0 + uses: pypa/cibuildwheel@v2.12.1 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.12.0 + uses: pypa/cibuildwheel@v2.12.1 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From 3f2d160b9b4ba59c874a77281eed7af0e345bf76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 08:16:29 +0100 Subject: [PATCH 017/112] chore(deps): bump pypa/gh-action-pypi-publish from 1.6.4 to 1.7.1 (#338) Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.6.4 to 1.7.1. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.6.4...v1.7.1) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e206223bc..3a21de8fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -225,6 +225,6 @@ jobs: path: dist - name: Upload to PyPI - uses: pypa/gh-action-pypi-publish@v1.6.4 + uses: pypa/gh-action-pypi-publish@v1.7.1 with: password: ${{ secrets.PYPI_RELEASE_PASSWORD }} From 7aac14be29012562ca867f49e2c364e2dd62e86a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 09:04:06 +0100 Subject: [PATCH 018/112] chore(deps): update pre-commit hooks (#333) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.253 → v0.0.255](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.253...v0.0.255) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d3193b468..7df23f62f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.253" + rev: "v0.0.255" hooks: - id: ruff args: [--fix, --show-fixes] From 7e6cb6c74f06f131860551e84e4cfeeae02e18e3 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Tue, 14 Mar 2023 20:28:35 +0100 Subject: [PATCH 019/112] Update to CMake 3.25.3 (#337) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 6044ae767..08532643f 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2.tar.gz") -set(unix_source_sha256 "c026f22cb931dd532f648f087d587f07a1843c6e66a3dfca4fb0ea21944ed33c") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3.tar.gz") +set(unix_source_sha256 "cc995701d590ca6debc4245e9989939099ca52827dd46b5d3592f093afe1901c") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2.zip") -set(windows_source_sha256 "2781c207c3c64ea8a829b8fc0229374fc874b68fb1264cff99055e5bce79bbae") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3.zip") +set(windows_source_sha256 "a1943dd0dfc5fbd7ef10e507051bacc5f76ef6d8f1a188e6e7ab3a57df220eba") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "2781c207c3c64ea8a829b8fc0229374fc874b68fb1264cff99 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.25.2/cmake-3.25.2-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "783da74f132fd1fea91b8236d267efa4df5b91c5eec1dea0a87f0cf233748d99") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "d4d2ba83301b215857d3b6590cd4434a414fa151c5807693abe587bd6c03581e") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "a988e2a69c1d105987f12782ee0fa80d6be941b3e1a68b4bd6a661f0fdb56d75") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "ea37a83cd329224c38a1938d2cf7b2656ad971dea9cf759238652746213661f8") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-windows-i386.zip") -set(win32_binary_sha256 "833abaa21bb673491def058cc38834fbd606d525ab271f37a3b8a3aed586c4a0") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-windows-i386.zip") +set(win32_binary_sha256 "2e66cf7cbd35f392f6b9406910c68f4adfca1de9ab7a2fc4cec658c5c5cd9190") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-windows-x86_64.zip") -set(win64_binary_sha256 "0db9d3cebf894f64751141253fb9d9e310f325e2e03044f61249a359d6adf301") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-windows-x86_64.zip") +set(win64_binary_sha256 "d129425d569140b729210f3383c246dec19c4183f7d0afae1837044942da3b4b") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-windows-arm64.zip") -set(winarm64_binary_sha256 "c54fb253ae184b391d5366b958c38b282d5f9b6a5854643c28e6887f5fd92590") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-windows-arm64.zip") +set(winarm64_binary_sha256 "3498fea26257eebfbfc89ed17963f3d8d83c19362b90fb23517842de777a522a") diff --git a/README.rst b/README.rst index a7040fef8..ad00f78b2 100644 --- a/README.rst +++ b/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 3.25.2 `_. +The CMake python wheels provide `CMake 3.25.3 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index c94f4526a..30579a54c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.25.2 `_. +The CMake python wheels provide `CMake 3.25.3 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 2e23ccfb6..5fab66134 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.25.2 + $ release=3.25.3 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.2' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.3' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.2' - done - Updating 'CMakeUrls.cmake' with CMake version 3.25.2 - Updating 'CMakeUrls.cmake' with CMake version 3.25.2 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.3' - done + Updating 'CMakeUrls.cmake' with CMake version 3.25.3 + Updating 'CMakeUrls.cmake' with CMake version 3.25.3 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.25.2 + release=3.25.3 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index b698fe9e8..9627aadf7 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.25.2" + expected_version = "3.25.3" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From 4ab895052b0c1712d2fe051fa0a9bfb5729a9927 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 14 Mar 2023 14:20:22 -0700 Subject: [PATCH 020/112] Update to CMake 3.26.0 (#340) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 08532643f..9a678898c 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3.tar.gz") -set(unix_source_sha256 "cc995701d590ca6debc4245e9989939099ca52827dd46b5d3592f093afe1901c") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0.tar.gz") +set(unix_source_sha256 "4256613188857e95700621f7cdaaeb954f3546a9249e942bc2f9b3c26e381365") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3.zip") -set(windows_source_sha256 "a1943dd0dfc5fbd7ef10e507051bacc5f76ef6d8f1a188e6e7ab3a57df220eba") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0.zip") +set(windows_source_sha256 "c9d3c06fac55a80179654102de5980b59346957d7f908b99d2b533603842e21e") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "a1943dd0dfc5fbd7ef10e507051bacc5f76ef6d8f1a188e6e7 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.25.3/cmake-3.25.3-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "d4d2ba83301b215857d3b6590cd4434a414fa151c5807693abe587bd6c03581e") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "69b55523145b2e619f637e7766c413cb1b7de1f06269ea1eab4a655d59847d59") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "ea37a83cd329224c38a1938d2cf7b2656ad971dea9cf759238652746213661f8") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "52a8d45c791ed6442cd4b22ddf51aa35df24df831765ab680d763286f04a4f43") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-windows-i386.zip") -set(win32_binary_sha256 "2e66cf7cbd35f392f6b9406910c68f4adfca1de9ab7a2fc4cec658c5c5cd9190") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-windows-i386.zip") +set(win32_binary_sha256 "64b29fb20c2ee5079b32b975ebf7659ca55e1b6f43fd72d0d84a1df2536c3d4c") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-windows-x86_64.zip") -set(win64_binary_sha256 "d129425d569140b729210f3383c246dec19c4183f7d0afae1837044942da3b4b") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-windows-x86_64.zip") +set(win64_binary_sha256 "01191a53d0481ec0e911ba4e37ec41949013408a12dcdf92832a968fea751ea8") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-windows-arm64.zip") -set(winarm64_binary_sha256 "3498fea26257eebfbfc89ed17963f3d8d83c19362b90fb23517842de777a522a") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-windows-arm64.zip") +set(winarm64_binary_sha256 "ec8939856138309f3809d46d5a766ccb5b1f1db539101083bcd623f2161262cf") diff --git a/README.rst b/README.rst index ad00f78b2..e3372853a 100644 --- a/README.rst +++ b/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 3.25.3 `_. +The CMake python wheels provide `CMake 3.26.0 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 30579a54c..236aecbce 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.25.3 `_. +The CMake python wheels provide `CMake 3.26.0 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 5fab66134..0672b8d8e 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.25.3 + $ release=3.26.0 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.3' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.0' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.25.3' - done - Updating 'CMakeUrls.cmake' with CMake version 3.25.3 - Updating 'CMakeUrls.cmake' with CMake version 3.25.3 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.0' - done + Updating 'CMakeUrls.cmake' with CMake version 3.26.0 + Updating 'CMakeUrls.cmake' with CMake version 3.26.0 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.25.3 + release=3.26.0 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 9627aadf7..9933b6728 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.25.3" + expected_version = "3.26.0" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From e0737b2bf3529fd1a8ae71b84f828daf9159eafd Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 15 Mar 2023 00:55:39 -0700 Subject: [PATCH 021/112] chore: use wheel tags command (#341) * chore: use wheel tags command Signed-off-by: Henry Schreiner * Update build.yml --------- Signed-off-by: Henry Schreiner --- .github/workflows/build.yml | 2 +- requirements-repair.txt | 3 +- requirements-test.txt | 2 +- scripts/convert_to_generic_platform_wheel.py | 208 ------------------- scripts/repair_wheel.py | 23 +- 5 files changed, 17 insertions(+), 221 deletions(-) delete mode 100644 scripts/convert_to_generic_platform_wheel.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a21de8fb..ada1e2d28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,7 +184,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y --no-install-recommends libssl-dev - pip install -r requirements-dev.txt + pip install -r requirements-test.txt - uses: actions/download-artifact@v3 with: diff --git a/requirements-repair.txt b/requirements-repair.txt index 489b6e9f3..de121f347 100644 --- a/requirements-repair.txt +++ b/requirements-repair.txt @@ -1,2 +1 @@ -wheel<0.38 -wheeltools @ git+https://github.com/jcfr/wheeltools.git@wheeltools-2018-10-28-a2f174d0e#egg=wheeltools +wheel>=0.40.0 diff --git a/requirements-test.txt b/requirements-test.txt index 12133ee8a..c6b5a67ea 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -9,4 +9,4 @@ pytest-virtualenv>=1.7.0 scikit-build>=0.10.0 setuptools>=28.0.0 virtualenv>=15.0.3 -wheel<0.38 +wheel diff --git a/scripts/convert_to_generic_platform_wheel.py b/scripts/convert_to_generic_platform_wheel.py deleted file mode 100644 index efc64f564..000000000 --- a/scripts/convert_to_generic_platform_wheel.py +++ /dev/null @@ -1,208 +0,0 @@ -# -*- coding: utf-8 -*- -import argparse -import logging -import os -import sys -from itertools import product -from os.path import abspath, basename, dirname, isfile, splitext -from os.path import join as pjoin - -try: - from wheel.install import WheelFile -except ImportError: # As of Wheel 0.32.0 - from wheel.wheelfile import WheelFile - -from wheel.pkginfo import read_pkg_info, write_pkg_info -from wheeltools.tools import unique_by_index -from wheeltools.wheeltools import InWheelCtx - -logger = logging.getLogger(splitext(basename(__file__))[0]) - - -def _get_wheelinfo_name(wheelfile): - # Work round wheel API compatibility - try: - return wheelfile.wheelinfo_name - except AttributeError: - return wheelfile.dist_info_path + "/WHEEL" - - -def _to_generic_pyver(pyver_tags): - """Convert from CPython implementation to generic python version tags - - Convert each CPython version tag to the equivalent generic tag. - - For example:: - - cp35 -> py3 - cp27 -> py2 - - See https://www.python.org/dev/peps/pep-0425/#python-tag - """ - return ['py%s' % tag[2] if tag.startswith('cp') else tag for tag in pyver_tags] - - -def _convert_to_generic_platform_wheel(wheel_ctx, py2_py3, additional_platforms): - """Switch to generic python tags and remove ABI tags from a wheel - - Convert implementation specific python tags to their generic equivalent and - remove all ABI tags from wheel_ctx's filename and ``WHEEL`` file. - - Parameters - ---------- - wheel_ctx : InWheelCtx - An open wheel context - py2_py3: Bool - Wether the pyver tag shall be py2.py3 or just the one inferred from the wheel name - additional_platforms : Optional[Iterable[str]] - An optional iterable of additional platform to add to the wheel - """ - - abi_tags = ['none'] - - wf = WheelFile(wheel_ctx.in_wheel) - info_fname = _get_wheelinfo_name(wf) - info = read_pkg_info(info_fname) - - # Check what tags we have - if wheel_ctx.out_wheel is not None: - out_dir = dirname(wheel_ctx.out_wheel) - wheel_fname = basename(wheel_ctx.out_wheel) - else: - out_dir = '.' - wheel_fname = basename(wheel_ctx.in_wheel) - - # Update wheel filename - fparts = wf.parsed_filename.groupdict() - platform_tags = fparts['plat'].split('.') - logger.debug('Previous platform tags: %s', ', '.join(platform_tags)) - if additional_platforms: - platform_tags = sorted(set(platform_tags + list(additional_platforms))) - fparts['plat'] = '.'.join(platform_tags) - logger.debug('New platform tags ....: %s', ', '.join(platform_tags)) - else: - logger.debug('No platform tags change needed.') - - original_abi_tags = fparts['abi'].split('.') - logger.debug('Previous ABI tags: %s', ', '.join(original_abi_tags)) - if abi_tags != original_abi_tags: - logger.debug('New ABI tags ....: %s', ', '.join(abi_tags)) - fparts['abi'] = '.'.join(abi_tags) - else: - logger.debug('No ABI tags change needed.') - - original_pyver_tags = fparts['pyver'].split('.') - logger.debug('Previous pyver tags: %s', ', '.join(original_pyver_tags)) - pyver_tags = _to_generic_pyver(original_pyver_tags) - if py2_py3: - if len({"py2", "py3"} & set(pyver_tags)) == 0: - raise ValueError("pyver_tags does not contain py2 nor py3") - pyver_tags = sorted(set(pyver_tags + ["py2", "py3"])) - if pyver_tags != original_pyver_tags: - logger.debug('New pyver tags ....: %s', ', '.join(pyver_tags)) - fparts['pyver'] = '.'.join(pyver_tags) - else: - logger.debug('No pyver change needed.') - - _, ext = splitext(wheel_fname) - fparts['ext'] = ext - out_wheel_fname = "{namever}-{pyver}-{abi}-{plat}{ext}".format(**fparts) - - logger.info('Previous filename: %s', wheel_fname) - if out_wheel_fname != wheel_fname: - logger.info('New filename ....: %s', out_wheel_fname) - else: - logger.info('No filename change needed.') - - out_wheel = pjoin(out_dir, out_wheel_fname) - - # Update wheel tags - in_info_tags = [tag for name, tag in info.items() if name == 'Tag'] - logger.info('Previous WHEEL info tags: %s', ', '.join(in_info_tags)) - - # Python version, C-API version combinations - pyc_apis = [] - for py_ver in pyver_tags: - abi = 'none' - pyc_apis.append('-'.join([py_ver, abi])) - # unique Python version, C-API version combinations - pyc_apis = unique_by_index(pyc_apis) - - # Set tags for each Python version, C-API combination - updated_tags = ['-'.join(tup) for tup in product(pyc_apis, platform_tags)] - - if updated_tags != in_info_tags: - del info['Tag'] - for tag in updated_tags: - info.add_header('Tag', tag) - - logger.info('New WHEEL info tags ....: %s', ', '.join(info.get_all('Tag'))) - write_pkg_info(info_fname, info) - else: - logger.info('No WHEEL info change needed.') - return out_wheel - - -def convert_to_generic_platform_wheel(wheel_path, out_dir='./dist/', remove_original=False, verbose=0, - py2_py3=False, additional_platforms=None): - logging.disable(logging.NOTSET) - if verbose >= 1: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - - wheel_fname = basename(wheel_path) - out_dir = abspath(out_dir) - - with InWheelCtx(wheel_path) as ctx: - ctx.out_wheel = pjoin(out_dir, wheel_fname) - ctx.out_wheel = _convert_to_generic_platform_wheel(ctx, py2_py3, additional_platforms) - - if remove_original: - logger.info('Removed original wheel %s', wheel_path) - os.remove(wheel_path) - - -def main(): - p = argparse.ArgumentParser(description='Convert wheel to be independent of python implementation and ABI') - p.set_defaults(prog=basename(sys.argv[0])) - p.add_argument("-v", - "--verbose", - action='count', - dest='verbose', - default=0, - help='Give more output. Option is additive') - - p.add_argument('WHEEL_FILE', help='Path to wheel file.') - p.add_argument('-w', - '--wheel-dir', - dest='WHEEL_DIR', - type=abspath, - help='Directory to store updated wheels (default: "dist/")', - default='dist/') - p.add_argument("-r", - "--remove-original", - dest='remove_original', - action='store_true', - help='Remove original wheel') - p.add_argument("--py2-py3", - dest='py2_py3', - action='store_true', - help='Remove original wheel') - p.add_argument("-p", - "--add-platform", - dest='additional_platforms', - action="append", - help='Add a platform tag') - - args = p.parse_args() - - if not isfile(args.WHEEL_FILE): - p.error('cannot access %s. No such file' % args.WHEEL_FILE) - - convert_to_generic_platform_wheel(args.WHEEL_FILE, args.WHEEL_DIR, args.remove_original, args.verbose, - args.py2_py3, args.additional_platforms) - - -if __name__ == '__main__': - main() diff --git a/scripts/repair_wheel.py b/scripts/repair_wheel.py index cd5149834..f53a5e7f2 100755 --- a/scripts/repair_wheel.py +++ b/scripts/repair_wheel.py @@ -9,8 +9,6 @@ import tempfile from pathlib import Path -from convert_to_generic_platform_wheel import convert_to_generic_platform_wheel - def main(): if sys.platform.startswith("linux"): @@ -55,9 +53,11 @@ def main(): shutil.copyfile(file, tmpdir / file.name) (file,) = tmpdir.glob("*.whl") - # we need to handle macOS universal2 & arm64 here for now, let's use additional_platforms for this. - additional_platforms = [] + # we need to handle macOS universal2 & arm64 here for now, let's use platform_tag_args for this. + platform_tag_args = [] if os_ == "macos": + additional_platforms = [] + # first, get the target macOS deployment target from the wheel match = re.match(r"^.*-macosx_(\d+)_(\d+)_x86_64\.whl$", file.name) assert match is not None @@ -77,13 +77,18 @@ def main(): # They're were also issues with pip not picking up some universal2 wheels, tag twice additional_platforms.append("macosx_11_0_universal2") + platform_tag_args = [f"--platform-tag=+{'.'.join(additional_platforms)}"] + # make this a py2.py3 wheel - convert_to_generic_platform_wheel( - str(file), - out_dir=str(wheelhouse), - py2_py3=True, - additional_platforms=additional_platforms, + subprocess.run( + ["wheel", "tags", "--python-tag", "py2.py3", "--abi-tag", "none", *platform_tag_args, "--remove", str(file)], + check=True, + stdout=subprocess.PIPE, ) + files = list(tmpdir.glob("*.whl")) + assert len(files) == 1, files + file = files[0] + file.rename(wheelhouse / file.name) if __name__ == "__main__": From 607a6175b3f43390517b8885cfe82f6233da8409 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 08:17:01 +0100 Subject: [PATCH 022/112] chore(deps): bump cmake from 3.25.2 to 3.26.0 (#344) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.25.2 to 3.26.0. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.25.2...3.26.0) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index 4ae9bdca0..43212b710 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.25.2 +cmake==3.26.0 ninja==1.11.1 From 25dd7633731fcc0f255a406557f7618b52901636 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 14:16:55 -0400 Subject: [PATCH 023/112] chore(deps): bump pypa/gh-action-pypi-publish from 1.7.1 to 1.8.3 (#347) Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.7.1 to 1.8.3. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.7.1...v1.8.3) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ada1e2d28..5d8856165 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -225,6 +225,6 @@ jobs: path: dist - name: Upload to PyPI - uses: pypa/gh-action-pypi-publish@v1.7.1 + uses: pypa/gh-action-pypi-publish@v1.8.3 with: password: ${{ secrets.PYPI_RELEASE_PASSWORD }} From 7d4985aaa036ff9d104d2d254d7b4a0a7ebbb549 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 14:17:13 -0400 Subject: [PATCH 024/112] chore(deps): update pre-commit hooks (#346) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update pre-commit hooks updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.255 → v0.0.257](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.255...v0.0.257) * Apply suggestions from code review --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7df23f62f..573d1bf25 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.255" + rev: "v0.0.258" hooks: - id: ruff args: [--fix, --show-fixes] From 3b20c489584803d37a36a37700cba3c268d5b467 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 23 Mar 2023 11:56:59 -0700 Subject: [PATCH 025/112] Update to CMake 3.26.1 (#348) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 9a678898c..a2a4d2a34 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0.tar.gz") -set(unix_source_sha256 "4256613188857e95700621f7cdaaeb954f3546a9249e942bc2f9b3c26e381365") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1.tar.gz") +set(unix_source_sha256 "f29964290ad3ced782a1e58ca9fda394a82406a647e24d6afd4e6c32e42c412f") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0.zip") -set(windows_source_sha256 "c9d3c06fac55a80179654102de5980b59346957d7f908b99d2b533603842e21e") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1.zip") +set(windows_source_sha256 "cf6913e8d160bc301e8b668145ac02a2dded3dd633974c83071f57da87f09ecf") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "c9d3c06fac55a80179654102de5980b59346957d7f908b99d2 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.26.0/cmake-3.26.0-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "69b55523145b2e619f637e7766c413cb1b7de1f06269ea1eab4a655d59847d59") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "b1dfd11d50e2dfb3d18be86ca1a369da1c1131badc14b659491dd42be1fed704") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "52a8d45c791ed6442cd4b22ddf51aa35df24df831765ab680d763286f04a4f43") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "60c338d43eb07b8eeb7fb8cef7f808a53edeb9508cd387029ec987dac3d8f762") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-windows-i386.zip") -set(win32_binary_sha256 "64b29fb20c2ee5079b32b975ebf7659ca55e1b6f43fd72d0d84a1df2536c3d4c") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1-windows-i386.zip") +set(win32_binary_sha256 "a0a5f91e609063c0437f6e03aa2d0de4ada5d12ed5ad74acc09d95960504bc99") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-windows-x86_64.zip") -set(win64_binary_sha256 "01191a53d0481ec0e911ba4e37ec41949013408a12dcdf92832a968fea751ea8") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1-windows-x86_64.zip") +set(win64_binary_sha256 "a2cefff35caa91e55716f1951ed82db928fc24f14d61641b21851dcddb81a21e") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-windows-arm64.zip") -set(winarm64_binary_sha256 "ec8939856138309f3809d46d5a766ccb5b1f1db539101083bcd623f2161262cf") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1-windows-arm64.zip") +set(winarm64_binary_sha256 "3d83793e5fea081a7d776d60dc4b44585676d2a85915e44f8da0f2de2a24151e") diff --git a/README.rst b/README.rst index e3372853a..13526a928 100644 --- a/README.rst +++ b/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 3.26.0 `_. +The CMake python wheels provide `CMake 3.26.1 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 236aecbce..3ac7e6162 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.26.0 `_. +The CMake python wheels provide `CMake 3.26.1 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 0672b8d8e..449c7bb8a 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.26.0 + $ release=3.26.1 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.0' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.1' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.0' - done - Updating 'CMakeUrls.cmake' with CMake version 3.26.0 - Updating 'CMakeUrls.cmake' with CMake version 3.26.0 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.1' - done + Updating 'CMakeUrls.cmake' with CMake version 3.26.1 + Updating 'CMakeUrls.cmake' with CMake version 3.26.1 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.26.0 + release=3.26.1 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 9933b6728..1ab422cfd 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.26.0" + expected_version = "3.26.1" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From 93aa8ed24f8ce8db861cf2b5dac1805592c3906f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 09:39:56 -0400 Subject: [PATCH 026/112] chore(deps): bump cmake from 3.26.0 to 3.26.1 (#349) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.26.0 to 3.26.1. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.26.0...3.26.1) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index 43212b710..a7cc0de2c 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.26.0 +cmake==3.26.1 ninja==1.11.1 From 8cb283bd27030afcb7b6a06186b93512ea997171 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 10:33:54 -0400 Subject: [PATCH 027/112] chore(deps): update pre-commit hooks (#350) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.258 → v0.0.259](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.258...v0.0.259) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 573d1bf25..1ff6e7cb2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.258" + rev: "v0.0.259" hooks: - id: ruff args: [--fix, --show-fixes] From 390ac9775c19c447f8e2904c9e431b7deb640989 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 10:59:39 +0200 Subject: [PATCH 028/112] chore(deps): bump pypa/gh-action-pypi-publish from 1.8.3 to 1.8.5 (#352) Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.3 to 1.8.5. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.3...v1.8.5) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d8856165..83b9cce25 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -225,6 +225,6 @@ jobs: path: dist - name: Upload to PyPI - uses: pypa/gh-action-pypi-publish@v1.8.3 + uses: pypa/gh-action-pypi-publish@v1.8.5 with: password: ${{ secrets.PYPI_RELEASE_PASSWORD }} From 20366a55edc1ea547aa3d43d52dd34bcb2fcb8a8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 10:59:51 +0200 Subject: [PATCH 029/112] chore(deps): update pre-commit hooks (#353) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.259 → v0.0.260](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.259...v0.0.260) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1ff6e7cb2..0a5d4a32d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.259" + rev: "v0.0.260" hooks: - id: ruff args: [--fix, --show-fixes] From 017f715bfa2f4cec2730d2eea823303d4c423e1a Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Mon, 10 Apr 2023 11:46:58 +0200 Subject: [PATCH 030/112] Update to CMake 3.26.3 (#354) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index a2a4d2a34..603fbfc98 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1.tar.gz") -set(unix_source_sha256 "f29964290ad3ced782a1e58ca9fda394a82406a647e24d6afd4e6c32e42c412f") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3.tar.gz") +set(unix_source_sha256 "bbd8d39217509d163cb544a40d6428ac666ddc83e22905d3e52c925781f0f659") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1.zip") -set(windows_source_sha256 "cf6913e8d160bc301e8b668145ac02a2dded3dd633974c83071f57da87f09ecf") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3.zip") +set(windows_source_sha256 "a4f7719597346f7161e88c76f001047a8d086bc2cbdeafe9bd0963e74e27aca5") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "cf6913e8d160bc301e8b668145ac02a2dded3dd633974c8307 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.26.1/cmake-3.26.1-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "b1dfd11d50e2dfb3d18be86ca1a369da1c1131badc14b659491dd42be1fed704") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "28d4d1d0db94b47d8dfd4f7dec969a3c747304f4a28ddd6fd340f553f2384dc2") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "60c338d43eb07b8eeb7fb8cef7f808a53edeb9508cd387029ec987dac3d8f762") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "b0d39ae9ddec3f193f50ff549edb30d0b35acb6c95c12f7611dbc8afc52c8ab6") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1-windows-i386.zip") -set(win32_binary_sha256 "a0a5f91e609063c0437f6e03aa2d0de4ada5d12ed5ad74acc09d95960504bc99") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-windows-i386.zip") +set(win32_binary_sha256 "073ebce128b05716ed07dfa1d62448302c1355013ef4b5e17c3535a2821c4cbc") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1-windows-x86_64.zip") -set(win64_binary_sha256 "a2cefff35caa91e55716f1951ed82db928fc24f14d61641b21851dcddb81a21e") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-windows-x86_64.zip") +set(win64_binary_sha256 "91a418595cc9a97d5f679e36728dfec79ee52980f51e8814ec7b05b890708523") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.1/cmake-3.26.1-windows-arm64.zip") -set(winarm64_binary_sha256 "3d83793e5fea081a7d776d60dc4b44585676d2a85915e44f8da0f2de2a24151e") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-windows-arm64.zip") +set(winarm64_binary_sha256 "fd1d908ea54a081a092bc7f9dad0a6ba90fc5aa2644ee5cef901e3f925fce3d8") diff --git a/README.rst b/README.rst index 13526a928..31560bafe 100644 --- a/README.rst +++ b/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 3.26.1 `_. +The CMake python wheels provide `CMake 3.26.3 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 3ac7e6162..883e748e7 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.26.1 `_. +The CMake python wheels provide `CMake 3.26.3 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 449c7bb8a..fbfe4d00b 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.26.1 + $ release=3.26.3 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.1' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.3' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.1' - done - Updating 'CMakeUrls.cmake' with CMake version 3.26.1 - Updating 'CMakeUrls.cmake' with CMake version 3.26.1 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.3' - done + Updating 'CMakeUrls.cmake' with CMake version 3.26.3 + Updating 'CMakeUrls.cmake' with CMake version 3.26.3 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.26.1 + release=3.26.3 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 1ab422cfd..fde88b4e7 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.26.1" + expected_version = "3.26.3" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From 7582bb6902c952fc83f2750b8acd54bb00a73d45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 13:33:01 +0200 Subject: [PATCH 031/112] chore(deps): bump cmake from 3.26.1 to 3.26.3 (#355) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.26.1 to 3.26.3. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.26.1...3.26.3) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index a7cc0de2c..a71f43b99 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.26.1 +cmake==3.26.3 ninja==1.11.1 From c2393da44a4b0a94ec5871589372d1c01fc053c4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 13:34:42 +0200 Subject: [PATCH 032/112] chore(deps): update pre-commit hooks (#356) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.260 → v0.0.261](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.260...v0.0.261) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0a5d4a32d..ed6d1bea4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.260" + rev: "v0.0.261" hooks: - id: ruff args: [--fix, --show-fixes] From 2176de67ba84905c80c8db459bb1a7bf83fbf1aa Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 15 Apr 2023 00:40:42 +0200 Subject: [PATCH 033/112] chore: remove unused `requirements-deploy.txt` (#357) * chore: remove unused `requirements-deploy.txt` * chore: remove unused codecov dependency --- requirements-deploy.txt | 6 ------ requirements-dev.txt | 1 - requirements-test.txt | 1 - 3 files changed, 8 deletions(-) delete mode 100644 requirements-deploy.txt diff --git a/requirements-deploy.txt b/requirements-deploy.txt deleted file mode 100644 index 9806d5685..000000000 --- a/requirements-deploy.txt +++ /dev/null @@ -1,6 +0,0 @@ - -# need to pin cryptography for s390x/ppc64le builds: -# cryptography never provided wheels for those architectures and the -# requirements to build from sources are relaxed when building the 3.3 series -cryptography~=3.3.2 ; sys_platform=="linux" and platform_machine in "s390x, ppc64le" -twine diff --git a/requirements-dev.txt b/requirements-dev.txt index cc4b63fa1..a44bbeeeb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,2 @@ -r requirements-test.txt -r requirements-repair.txt --r requirements-deploy.txt diff --git a/requirements-test.txt b/requirements-test.txt index c6b5a67ea..0b2a7cf67 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,4 +1,3 @@ -codecov>=2.0.5 coverage>=4.2 flake8>=3.0.4 path.py>=11.5.0 From a05f2cfc7c97081856bcf9b54ac7f28955f78db2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:25:13 +0200 Subject: [PATCH 034/112] chore(deps): bump pypa/cibuildwheel from 2.12.1 to 2.12.3 (#361) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.12.1 to 2.12.3. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.12.1...v2.12.3) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83b9cce25..b2548a7c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.12.1 + uses: pypa/cibuildwheel@v2.12.3 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.12.1 + uses: pypa/cibuildwheel@v2.12.3 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From 1dd7b3981bfe0b8b658f78aa94649a1bb8bf762b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 22:15:55 +0200 Subject: [PATCH 035/112] chore(deps): update pre-commit hooks (#362) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.261 → v0.0.263](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.261...v0.0.263) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ed6d1bea4..768169d23 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.261" + rev: "v0.0.263" hooks: - id: ruff args: [--fix, --show-fixes] From 07664551a9e917a3a4051f25653b474c219c33da Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 14:59:16 -0400 Subject: [PATCH 036/112] chore(deps): update pre-commit hooks (#364) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.263 → v0.0.267](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.263...v0.0.267) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 768169d23..f64265c9c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.263" + rev: "v0.0.267" hooks: - id: ruff args: [--fix, --show-fixes] From a3eb391155cc00e046f4fba166d7a9e9cf27027f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 19:48:04 +0000 Subject: [PATCH 037/112] chore(deps): bump pypa/gh-action-pypi-publish from 1.8.5 to release/v1 (#363) * chore(deps): bump pypa/gh-action-pypi-publish from 1.8.5 to 1.8.6 Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.5 to 1.8.6. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.5...v1.8.6) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update .github/workflows/build.yml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2548a7c3..fb51324db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -225,6 +225,6 @@ jobs: path: dist - name: Upload to PyPI - uses: pypa/gh-action-pypi-publish@v1.8.5 + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_RELEASE_PASSWORD }} From 778d6e20161df2ca0bac98682a00508c2c6902fb Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Fri, 19 May 2023 03:42:46 +0200 Subject: [PATCH 038/112] chore: only bump OpenSSL to 3.0.x (current LTS version) (#358) --- noxfile.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/noxfile.py b/noxfile.py index 12febd4c6..f545dea56 100644 --- a/noxfile.py +++ b/noxfile.py @@ -76,7 +76,7 @@ def docs(session: nox.Session) -> str: print("Unsupported argument to docs") -def _bump(session: nox.Session, name: str, repository: str, script: str, files) -> None: +def _bump(session: nox.Session, name: str, repository: str, branch: str, script: str, files) -> None: parser = argparse.ArgumentParser() parser.add_argument( "--commit", action="store_true", help="Make a branch and commit." @@ -88,7 +88,11 @@ def _bump(session: nox.Session, name: str, repository: str, script: str, files) if args.version is None: session.install("lastversion") - version = session.run("lastversion", repository, log=False, silent=True).strip() + lastversion_args = [] + if branch: + lastversion_args.extend(("--branch", branch)) + lastversion_args.append(repository) + version = session.run("lastversion", *lastversion_args, log=False, silent=True).strip() else: version = args.version @@ -118,7 +122,7 @@ def bump(session: nox.Session) -> None: "tests/test_distribution.py", "docs/update_cmake_version.rst", ) - _bump(session, "CMake", "kitware/cmake", "scripts/update_cmake_version.py", files) + _bump(session, "CMake", "kitware/cmake", "", "scripts/update_cmake_version.py", files) @nox.session(name="bump-openssl") @@ -129,4 +133,4 @@ def bump_openssl(session: nox.Session) -> None: files = ( "scripts/manylinux-build-and-install-openssl.sh", ) - _bump(session, "OpenSSL", "openssl/openssl", "scripts/update_openssl_version.py", files) + _bump(session, "OpenSSL", "openssl/openssl", "3.0", "scripts/update_openssl_version.py", files) From ddbb57d5d1a91da2bdcff31376a1aac87e8acb69 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 18 May 2023 23:12:32 -0400 Subject: [PATCH 039/112] Update to CMake 3.26.4 (#365) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 603fbfc98..92ea2eb20 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3.tar.gz") -set(unix_source_sha256 "bbd8d39217509d163cb544a40d6428ac666ddc83e22905d3e52c925781f0f659") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4.tar.gz") +set(unix_source_sha256 "313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3.zip") -set(windows_source_sha256 "a4f7719597346f7161e88c76f001047a8d086bc2cbdeafe9bd0963e74e27aca5") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4.zip") +set(windows_source_sha256 "833b70485508e775ae1c8b6efb60f4a0c68a349c8df79dd2f583c964534b509b") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "a4f7719597346f7161e88c76f001047a8d086bc2cbdeafe9bd 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.26.3/cmake-3.26.3-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "28d4d1d0db94b47d8dfd4f7dec969a3c747304f4a28ddd6fd340f553f2384dc2") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "ba1e0dcc710e2f92be6263f9617510b3660fa9dc409ad2fb8190299563f952a0") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "b0d39ae9ddec3f193f50ff549edb30d0b35acb6c95c12f7611dbc8afc52c8ab6") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "f30362daae58788ada07f9f0fe2b49a53dde4262e2d8fe73640045d9d6055183") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-windows-i386.zip") -set(win32_binary_sha256 "073ebce128b05716ed07dfa1d62448302c1355013ef4b5e17c3535a2821c4cbc") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-windows-i386.zip") +set(win32_binary_sha256 "342ca44f494985f8ef43676eb8a0404b2c68321036e28aa221ceab51d377b158") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-windows-x86_64.zip") -set(win64_binary_sha256 "91a418595cc9a97d5f679e36728dfec79ee52980f51e8814ec7b05b890708523") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-windows-x86_64.zip") +set(win64_binary_sha256 "62c35427104a4f8205226f72708d71334bd36a72cf72c60d0e3a766d71dcc78a") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-windows-arm64.zip") -set(winarm64_binary_sha256 "fd1d908ea54a081a092bc7f9dad0a6ba90fc5aa2644ee5cef901e3f925fce3d8") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-windows-arm64.zip") +set(winarm64_binary_sha256 "6a9b28f318e766e40ac032b7fd2064fa9e026ff329f0ea175cbc8b15af51c45c") diff --git a/README.rst b/README.rst index 31560bafe..433bd01d6 100644 --- a/README.rst +++ b/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 3.26.3 `_. +The CMake python wheels provide `CMake 3.26.4 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 883e748e7..858c86e0a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.26.3 `_. +The CMake python wheels provide `CMake 3.26.4 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index fbfe4d00b..ea2e2f1a0 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.26.3 + $ release=3.26.4 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.3' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.4' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.3' - done - Updating 'CMakeUrls.cmake' with CMake version 3.26.3 - Updating 'CMakeUrls.cmake' with CMake version 3.26.3 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.4' - done + Updating 'CMakeUrls.cmake' with CMake version 3.26.4 + Updating 'CMakeUrls.cmake' with CMake version 3.26.4 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.26.3 + release=3.26.4 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index fde88b4e7..470392692 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.26.3" + expected_version = "3.26.4" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From 6763b33995f16852210ae86d6ffab15eaecc4bc9 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 24 May 2023 17:04:03 -0700 Subject: [PATCH 040/112] chore: use trusted publisher deployment (#366) Signed-off-by: Henry Schreiner --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb51324db..8770c1436 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -218,13 +218,15 @@ jobs: needs: [check_dist] runs-on: ubuntu-latest if: github.event_name == 'push' && github.repository == 'scikit-build/cmake-python-distributions' && startsWith(github.ref, 'refs/tags/') + environment: + name: pypi + url: https://pypi.org/p/cmake + permissions: + id-token: write steps: - uses: actions/download-artifact@v3 with: name: artifact path: dist - - name: Upload to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.PYPI_RELEASE_PASSWORD }} + - uses: pypa/gh-action-pypi-publish@release/v1 From a71b44cfd0c9fa18bac27d3b9fe99e8af4fa1d05 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 17:19:48 -0700 Subject: [PATCH 041/112] chore(deps): update pre-commit hooks (#367) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.267 → v0.0.269](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.267...v0.0.269) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f64265c9c..4a9346e6c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.267" + rev: "v0.0.269" hooks: - id: ruff args: [--fix, --show-fixes] From 79c65e0b556ab002b14df7a6a1c63cc34bdc334c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Jun 2023 13:44:00 +0200 Subject: [PATCH 042/112] chore(deps): bump pypa/cibuildwheel from 2.12.3 to 2.13.0 (#368) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.12.3 to 2.13.0. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.12.3...v2.13.0) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8770c1436..b522b0892 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.12.3 + uses: pypa/cibuildwheel@v2.13.0 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.12.3 + uses: pypa/cibuildwheel@v2.13.0 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From b13c95e69deb873bca0b4c90126d1801ccd97a8b Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Wed, 7 Jun 2023 18:53:49 +0200 Subject: [PATCH 043/112] Update to OpenSSL 3.0.9 (#370) --- scripts/manylinux-build-and-install-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/manylinux-build-and-install-openssl.sh b/scripts/manylinux-build-and-install-openssl.sh index f6e44890e..7302d64be 100755 --- a/scripts/manylinux-build-and-install-openssl.sh +++ b/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.0.8 -OPENSSL_HASH=6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e +OPENSSL_ROOT=openssl-3.0.9 +OPENSSL_HASH=eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90 cd /tmp From ee82fde553526ea7556733ea9b2f5f60bd6530eb Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Wed, 7 Jun 2023 15:00:51 -0400 Subject: [PATCH 044/112] fix(cross-compile): Fix download of arm64 CMake binaries This commit fixes a regression introduced in 6674721c1 (feat: cross-compile to Windows ARM (#326)). It ensures the arm64 CMake binary package is downloaded when building the corresponding CMake Windows arm64 wheels. Co-authored-by: Henry Schreiner --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a3a1347e..2fa5ff2c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ if(CMakePythonDistributions_SUPERBUILD) set(binary_archive "win32_binary") if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64" OR "$ENV{SETUPTOOLS_EXT_SUFFIX}" MATCHES arm64) - set(binary_achive "winarm64_binary") + set(binary_archive "winarm64_binary") else() set(binary_archive "win64_binary") endif() From 7623034454aa97bbbcdbd8c946deee94511da656 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 00:58:46 -0400 Subject: [PATCH 045/112] chore(deps): bump docker/setup-qemu-action from 2.1.0 to 2.2.0 (#373) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b522b0892..60a963774 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v2.2.0 if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels From e2e98246792e5f5c46735d98a3ca44cbcbf01462 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 00:59:01 -0400 Subject: [PATCH 046/112] chore(deps): update pre-commit hooks (#369) --- .pre-commit-config.yaml | 2 +- scripts/update_cmake_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4a9346e6c..5e1d66af1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.269" + rev: "v0.0.271" hooks: - id: ruff args: [--fix, --show-fixes] diff --git a/scripts/update_cmake_version.py b/scripts/update_cmake_version.py index 4f1e76c4e..cbdcc3ae5 100755 --- a/scripts/update_cmake_version.py +++ b/scripts/update_cmake_version.py @@ -176,7 +176,7 @@ def update_docs(version): version, _major_minor(version), ) - for filename in {"docs/index.rst", "README.rst"}: + for filename in ["docs/index.rst", "README.rst"]: _update_file(os.path.join(ROOT_DIR, filename), pattern, replacement) From 30490dc77bf8fcd38a693eacfd12004cd661f2a5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 25 Jun 2023 11:31:40 +0200 Subject: [PATCH 047/112] chore(deps): update pre-commit hooks (#376) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.271 → v0.0.272](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.271...v0.0.272) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5e1d66af1..04c0d5dc6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.271" + rev: "v0.0.272" hooks: - id: ruff args: [--fix, --show-fixes] From 837d8beaee285b1312e7edbfd62ed2594e86c37f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Jun 2023 11:31:55 +0200 Subject: [PATCH 048/112] chore(deps): bump pypa/cibuildwheel from 2.13.0 to 2.13.1 (#375) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.13.0 to 2.13.1. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.13.0...v2.13.1) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60a963774..a164af3e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.13.0 + uses: pypa/cibuildwheel@v2.13.1 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.13.0 + uses: pypa/cibuildwheel@v2.13.1 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From b3bd38567e54765180bde511a4a3a30c5cbb02cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Jun 2023 11:32:07 +0200 Subject: [PATCH 049/112] chore(deps): bump cmake from 3.26.3 to 3.26.4 (#374) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.26.3 to 3.26.4. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.26.3...3.26.4) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index a71f43b99..e34566b1e 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.26.3 +cmake==3.26.4 ninja==1.11.1 From 435b051d977a15910a7dcfd28dd9083e9cf897de Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 25 Jun 2023 12:11:33 +0200 Subject: [PATCH 050/112] chore: continue testing with python 2.7 `actions/setup-python` removed python 2.7 in all versions of the action. Use Ubuntu provided python 2.7 to continue testing. --- .github/workflows/build.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a164af3e5..ef83c0fc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -176,10 +176,21 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 + if: matrix.python != '2.7' name: Install Python ${{ matrix.python }} with: python-version: ${{ matrix.python }} + - name: Install Ubuntu Python 2.7 + if: matrix.python == '2.7' + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends python2 python3-virtualenv + virtualenv -p python2 ${HOME}/cp27 + ${HOME}/cp27/bin/python -m pip install -U pip + ${HOME}/cp27/bin/python -m pip install -U setuptools wheel + echo "${HOME}/cp27/bin" >> $GITHUB_PATH + - name: Install dependencies run: | sudo apt-get update From 1b8c3ed5fb3cd274b8a426635b0dea3a8e8c4b80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 22:31:45 +0000 Subject: [PATCH 051/112] chore(deps): bump pypa/cibuildwheel from 2.13.1 to 2.14.1 Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.13.1 to 2.14.1. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.13.1...v2.14.1) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef83c0fc5..2f9d9c8ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.13.1 + uses: pypa/cibuildwheel@v2.14.1 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.13.1 + uses: pypa/cibuildwheel@v2.14.1 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From d6e2997d490a867228b5ddf724aeadd5fc39df6b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 22:49:12 -0400 Subject: [PATCH 052/112] chore(deps): update pre-commit hooks (#378) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - https://github.com/charliermarsh/ruff-pre-commit → https://github.com/astral-sh/ruff-pre-commit - [github.com/astral-sh/ruff-pre-commit: v0.0.272 → v0.0.278](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.272...v0.0.278) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 04c0d5dc6..66aa06191 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,8 +18,8 @@ repos: - id: trailing-whitespace - id: fix-encoding-pragma -- repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.272" +- repo: https://github.com/astral-sh/ruff-pre-commit + rev: "v0.0.278" hooks: - id: ruff args: [--fix, --show-fixes] From fb3765a6d14ea34613559e1fd39ca6928017b957 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 19 Jul 2023 10:48:15 -0400 Subject: [PATCH 053/112] Update to CMake 3.27.0 (#382) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 92ea2eb20..cedbb7600 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4.tar.gz") -set(unix_source_sha256 "313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0.tar.gz") +set(unix_source_sha256 "aaeddb6b28b993d0a6e32c88123d728a17561336ab90e0bf45032383564d3cb8") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4.zip") -set(windows_source_sha256 "833b70485508e775ae1c8b6efb60f4a0c68a349c8df79dd2f583c964534b509b") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0.zip") +set(windows_source_sha256 "0669bee468aa9b571584ef8e23fa20a3fbf714fa47889ccba34679316ee52217") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "833b70485508e775ae1c8b6efb60f4a0c68a349c8df79dd2f5 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.26.4/cmake-3.26.4-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "ba1e0dcc710e2f92be6263f9617510b3660fa9dc409ad2fb8190299563f952a0") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "89c7e74d29f442e4734954310e09dd12d13636991f2d90d0ed1bececb8bf9b9c") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "f30362daae58788ada07f9f0fe2b49a53dde4262e2d8fe73640045d9d6055183") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "dd9a7a8d5bd7d20b694eda8ff9c31147a5e1faa3bca1099836cfa0f81f8d5809") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-windows-i386.zip") -set(win32_binary_sha256 "342ca44f494985f8ef43676eb8a0404b2c68321036e28aa221ceab51d377b158") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-windows-i386.zip") +set(win32_binary_sha256 "bb3c3ca83be02a410b10393d563ec1e83d2048fea5eb35e88efe5c75e239dac3") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-windows-x86_64.zip") -set(win64_binary_sha256 "62c35427104a4f8205226f72708d71334bd36a72cf72c60d0e3a766d71dcc78a") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-windows-x86_64.zip") +set(win64_binary_sha256 "fc5f901ef4d438eafbe35b24c608d5de11e517f157b3b7ab8ebbaa7c3c0171d2") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-windows-arm64.zip") -set(winarm64_binary_sha256 "6a9b28f318e766e40ac032b7fd2064fa9e026ff329f0ea175cbc8b15af51c45c") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-windows-arm64.zip") +set(winarm64_binary_sha256 "9345cbbb25cb5e8f3c68db067151a013c628783edbfc6fcf622ae58900aa8ad3") diff --git a/README.rst b/README.rst index 433bd01d6..e6728027a 100644 --- a/README.rst +++ b/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 3.26.4 `_. +The CMake python wheels provide `CMake 3.27.0 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 858c86e0a..51164d76c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.26.4 `_. +The CMake python wheels provide `CMake 3.27.0 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index ea2e2f1a0..838b3ec35 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.26.4 + $ release=3.27.0 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.4' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.0' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.26.4' - done - Updating 'CMakeUrls.cmake' with CMake version 3.26.4 - Updating 'CMakeUrls.cmake' with CMake version 3.26.4 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.0' - done + Updating 'CMakeUrls.cmake' with CMake version 3.27.0 + Updating 'CMakeUrls.cmake' with CMake version 3.27.0 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.26.4 + release=3.27.0 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 470392692..685e8560a 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.26.4" + expected_version = "3.27.0" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From 15f426b1153ad8a963ed6abb6107aae1a343fbd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 06:46:52 +0200 Subject: [PATCH 054/112] chore(deps): bump cmake from 3.26.4 to 3.27.0 (#383) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.26.4 to 3.27.0. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.26.4...3.27.0) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index e34566b1e..fc37eb8f9 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.26.4 +cmake==3.27.0 ninja==1.11.1 From 326cd9a783ce8390064bc8518d3894cda9cacc90 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Fri, 4 Aug 2023 22:21:26 +0200 Subject: [PATCH 055/112] Update to OpenSSL 3.0.10 (#387) Created by update_openssl_version.py --- scripts/manylinux-build-and-install-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/manylinux-build-and-install-openssl.sh b/scripts/manylinux-build-and-install-openssl.sh index 7302d64be..d1927d26d 100755 --- a/scripts/manylinux-build-and-install-openssl.sh +++ b/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.0.9 -OPENSSL_HASH=eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90 +OPENSSL_ROOT=openssl-3.0.10 +OPENSSL_HASH=1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323 cd /tmp From 8522beb5b9943e1faddc6b3a2b63915e2aaee4e4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 22:21:37 +0200 Subject: [PATCH 056/112] chore(deps): update pre-commit hooks (#385) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.278 → v0.0.281](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.278...v0.0.281) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 66aa06191..e06d08ee9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.278" + rev: "v0.0.281" hooks: - id: ruff args: [--fix, --show-fixes] From d2420ca2cb22ee16b539ef21138c7ac85841b421 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 5 Aug 2023 11:40:03 +0200 Subject: [PATCH 057/112] Update to CMake 3.27.1 (#388) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index cedbb7600..7fd356dff 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0.tar.gz") -set(unix_source_sha256 "aaeddb6b28b993d0a6e32c88123d728a17561336ab90e0bf45032383564d3cb8") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1.tar.gz") +set(unix_source_sha256 "b1a6b0135fa11b94476e90f5b32c4c8fad480bf91cf22d0ded98ce22c5132004") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0.zip") -set(windows_source_sha256 "0669bee468aa9b571584ef8e23fa20a3fbf714fa47889ccba34679316ee52217") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1.zip") +set(windows_source_sha256 "941ab9ca35f32b36eb9d1e8f3befea2527a47983b7d6609143a9aca3c0cbd018") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "0669bee468aa9b571584ef8e23fa20a3fbf714fa47889ccba3 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.27.0/cmake-3.27.0-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "89c7e74d29f442e4734954310e09dd12d13636991f2d90d0ed1bececb8bf9b9c") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "9fef63e1cf87cab1153f9433045df2e43c336e462518b0f5e52d2cc91d762cff") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "dd9a7a8d5bd7d20b694eda8ff9c31147a5e1faa3bca1099836cfa0f81f8d5809") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "3f9b1b6c29369d2b4e71991420966599a378b01f84e6420d5e881946a04debed") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-windows-i386.zip") -set(win32_binary_sha256 "bb3c3ca83be02a410b10393d563ec1e83d2048fea5eb35e88efe5c75e239dac3") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-i386.zip") +set(win32_binary_sha256 "f6bdca9944eebe16d6078dd6044fa9f61f22489e4562f49af58bb32f2ed32c8b") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-windows-x86_64.zip") -set(win64_binary_sha256 "fc5f901ef4d438eafbe35b24c608d5de11e517f157b3b7ab8ebbaa7c3c0171d2") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-x86_64.zip") +set(win64_binary_sha256 "664fe1655999f0b693d1e64ddb430191c727ab0a03dc1da7278f291172e1e04e") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-windows-arm64.zip") -set(winarm64_binary_sha256 "9345cbbb25cb5e8f3c68db067151a013c628783edbfc6fcf622ae58900aa8ad3") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-arm64.zip") +set(winarm64_binary_sha256 "588576bd73f20a851de053571a3ccb9bfe28446b5952ea62918dd273da608183") diff --git a/README.rst b/README.rst index e6728027a..f3703906b 100644 --- a/README.rst +++ b/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 3.27.0 `_. +The CMake python wheels provide `CMake 3.27.1 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 51164d76c..9d3f89756 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.27.0 `_. +The CMake python wheels provide `CMake 3.27.1 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 838b3ec35..4a5e66cf5 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.27.0 + $ release=3.27.1 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.0' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.1' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.0' - done - Updating 'CMakeUrls.cmake' with CMake version 3.27.0 - Updating 'CMakeUrls.cmake' with CMake version 3.27.0 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.1' - done + Updating 'CMakeUrls.cmake' with CMake version 3.27.1 + Updating 'CMakeUrls.cmake' with CMake version 3.27.1 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.27.0 + release=3.27.1 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 685e8560a..7655c75d0 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.27.0" + expected_version = "3.27.1" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From 96627d9d218691e1c52f5fc472d77228b33748bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 06:34:25 +0200 Subject: [PATCH 058/112] chore(deps): bump cmake from 3.27.0 to 3.27.1 (#389) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.27.0 to 3.27.1. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.27.0...3.27.1) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index fc37eb8f9..29eaead58 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.27.0 +cmake==3.27.1 ninja==1.11.1 From 0e4d56e9506ede73e3dddbe237b6ebbd3dab1a26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 08:39:28 +0200 Subject: [PATCH 059/112] chore(deps): bump pypa/cibuildwheel from 2.14.1 to 2.15.0 (#391) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.14.1 to 2.15.0. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.14.1...v2.15.0) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f9d9c8ac..a26af10c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.14.1 + uses: pypa/cibuildwheel@v2.15.0 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.14.1 + uses: pypa/cibuildwheel@v2.15.0 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From e0052bf0912d16ccb9e545cd206b32cb7a972e81 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 08:39:40 +0200 Subject: [PATCH 060/112] chore(deps): update pre-commit hooks (#390) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.281 → v0.0.282](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.281...v0.0.282) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e06d08ee9..552d0fb7a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.281" + rev: "v0.0.282" hooks: - id: ruff args: [--fix, --show-fixes] From 84c004a55e3bca6115f9f870fdea3a8031b270a0 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 12 Aug 2023 12:02:40 +0200 Subject: [PATCH 061/112] Update to CMake 3.27.2 (#393) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 7fd356dff..c453a545d 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1.tar.gz") -set(unix_source_sha256 "b1a6b0135fa11b94476e90f5b32c4c8fad480bf91cf22d0ded98ce22c5132004") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2.tar.gz") +set(unix_source_sha256 "798e50085d423816fe96c9ef8bee5e50002c9eca09fed13e300de8a91d35c211") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1.zip") -set(windows_source_sha256 "941ab9ca35f32b36eb9d1e8f3befea2527a47983b7d6609143a9aca3c0cbd018") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2.zip") +set(windows_source_sha256 "c88ea100e24b26270db06a3f856af2be5282badfd7f423bc51c26913fc932bca") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "941ab9ca35f32b36eb9d1e8f3befea2527a47983b7d6609143 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.27.1/cmake-3.27.1-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "9fef63e1cf87cab1153f9433045df2e43c336e462518b0f5e52d2cc91d762cff") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "89c30078a5f58bbbd524704cb87e724fca905aa5e71ac40bccc6295c4d6852c9") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "3f9b1b6c29369d2b4e71991420966599a378b01f84e6420d5e881946a04debed") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "58204ebe25912dbd56456b265675ea90c60f29745b3f149841e9ea4bfcb45158") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-i386.zip") -set(win32_binary_sha256 "f6bdca9944eebe16d6078dd6044fa9f61f22489e4562f49af58bb32f2ed32c8b") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2-windows-i386.zip") +set(win32_binary_sha256 "c26e4ba882a94ae24c695b1365f30e75fbea4a65ec0ee36a540f7f9029caf1fd") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-x86_64.zip") -set(win64_binary_sha256 "664fe1655999f0b693d1e64ddb430191c727ab0a03dc1da7278f291172e1e04e") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2-windows-x86_64.zip") +set(win64_binary_sha256 "d5c33f726f9154f4abdda94e83aabd6de9f37b6b25ecbc9e499a3c5777871d55") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-arm64.zip") -set(winarm64_binary_sha256 "588576bd73f20a851de053571a3ccb9bfe28446b5952ea62918dd273da608183") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2-windows-arm64.zip") +set(winarm64_binary_sha256 "8861c264be983da901e6fbfb3a0bebe87f7b1faba92d3805ffe82a013964229b") diff --git a/README.rst b/README.rst index f3703906b..56acf4466 100644 --- a/README.rst +++ b/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 3.27.1 `_. +The CMake python wheels provide `CMake 3.27.2 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 9d3f89756..c80c9205e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.27.1 `_. +The CMake python wheels provide `CMake 3.27.2 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 4a5e66cf5..26c8c0105 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.27.1 + $ release=3.27.2 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.1' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.2' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.1' - done - Updating 'CMakeUrls.cmake' with CMake version 3.27.1 - Updating 'CMakeUrls.cmake' with CMake version 3.27.1 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.2' - done + Updating 'CMakeUrls.cmake' with CMake version 3.27.2 + Updating 'CMakeUrls.cmake' with CMake version 3.27.2 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.27.1 + release=3.27.2 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 7655c75d0..f0c6d83f7 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.27.1" + expected_version = "3.27.2" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From a62a8109a9598ea659a386cfdd4b034ea3aee1de Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:14:26 +0200 Subject: [PATCH 062/112] chore(deps): update pre-commit hooks (#396) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.282 → v0.0.284](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.282...v0.0.284) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 552d0fb7a..575e5d73b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.282" + rev: "v0.0.284" hooks: - id: ruff args: [--fix, --show-fixes] From 0acab486a2d7b4ae06b9c39a5d178402ee5b0afe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:14:38 +0200 Subject: [PATCH 063/112] chore(deps): bump cmake from 3.27.1 to 3.27.2 (#395) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.27.1 to 3.27.2. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.27.1...3.27.2) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index 29eaead58..f54b4c7b3 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.27.1 +cmake==3.27.2 ninja==1.11.1 From d4f500330bd0d25c98bfdbc2ea13f1f8e403cb82 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:22:20 +0200 Subject: [PATCH 064/112] chore(deps): update pre-commit hooks (#397) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.284 → v0.0.285](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.284...v0.0.285) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 575e5d73b..098434ceb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.284" + rev: "v0.0.285" hooks: - id: ruff args: [--fix, --show-fixes] From 2a46acc753c57a0a3bda44fa078ba1ab3b37e0fb Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sun, 27 Aug 2023 13:38:35 +0200 Subject: [PATCH 065/112] Update to CMake 3.27.4 (#398) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index c453a545d..34a6bd6da 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2.tar.gz") -set(unix_source_sha256 "798e50085d423816fe96c9ef8bee5e50002c9eca09fed13e300de8a91d35c211") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4.tar.gz") +set(unix_source_sha256 "0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2.zip") -set(windows_source_sha256 "c88ea100e24b26270db06a3f856af2be5282badfd7f423bc51c26913fc932bca") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4.zip") +set(windows_source_sha256 "83601005152e77a6e885b62740ce25e6c1a6efae5e6d48d7c2c89e5a92b01c89") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "c88ea100e24b26270db06a3f856af2be5282badfd7f423bc51 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.27.2/cmake-3.27.2-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "89c30078a5f58bbbd524704cb87e724fca905aa5e71ac40bccc6295c4d6852c9") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "186c53121cf6ef4e48b51e88690e6ef84f268611064a42e5a2e829c3d6b2efde") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "58204ebe25912dbd56456b265675ea90c60f29745b3f149841e9ea4bfcb45158") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "1fa092bad6daf9715c6d72ff766813fd3423427696042a74f2208a2b4704ac1c") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2-windows-i386.zip") -set(win32_binary_sha256 "c26e4ba882a94ae24c695b1365f30e75fbea4a65ec0ee36a540f7f9029caf1fd") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-windows-i386.zip") +set(win32_binary_sha256 "5ffd1db389cc8d4bad39c220d73c52402cb979d4e36e1e4729e00df6e7e6f1de") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2-windows-x86_64.zip") -set(win64_binary_sha256 "d5c33f726f9154f4abdda94e83aabd6de9f37b6b25ecbc9e499a3c5777871d55") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-windows-x86_64.zip") +set(win64_binary_sha256 "e5e060756444d0b2070328a8821c1ceb62bd6d267aae61bfff06f96c7ec943a6") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2-windows-arm64.zip") -set(winarm64_binary_sha256 "8861c264be983da901e6fbfb3a0bebe87f7b1faba92d3805ffe82a013964229b") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-windows-arm64.zip") +set(winarm64_binary_sha256 "6c1df7ad85ed902ad615cd0c05bca0d3c9c3f67b3980ca9dd2e39b0821d50937") diff --git a/README.rst b/README.rst index 56acf4466..6c5b3827c 100644 --- a/README.rst +++ b/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 3.27.2 `_. +The CMake python wheels provide `CMake 3.27.4 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index c80c9205e..e4d446a2e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.27.2 `_. +The CMake python wheels provide `CMake 3.27.4 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 26c8c0105..f8798db75 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.27.2 + $ release=3.27.4 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.2' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.4' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.2' - done - Updating 'CMakeUrls.cmake' with CMake version 3.27.2 - Updating 'CMakeUrls.cmake' with CMake version 3.27.2 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.4' - done + Updating 'CMakeUrls.cmake' with CMake version 3.27.4 + Updating 'CMakeUrls.cmake' with CMake version 3.27.4 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.27.2 + release=3.27.4 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index f0c6d83f7..9fd0d32fd 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.27.2" + expected_version = "3.27.4" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From f3780badd428f39a001a2dc5a3f961575a5c9704 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 10:52:18 +0200 Subject: [PATCH 066/112] chore(deps): bump cmake from 3.27.2 to 3.27.4.1 (#402) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.27.2 to 3.27.4.1. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.27.2...3.27.4.1) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index f54b4c7b3..e7e0e558b 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.27.2 +cmake==3.27.4.1 ninja==1.11.1 From bdae3093fc63d3207c375db2b80f6b42a174b29b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 12:29:45 +0200 Subject: [PATCH 067/112] chore(deps): bump actions/checkout from 3 to 4 (#401) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a26af10c2..814235678 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: name: Lint runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.x" @@ -98,7 +98,7 @@ jobs: use_qemu: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) with: fetch-depth: 0 # required for versioneer to find tags @@ -131,7 +131,7 @@ jobs: - arch: "i686" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # required for versioneer to find tags @@ -152,7 +152,7 @@ jobs: needs: [lint] runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # required for versioneer to find tags @@ -174,7 +174,7 @@ jobs: python: ["2.7", "3.6", "3.11"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 if: matrix.python != '2.7' name: Install Python ${{ matrix.python }} From 35e32c3986e702de159ab67b9842a1857435777d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 10:25:27 +0200 Subject: [PATCH 068/112] chore(deps): update pre-commit hooks (#400) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.285 → v0.0.287](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.285...v0.0.287) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 098434ceb..e62f4d689 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.285" + rev: "v0.0.287" hooks: - id: ruff args: [--fix, --show-fixes] From e7997d715b1bbf2fc63f5d4e20f25d3e8a72909a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 23:20:52 +0200 Subject: [PATCH 069/112] chore(deps): bump docker/setup-qemu-action from 2.2.0 to 3.0.0 (#404) Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2.2.0 to 3.0.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v2.2.0...v3.0.0) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 814235678..fb2191ff3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Set up QEMU - uses: docker/setup-qemu-action@v2.2.0 + uses: docker/setup-qemu-action@v3.0.0 if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels From 3b4168312ab52d6002e7c95c46d7d0cef4d7115a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 23:21:04 +0200 Subject: [PATCH 070/112] chore(deps): update pre-commit hooks (#403) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.287 → v0.0.288](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.287...v0.0.288) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e62f4d689..3ebde2cb6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.287" + rev: "v0.0.288" hooks: - id: ruff args: [--fix, --show-fixes] From 314a69fc0b9bdc9a07c55e31f06de18a6289b37b Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sun, 17 Sep 2023 10:29:04 +0200 Subject: [PATCH 071/112] Update to CMake 3.27.5 (#405) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 34a6bd6da..f615aadf3 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4.tar.gz") -set(unix_source_sha256 "0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5.tar.gz") +set(unix_source_sha256 "5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4.zip") -set(windows_source_sha256 "83601005152e77a6e885b62740ce25e6c1a6efae5e6d48d7c2c89e5a92b01c89") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5.zip") +set(windows_source_sha256 "3084660c00eec05f7cdc2b6b0e06324692eef57a5e05ab7789d1cefc18de010e") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "83601005152e77a6e885b62740ce25e6c1a6efae5e6d48d7c2 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.27.4/cmake-3.27.4-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "186c53121cf6ef4e48b51e88690e6ef84f268611064a42e5a2e829c3d6b2efde") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "138c68addae825b16ed78d792dafef5e0960194833f48bd77e7e0429c6bc081c") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "1fa092bad6daf9715c6d72ff766813fd3423427696042a74f2208a2b4704ac1c") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "1f776640e6ad35b2b3fe2ab5e39cff363b2c3034ecb56e45597402b7bf010e47") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-windows-i386.zip") -set(win32_binary_sha256 "5ffd1db389cc8d4bad39c220d73c52402cb979d4e36e1e4729e00df6e7e6f1de") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-windows-i386.zip") +set(win32_binary_sha256 "cd1225354a5639a992d772f2043a1f0ebadb7ed2d77e0f859e555157410555ce") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-windows-x86_64.zip") -set(win64_binary_sha256 "e5e060756444d0b2070328a8821c1ceb62bd6d267aae61bfff06f96c7ec943a6") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-windows-x86_64.zip") +set(win64_binary_sha256 "1e8e06c8ecf63d5f213019e1cd39ea41a6cf952db5f2c8e69b8e47f5bc302684") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-windows-arm64.zip") -set(winarm64_binary_sha256 "6c1df7ad85ed902ad615cd0c05bca0d3c9c3f67b3980ca9dd2e39b0821d50937") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-windows-arm64.zip") +set(winarm64_binary_sha256 "3fcc84d34e3213b0e4261295eaddfc645685ab366dc570421555e7f3d3080d3a") diff --git a/README.rst b/README.rst index 6c5b3827c..0d70c1a65 100644 --- a/README.rst +++ b/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 3.27.4 `_. +The CMake python wheels provide `CMake 3.27.5 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index e4d446a2e..0c585a207 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.27.4 `_. +The CMake python wheels provide `CMake 3.27.5 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index f8798db75..4c46ff50e 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.27.4 + $ release=3.27.5 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.4' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.5' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.4' - done - Updating 'CMakeUrls.cmake' with CMake version 3.27.4 - Updating 'CMakeUrls.cmake' with CMake version 3.27.4 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.5' - done + Updating 'CMakeUrls.cmake' with CMake version 3.27.5 + Updating 'CMakeUrls.cmake' with CMake version 3.27.5 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.27.4 + release=3.27.5 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 9fd0d32fd..96f95df18 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.27.4" + expected_version = "3.27.5" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From 9df127e8a4515d4669efedd723951e9f7d6fceae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 08:23:06 +0200 Subject: [PATCH 072/112] chore(deps): bump cmake from 3.27.4.1 to 3.27.5 (#406) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.27.4.1 to 3.27.5. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.27.4.1...3.27.5) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index e7e0e558b..9f2ce5c77 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.27.4.1 +cmake==3.27.5 ninja==1.11.1 From 020223c8e9664199a2a70a7875dc7d26870173a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 08:26:27 +0200 Subject: [PATCH 073/112] chore(deps): bump pypa/cibuildwheel from 2.15.0 to 2.16.0 (#407) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.15.0 to 2.16.0. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.15.0...v2.16.0) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb2191ff3..57e90d983 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.16.0 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.16.0 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From 3be2c3a0aeae0530bc793b35125469d5ea4c6165 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:01:38 +0200 Subject: [PATCH 074/112] chore(deps): update pre-commit hooks (#408) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.288 → v0.0.290](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.288...v0.0.290) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3ebde2cb6..23d4d2b7e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.288" + rev: "v0.0.290" hooks: - id: ruff args: [--fix, --show-fixes] From 4df2630e37e5fa8506480a621c7fd7ca99ab4af5 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Wed, 20 Sep 2023 23:03:56 +0200 Subject: [PATCH 075/112] Update to OpenSSL 3.0.11 (#409) --- scripts/manylinux-build-and-install-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/manylinux-build-and-install-openssl.sh b/scripts/manylinux-build-and-install-openssl.sh index d1927d26d..ec105b726 100755 --- a/scripts/manylinux-build-and-install-openssl.sh +++ b/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.0.10 -OPENSSL_HASH=1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323 +OPENSSL_ROOT=openssl-3.0.11 +OPENSSL_HASH=b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55 cd /tmp From c0d3f1a811457f7f53a3ed842c22f3b9fce5ee42 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 21:03:48 +0200 Subject: [PATCH 076/112] chore(deps): update pre-commit hooks (#411) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.290 → v0.0.291](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.290...v0.0.291) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 23d4d2b7e..4a1ec61fd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.290" + rev: "v0.0.291" hooks: - id: ruff args: [--fix, --show-fixes] From e7f93e847916c213b06eef48805e060bc078737b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 08:57:07 +0200 Subject: [PATCH 077/112] chore(deps): bump pypa/cibuildwheel from 2.16.0 to 2.16.1 (#412) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.16.0 to 2.16.1. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.16.0...v2.16.1) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57e90d983..5c26891fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.16.0 + uses: pypa/cibuildwheel@v2.16.1 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.16.0 + uses: pypa/cibuildwheel@v2.16.1 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From 13473f41061f73e599987af8dee5ba262e065769 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 30 Sep 2023 19:41:22 +0200 Subject: [PATCH 078/112] Update to CMake 3.27.6 (#413) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index f615aadf3..940fa9e59 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5.tar.gz") -set(unix_source_sha256 "5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6.tar.gz") +set(unix_source_sha256 "ef3056df528569e0e8956f6cf38806879347ac6de6a4ff7e4105dc4578732cfb") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5.zip") -set(windows_source_sha256 "3084660c00eec05f7cdc2b6b0e06324692eef57a5e05ab7789d1cefc18de010e") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6.zip") +set(windows_source_sha256 "a68d0b903b318c2b8edb9d78ed9e19fef697a023000b7776cafc6c3db704a504") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "3084660c00eec05f7cdc2b6b0e06324692eef57a5e05ab7789 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.27.5/cmake-3.27.5-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "138c68addae825b16ed78d792dafef5e0960194833f48bd77e7e0429c6bc081c") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "26373a283daa8490d772dc8a179450cd6d391cb2a9db8d4242fe09e361efc42e") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "1f776640e6ad35b2b3fe2ab5e39cff363b2c3034ecb56e45597402b7bf010e47") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "3977258c8d30f03f6506fdb12dac9b8570db7d5e54f541285ee540de433a9cff") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-windows-i386.zip") -set(win32_binary_sha256 "cd1225354a5639a992d772f2043a1f0ebadb7ed2d77e0f859e555157410555ce") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-windows-i386.zip") +set(win32_binary_sha256 "2bcbe76c0957fb059216bce499c27e4674eb60032f855eb2bc81dc6f2f6c0d6d") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-windows-x86_64.zip") -set(win64_binary_sha256 "1e8e06c8ecf63d5f213019e1cd39ea41a6cf952db5f2c8e69b8e47f5bc302684") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-windows-x86_64.zip") +set(win64_binary_sha256 "f013a0cca091aa953f9a60a99292ec7a20ae3f9ceb05cb5c08ebe164097c526f") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-windows-arm64.zip") -set(winarm64_binary_sha256 "3fcc84d34e3213b0e4261295eaddfc645685ab366dc570421555e7f3d3080d3a") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-windows-arm64.zip") +set(winarm64_binary_sha256 "980b7e532d77bfb4e5814c76403242c503019f1c0699440220cf2d527c8ff350") diff --git a/README.rst b/README.rst index 0d70c1a65..2f978a5f3 100644 --- a/README.rst +++ b/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 3.27.5 `_. +The CMake python wheels provide `CMake 3.27.6 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 0c585a207..3d793a5f5 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.27.5 `_. +The CMake python wheels provide `CMake 3.27.6 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 4c46ff50e..784b94420 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.27.5 + $ release=3.27.6 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.5' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.6' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.5' - done - Updating 'CMakeUrls.cmake' with CMake version 3.27.5 - Updating 'CMakeUrls.cmake' with CMake version 3.27.5 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.6' - done + Updating 'CMakeUrls.cmake' with CMake version 3.27.6 + Updating 'CMakeUrls.cmake' with CMake version 3.27.6 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.27.5 + release=3.27.6 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 96f95df18..2032460e4 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.27.5" + expected_version = "3.27.6" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From f6ff95dab9d69ab6b7ef8f0f748b9f38d16cbc11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 22:25:23 +0200 Subject: [PATCH 079/112] chore(deps): bump cmake from 3.27.5 to 3.27.6 (#414) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.27.5 to 3.27.6. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.27.5...3.27.6) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index 9f2ce5c77..099e7bc36 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.27.5 +cmake==3.27.6 ninja==1.11.1 From 31b4536c4b5b7c40cae52a9da02df4c2316b582e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:41:20 +0200 Subject: [PATCH 080/112] chore(deps): bump pypa/cibuildwheel from 2.16.1 to 2.16.2 (#416) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.16.1 to 2.16.2. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.16.1...v2.16.2) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c26891fd..b645bb02b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.16.1 + uses: pypa/cibuildwheel@v2.16.2 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -136,7 +136,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.16.1 + uses: pypa/cibuildwheel@v2.16.2 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From c12cde2292c328d5adec7b3974ad2f0433ef7b18 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 23:07:31 +0200 Subject: [PATCH 081/112] chore(deps): update pre-commit hooks (#415) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.291 → v0.0.292](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.291...v0.0.292) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4a1ec61fd..54e44d55a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.291" + rev: "v0.0.292" hooks: - id: ruff args: [--fix, --show-fixes] From 5e59dae980d2a7c6dde5b5a37dc5db1b64cad434 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Oct 2023 11:32:43 +0200 Subject: [PATCH 082/112] chore(deps): bump ninja from 1.11.1 to 1.11.1.1 (#420) Bumps [ninja](https://github.com/ninja-build/ninja) from 1.11.1 to 1.11.1.1. - [Release notes](https://github.com/ninja-build/ninja/releases) - [Commits](https://github.com/ninja-build/ninja/commits) --- updated-dependencies: - dependency-name: ninja dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index 099e7bc36..a5f76881a 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ cmake==3.27.6 -ninja==1.11.1 +ninja==1.11.1.1 From 893966d207bd98f3b728b93e1652a62a64b6fdfa Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 14 Oct 2023 11:32:56 +0200 Subject: [PATCH 083/112] chore(deps): update pre-commit hooks (#419) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v4.5.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 54e44d55a..bdfc9dc28 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ ci: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-added-large-files - id: check-case-conflict From 5bea667fff85174e1089a65237d24be1dbbd8496 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 14 Oct 2023 11:33:50 +0200 Subject: [PATCH 084/112] Update to CMake 3.27.7 (#418) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 940fa9e59..68a8ec0b6 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6.tar.gz") -set(unix_source_sha256 "ef3056df528569e0e8956f6cf38806879347ac6de6a4ff7e4105dc4578732cfb") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7.tar.gz") +set(unix_source_sha256 "08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6.zip") -set(windows_source_sha256 "a68d0b903b318c2b8edb9d78ed9e19fef697a023000b7776cafc6c3db704a504") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7.zip") +set(windows_source_sha256 "36c4e702b625a9781ee24ecdad5a3a87fb69c7774b82b5729cd0912fbe541166") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "a68d0b903b318c2b8edb9d78ed9e19fef697a023000b7776ca 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.27.6/cmake-3.27.6-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "26373a283daa8490d772dc8a179450cd6d391cb2a9db8d4242fe09e361efc42e") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "a8c92ecb139bcc7a1f92a8108179bd1d021bdb158a5ee759cba6d60010b83ae9") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "3977258c8d30f03f6506fdb12dac9b8570db7d5e54f541285ee540de433a9cff") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "4a366d07fbe0be7e1efcf0dbd743d09a5dc6609da79035e4036b12296ec679cf") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-windows-i386.zip") -set(win32_binary_sha256 "2bcbe76c0957fb059216bce499c27e4674eb60032f855eb2bc81dc6f2f6c0d6d") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-windows-i386.zip") +set(win32_binary_sha256 "e202611cda835c25523ae512c125fc897dfbc388f5d35e7ab62a94096f34ca9c") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-windows-x86_64.zip") -set(win64_binary_sha256 "f013a0cca091aa953f9a60a99292ec7a20ae3f9ceb05cb5c08ebe164097c526f") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-windows-x86_64.zip") +set(win64_binary_sha256 "5588e50030cda3e6fa96724444d8539916ac808d78d608cda6ae6ff7c4c4c9c8") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-windows-arm64.zip") -set(winarm64_binary_sha256 "980b7e532d77bfb4e5814c76403242c503019f1c0699440220cf2d527c8ff350") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-windows-arm64.zip") +set(winarm64_binary_sha256 "d9b19fd6830510022156621042759af2374111dc4f431b58c8828a17a68633dc") diff --git a/README.rst b/README.rst index 2f978a5f3..4750e30a3 100644 --- a/README.rst +++ b/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 3.27.6 `_. +The CMake python wheels provide `CMake 3.27.7 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 3d793a5f5..9f52fb734 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.27.6 `_. +The CMake python wheels provide `CMake 3.27.7 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 784b94420..d1ae0bc27 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.27.6 + $ release=3.27.7 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.6' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.7' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.6' - done - Updating 'CMakeUrls.cmake' with CMake version 3.27.6 - Updating 'CMakeUrls.cmake' with CMake version 3.27.6 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.7' - done + Updating 'CMakeUrls.cmake' with CMake version 3.27.7 + Updating 'CMakeUrls.cmake' with CMake version 3.27.7 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.27.6 + release=3.27.7 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 2032460e4..a9e60d724 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.27.6" + expected_version = "3.27.7" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From 2658652a24d5d212236fbe3011febd91c3cebd9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 13:29:36 +0200 Subject: [PATCH 085/112] chore(deps): bump cmake from 3.27.6 to 3.27.7 (#421) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.27.6 to 3.27.7. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.27.6...3.27.7) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index a5f76881a..aee724b36 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.27.6 +cmake==3.27.7 ninja==1.11.1.1 From 4998fcc577e0bc00e275aa2223ffb794b8f8e1ec Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Mon, 30 Oct 2023 06:54:58 +0100 Subject: [PATCH 086/112] Update to OpenSSL 3.0.12 (#425) --- scripts/manylinux-build-and-install-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/manylinux-build-and-install-openssl.sh b/scripts/manylinux-build-and-install-openssl.sh index ec105b726..dd89b6c8f 100755 --- a/scripts/manylinux-build-and-install-openssl.sh +++ b/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.0.11 -OPENSSL_HASH=b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55 +OPENSSL_ROOT=openssl-3.0.12 +OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 cd /tmp From f8b5b8bea8e6bcacc42ad0ef29873e506b39b67a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 06:55:27 +0100 Subject: [PATCH 087/112] chore(deps): update pre-commit hooks (#424) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.292 → v0.1.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.292...v0.1.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bdfc9dc28..8e96f3dde 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.292" + rev: "v0.1.1" hooks: - id: ruff args: [--fix, --show-fixes] From 745d0e7de68dc3a43dca41585c6ce5212a34aa18 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 2 Dec 2023 17:21:14 +0100 Subject: [PATCH 088/112] Update to CMake 3.27.8 (#428) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_distribution.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 68a8ec0b6..a8929d4db 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7.tar.gz") -set(unix_source_sha256 "08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8.tar.gz") +set(unix_source_sha256 "fece24563f697870fbb982ea8bf17482c9d5f855d8c9bf0b82463d76c9e8d0cc") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7.zip") -set(windows_source_sha256 "36c4e702b625a9781ee24ecdad5a3a87fb69c7774b82b5729cd0912fbe541166") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8.zip") +set(windows_source_sha256 "6ab05598f370ca68a174d9c879f4cb208f53e4af9f297483af306a40cbf7ec77") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "36c4e702b625a9781ee24ecdad5a3a87fb69c7774b82b5729c 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.27.7/cmake-3.27.7-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "a8c92ecb139bcc7a1f92a8108179bd1d021bdb158a5ee759cba6d60010b83ae9") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "dfedc30abe69dcabe326a4de632210bb52004185bd2c0b096c21924f4510681f") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "4a366d07fbe0be7e1efcf0dbd743d09a5dc6609da79035e4036b12296ec679cf") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "28e4864f6f736d53d77edfa1516947ec716950778ee2a486a250b928214078fd") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-windows-i386.zip") -set(win32_binary_sha256 "e202611cda835c25523ae512c125fc897dfbc388f5d35e7ab62a94096f34ca9c") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-windows-i386.zip") +set(win32_binary_sha256 "f40aa9f41279c861d8a78bf82ee0a3bf125481c97b2339c83cf772e7d8e3e909") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-windows-x86_64.zip") -set(win64_binary_sha256 "5588e50030cda3e6fa96724444d8539916ac808d78d608cda6ae6ff7c4c4c9c8") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-windows-x86_64.zip") +set(win64_binary_sha256 "53c6f57bda4a20e2a0515246a298e3c0784da3b687ef2a00a55bdcfad450998c") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-windows-arm64.zip") -set(winarm64_binary_sha256 "d9b19fd6830510022156621042759af2374111dc4f431b58c8828a17a68633dc") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-windows-arm64.zip") +set(winarm64_binary_sha256 "274661f38cf35c7af2096b5f5ac1bbdfc7c2f63e83416336d31debd4e1f0f6b7") diff --git a/README.rst b/README.rst index 4750e30a3..6599444d6 100644 --- a/README.rst +++ b/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 3.27.7 `_. +The CMake python wheels provide `CMake 3.27.8 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 9f52fb734..8ee48ccf9 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.27.7 `_. +The CMake python wheels provide `CMake 3.27.8 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index d1ae0bc27..72593ade9 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.27.7 + $ release=3.27.8 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.7' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.8' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.7' - done - Updating 'CMakeUrls.cmake' with CMake version 3.27.7 - Updating 'CMakeUrls.cmake' with CMake version 3.27.7 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.8' - done + Updating 'CMakeUrls.cmake' with CMake version 3.27.8 + Updating 'CMakeUrls.cmake' with CMake version 3.27.8 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.27.7 + release=3.27.8 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/tests/test_distribution.py b/tests/test_distribution.py index a9e60d724..838f4127a 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -9,7 +9,7 @@ def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.27.7" + expected_version = "3.27.8" for executable_name in ["cmake", "cpack", "ctest"]: output = virtualenv.run( From 725b039edb0deb3923b6232120059107a73e1e2b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 2 Dec 2023 11:34:29 -0500 Subject: [PATCH 089/112] chore(deps): update pre-commit hooks (#426) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.1.1 → v0.1.6](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.1...v0.1.6) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8e96f3dde..c6627344e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.1.1" + rev: "v0.1.6" hooks: - id: ruff args: [--fix, --show-fixes] From 1f252419872df28ac8cc1279979c9879c0952903 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 2 Dec 2023 17:35:11 +0100 Subject: [PATCH 090/112] doc: add a note about piwheels in the debug message (#394) --- setup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index d0434f8e2..0b625f8b4 100755 --- a/setup.py +++ b/setup.py @@ -109,11 +109,14 @@ def parse_requirements(filename): successfully install cmake: 1) Upgrade to the latest pip and try again. This will fix errors for most users. See: https://pip.pypa.io/en/stable/installing/#upgrading-pip - 2) If on Linux, with glibc < 2.12, you can set PIP_ONLY_BINARY=cmake in + 2) If running on Raspberry Pi OS, you can set PIP_ONLY_BINARY=cmake in + order to retrieve the latest wheels built by piwheels. + c.f. https://github.com/scikit-build/cmake-python-distributions/issues/392#issuecomment-1676284749 + 3) If on Linux, with glibc < 2.12, you can set PIP_ONLY_BINARY=cmake in order to retrieve the last manylinux1 compatible wheel. - 3) If on Linux, with glibc < 2.12, you can cap "cmake<3.23" in your + 4) If on Linux, with glibc < 2.12, you can cap "cmake<3.23" in your requirements in order to retrieve the last manylinux1 compatible wheel. - 4) Open an issue with the debug information that follows at + 5) Open an issue with the debug information that follows at https://github.com/scikit-build/cmake-python-distributions/issues """ ) From 8d1f63d488b4aaa24fa3b95f90a1275ff6705e39 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 2 Dec 2023 17:39:03 +0100 Subject: [PATCH 091/112] chore: move to setuptools_scm (#422) * chore: move to setuptools_scm * remove some missed versioneer related code --- .git_archival.txt | 4 + .gitattributes | 2 +- .gitignore | 6 + MANIFEST.in | 2 +- pyproject.toml | 6 +- setup.cfg | 7 - setup.py | 11 - src/cmake/__init__.py | 10 +- src/cmake/_version.py | 520 ------------ src/cmake/_version.pyi | 4 + versioneer.py | 1835 ---------------------------------------- 11 files changed, 28 insertions(+), 2379 deletions(-) create mode 100644 .git_archival.txt delete mode 100644 src/cmake/_version.py create mode 100644 src/cmake/_version.pyi delete mode 100644 versioneer.py diff --git a/.git_archival.txt b/.git_archival.txt new file mode 100644 index 000000000..8fb235d70 --- /dev/null +++ b/.git_archival.txt @@ -0,0 +1,4 @@ +node: $Format:%H$ +node-date: $Format:%cI$ +describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ +ref-names: $Format:%D$ diff --git a/.gitattributes b/.gitattributes index 72b70826c..00a7b00c9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -src/cmake/_version.py export-subst +.git_archival.txt export-subst diff --git a/.gitignore b/.gitignore index 18f666f1c..561347a16 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,9 @@ docs/_build # IDE junk .idea/* *.swp + +# Output from cibuildwheel +wheelhouse/ + +# Version +_version.py diff --git a/MANIFEST.in b/MANIFEST.in index 4da3d37a9..e060c63b0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,7 +9,7 @@ include LICENSE_BSD_3 recursive-exclude _skbuild * recursive-exclude CMake-src * -include versioneer.py include src/cmake/_version.py +include src/cmake/_version.pyi include src/cmake/__init__.pyi include src/cmake/py.typed diff --git a/pyproject.toml b/pyproject.toml index fb20c9391..f1106c5d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,9 +2,13 @@ requires = [ "scikit-build>=0.12", "setuptools>=42", + "setuptools-scm[toml]", ] build-backend = "setuptools.build_meta" +[tool.setuptools_scm] +write_to = "src/cmake/_version.py" + [tool.cibuildwheel] build = "cp39-*" before-all = [ @@ -83,7 +87,7 @@ unfixable = [ "T20", # Removes print statements "F841", # Removes unused variables ] -exclude = ["versioneer.py", "src/cmake/_version.py"] +exclude = ["src/cmake/_version.py"] flake8-unused-arguments.ignore-variadic-names = true [tool.ruff.per-file-ignores] diff --git a/setup.cfg b/setup.cfg index 6376f3192..0cd99068b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,10 +1,3 @@ [tool:pytest] testpaths = tests addopts = -v --cov --cov-report xml - -[versioneer] -VCS = git -versionfile_source = src/cmake/_version.py -versionfile_build = cmake/_version.py -style = pep440-post -tag_prefix = '' diff --git a/setup.py b/setup.py index 0b625f8b4..490ee7611 100755 --- a/setup.py +++ b/setup.py @@ -7,14 +7,6 @@ from skbuild import setup -# Add current folder to path -# This is required to import versioneer in an isolated pip build -# Prepending allows not to break on a non-isolated build when versioneer -# is already installed (c.f. https://github.com/scikit-build/cmake-python-distributions/issues/171) -sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) - -import versioneer # noqa: E402 - with open('README.rst', 'r') as fp: readme = fp.read() @@ -33,9 +25,6 @@ def parse_requirements(filename): setup( name='cmake', - version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), - author='Jean-Christophe Fillion-Robin', author_email='jchris.fillionr@kitware.com', diff --git a/src/cmake/__init__.py b/src/cmake/__init__.py index c4b717f1b..c0bff820b 100644 --- a/src/cmake/__init__.py +++ b/src/cmake/__init__.py @@ -3,10 +3,14 @@ import subprocess import sys -from ._version import get_versions +from ._version import version as __version__ + +__all__ = ["__version__", "CMAKE_DATA", "CMAKE_BIN_DIR", "CMAKE_DOC_DIR", "CMAKE_SHARE_DIR", "cmake", "cpack", "ctest"] + + +def __dir__(): + return __all__ -__version__ = get_versions()['version'] -del get_versions CMAKE_DATA = os.path.join(os.path.dirname(__file__), 'data') diff --git a/src/cmake/_version.py b/src/cmake/_version.py deleted file mode 100644 index 997684f1b..000000000 --- a/src/cmake/_version.py +++ /dev/null @@ -1,520 +0,0 @@ -# -*- coding: utf-8 -*- -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.17 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "$Format:%d$" - git_full = "$Format:%H$" - git_date = "$Format:%ci$" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "pep440-post" - cfg.tag_prefix = "" - cfg.parentdir_prefix = "None" - cfg.versionfile_source = "cmake/_version.py" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried {}".format(commands)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %s but none started with prefix %s" % - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = {r[len(TAG):] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = {r for r in refs if re.search(r'\d', r)} - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %s" % r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%s*" % tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%s'" - % describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" - % (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} diff --git a/src/cmake/_version.pyi b/src/cmake/_version.pyi new file mode 100644 index 000000000..91744f983 --- /dev/null +++ b/src/cmake/_version.pyi @@ -0,0 +1,4 @@ +from __future__ import annotations + +version: str +version_tuple: tuple[int, int, int] | tuple[int, int, int, str, str] diff --git a/versioneer.py b/versioneer.py deleted file mode 100644 index 875e2afa2..000000000 --- a/versioneer.py +++ /dev/null @@ -1,1835 +0,0 @@ -# -*- coding: utf-8 -*- -# Version: 0.17 - -"""The Versioneer - like a rocketeer, but for versions. - -The Versioneer -============== - -* like a rocketeer, but for versions! -* https://github.com/warner/python-versioneer -* Brian Warner -* License: Public Domain -* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, and pypy -* [![Latest Version] -(https://pypip.in/version/versioneer/badge.svg?style=flat) -](https://pypi.python.org/pypi/versioneer/) -* [![Build Status] -(https://travis-ci.org/warner/python-versioneer.png?branch=master) -](https://travis-ci.org/warner/python-versioneer) - -This is a tool for managing a recorded version number in distutils-based -python projects. The goal is to remove the tedious and error-prone "update -the embedded version string" step from your release process. Making a new -release should be as easy as recording a new tag in your version-control -system, and maybe making new tarballs. - - -## Quick Install - -* `pip install versioneer` to somewhere to your $PATH -* add a `[versioneer]` section to your setup.cfg (see below) -* run `versioneer install` in your source tree, commit the results - -## Version Identifiers - -Source trees come from a variety of places: - -* a version-control system checkout (mostly used by developers) -* a nightly tarball, produced by build automation -* a snapshot tarball, produced by a web-based VCS browser, like github's - "tarball from tag" feature -* a release tarball, produced by "setup.py sdist", distributed through PyPI - -Within each source tree, the version identifier (either a string or a number, -this tool is format-agnostic) can come from a variety of places: - -* ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows - about recent "tags" and an absolute revision-id -* the name of the directory into which the tarball was unpacked -* an expanded VCS keyword ($Id$, etc) -* a `_version.py` created by some earlier build step - -For released software, the version identifier is closely related to a VCS -tag. Some projects use tag names that include more than just the version -string (e.g. "myproject-1.2" instead of just "1.2"), in which case the tool -needs to strip the tag prefix to extract the version identifier. For -unreleased software (between tags), the version identifier should provide -enough information to help developers recreate the same tree, while also -giving them an idea of roughly how old the tree is (after version 1.2, before -version 1.3). Many VCS systems can report a description that captures this, -for example `git describe --tags --dirty --always` reports things like -"0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the -0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has -uncommitted changes. - -The version identifier is used for multiple purposes: - -* to allow the module to self-identify its version: `myproject.__version__` -* to choose a name and prefix for a 'setup.py sdist' tarball - -## Theory of Operation - -Versioneer works by adding a special `_version.py` file into your source -tree, where your `__init__.py` can import it. This `_version.py` knows how to -dynamically ask the VCS tool for version information at import time. - -`_version.py` also contains `$Revision$` markers, and the installation -process marks `_version.py` to have this marker rewritten with a tag name -during the `git archive` command. As a result, generated tarballs will -contain enough information to get the proper version. - -To allow `setup.py` to compute a version too, a `versioneer.py` is added to -the top level of your source tree, next to `setup.py` and the `setup.cfg` -that configures it. This overrides several distutils/setuptools commands to -compute the version when invoked, and changes `setup.py build` and `setup.py -sdist` to replace `_version.py` with a small static file that contains just -the generated version data. - -## Installation - -See [INSTALL.md](./INSTALL.md) for detailed installation instructions. - -## Version-String Flavors - -Code which uses Versioneer can learn about its version string at runtime by -importing `_version` from your main `__init__.py` file and running the -`get_versions()` function. From the "outside" (e.g. in `setup.py`), you can -import the top-level `versioneer.py` and run `get_versions()`. - -Both functions return a dictionary with different flavors of version -information: - -* `['version']`: A condensed version string, rendered using the selected - style. This is the most commonly used value for the project's version - string. The default "pep440" style yields strings like `0.11`, - `0.11+2.g1076c97`, or `0.11+2.g1076c97.dirty`. See the "Styles" section - below for alternative styles. - -* `['full-revisionid']`: detailed revision identifier. For Git, this is the - full SHA1 commit id, e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac". - -* `['date']`: Date and time of the latest `HEAD` commit. For Git, it is the - commit date in ISO 8601 format. This will be None if the date is not - available. - -* `['dirty']`: a boolean, True if the tree has uncommitted changes. Note that - this is only accurate if run in a VCS checkout, otherwise it is likely to - be False or None - -* `['error']`: if the version string could not be computed, this will be set - to a string describing the problem, otherwise it will be None. It may be - useful to throw an exception in setup.py if this is set, to avoid e.g. - creating tarballs with a version string of "unknown". - -Some variants are more useful than others. Including `full-revisionid` in a -bug report should allow developers to reconstruct the exact code being tested -(or indicate the presence of local changes that should be shared with the -developers). `version` is suitable for display in an "about" box or a CLI -`--version` output: it can be easily compared against release notes and lists -of bugs fixed in various releases. - -The installer adds the following text to your `__init__.py` to place a basic -version in `YOURPROJECT.__version__`: - - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - -## Styles - -The setup.cfg `style=` configuration controls how the VCS information is -rendered into a version string. - -The default style, "pep440", produces a PEP440-compliant string, equal to the -un-prefixed tag name for actual releases, and containing an additional "local -version" section with more detail for in-between builds. For Git, this is -TAG[+DISTANCE.gHEX[.dirty]] , using information from `git describe --tags ---dirty --always`. For example "0.11+2.g1076c97.dirty" indicates that the -tree is like the "1076c97" commit but has uncommitted changes (".dirty"), and -that this commit is two revisions ("+2") beyond the "0.11" tag. For released -software (exactly equal to a known tag), the identifier will only contain the -stripped tag, e.g. "0.11". - -Other styles are available. See details.md in the Versioneer source tree for -descriptions. - -## Debugging - -Versioneer tries to avoid fatal errors: if something goes wrong, it will tend -to return a version of "0+unknown". To investigate the problem, run `setup.py -version`, which will run the version-lookup code in a verbose mode, and will -display the full contents of `get_versions()` (including the `error` string, -which may help identify what went wrong). - -## Known Limitations - -Some situations are known to cause problems for Versioneer. This details the -most significant ones. More can be found on Github -[issues page](https://github.com/warner/python-versioneer/issues). - -### Subprojects - -Versioneer has limited support for source trees in which `setup.py` is not in -the root directory (e.g. `setup.py` and `.git/` are *not* siblings). The are -two common reasons why `setup.py` might not be in the root: - -* Source trees which contain multiple subprojects, such as - [Buildbot](https://github.com/buildbot/buildbot), which contains both - "master" and "slave" subprojects, each with their own `setup.py`, - `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI - distributions (and upload multiple independently-installable tarballs). -* Source trees whose main purpose is to contain a C library, but which also - provide bindings to Python (and perhaps other langauges) in subdirectories. - -Versioneer will look for `.git` in parent directories, and most operations -should get the right version string. However `pip` and `setuptools` have bugs -and implementation details which frequently cause `pip install .` from a -subproject directory to fail to find a correct version string (so it usually -defaults to `0+unknown`). - -`pip install --editable .` should work correctly. `setup.py install` might -work too. - -Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in -some later version. - -[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -this issue. The discussion in -[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -issue from the Versioneer side in more detail. -[pip PR#3176](https://github.com/pypa/pip/pull/3176) and -[pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -pip to let Versioneer work correctly. - -Versioneer-0.16 and earlier only looked for a `.git` directory next to the -`setup.cfg`, so subprojects were completely unsupported with those releases. - -### Editable installs with setuptools <= 18.5 - -`setup.py develop` and `pip install --editable .` allow you to install a -project into a virtualenv once, then continue editing the source code (and -test) without re-installing after every change. - -"Entry-point scripts" (`setup(entry_points={"console_scripts": ..})`) are a -convenient way to specify executable scripts that should be installed along -with the python package. - -These both work as expected when using modern setuptools. When using -setuptools-18.5 or earlier, however, certain operations will cause -`pkg_resources.DistributionNotFound` errors when running the entrypoint -script, which must be resolved by re-installing the package. This happens -when the install happens with one version, then the egg_info data is -regenerated while a different version is checked out. Many setup.py commands -cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into -a different virtualenv), so this can be surprising. - -[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -this one, but upgrading to a newer version of setuptools should probably -resolve it. - -### Unicode version strings - -While Versioneer works (and is continually tested) with both Python 2 and -Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. -Newer releases probably generate unicode version strings on py2. It's not -clear that this is wrong, but it may be surprising for applications when then -write these strings to a network connection or include them in bytes-oriented -APIs like cryptographic checksums. - -[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates -this question. - - -## Updating Versioneer - -To upgrade your project to a new release of Versioneer, do the following: - -* install the new Versioneer (`pip install -U versioneer` or equivalent) -* edit `setup.cfg`, if necessary, to include any new configuration settings - indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. -* re-run `versioneer install` in your source tree, to replace - `SRC/_version.py` -* commit any changed files - -## Future Directions - -This tool is designed to make it easily extended to other version-control -systems: all VCS-specific components are in separate directories like -src/git/ . The top-level `versioneer.py` script is assembled from these -components by running make-versioneer.py . In the future, make-versioneer.py -will take a VCS name as an argument, and will construct a version of -`versioneer.py` that is specific to the given VCS. It might also take the -configuration arguments that are currently provided manually during -installation by editing setup.py . Alternatively, it might go the other -direction and include code from all supported VCS systems, reducing the -number of intermediate scripts. - - -## License - -To make Versioneer easier to embed, all its code is dedicated to the public -domain. The `_version.py` that it creates is also in the public domain. -Specifically, both are released under the Creative Commons "Public Domain -Dedication" license (CC0-1.0), as described in -https://creativecommons.org/publicdomain/zero/1.0/ . - -""" - -from __future__ import print_function - -try: - import configparser -except ImportError: - import ConfigParser as configparser - -import errno -import json -import os -import re -import subprocess -import sys - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_root(): - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the - directory that contains setup.py, setup.cfg, and versioneer.py . - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - err = ("Versioneer was unable to run the project root directory. " - "Versioneer requires setup.py to be executed from " - "its immediate directory (like 'python setup.py COMMAND'), " - "or in a way that lets it use sys.argv[0] to find the root " - "(like 'python path/to/setup.py COMMAND').") - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools - # tree) execute all dependencies in a single python process, so - # "versioneer" may be imported multiple times, and python's shared - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. - me = os.path.realpath(os.path.abspath(__file__)) - me_dir = os.path.normcase(os.path.splitext(me)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) - if me_dir != vsr_dir: - print("Warning: build in %s is using versioneer.py from %s" - % (os.path.dirname(me), versioneer_py)) - except NameError: - pass - return root - - -def get_config_from_root(root): - """Read the project setup.cfg file to determine Versioneer config.""" - # This might raise EnvironmentError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . - setup_cfg = os.path.join(root, "setup.cfg") - parser = configparser.SafeConfigParser() - with open(setup_cfg, "r") as f: - parser.readfp(f) - VCS = parser.get("versioneer", "VCS") # mandatory - - def get(parser, name): - if parser.has_option("versioneer", name): - return parser.get("versioneer", name) - return None - cfg = VersioneerConfig() - cfg.VCS = VCS - cfg.style = get(parser, "style") or "" - cfg.versionfile_source = get(parser, "versionfile_source") - cfg.versionfile_build = get(parser, "versionfile_build") - cfg.tag_prefix = get(parser, "tag_prefix") - if cfg.tag_prefix in ("''", '""'): - cfg.tag_prefix = "" - cfg.parentdir_prefix = get(parser, "parentdir_prefix") - cfg.verbose = get(parser, "verbose") - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - -# these dictionaries contain VCS-specific tools -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried {}".format(commands)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode -LONG_VERSION_PY['git'] = r''' -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.17 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s" - git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s" - git_date = "%(DOLLAR)sFormat:%%ci%(DOLLAR)s" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "%(STYLE)s" - cfg.tag_prefix = "%(TAG_PREFIX)s" - cfg.parentdir_prefix = "%(PARENTDIR_PREFIX)s" - cfg.versionfile_source = "%(VERSIONFILE_SOURCE)s" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %%s" %% dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: - print("likely tags: %%s" %% ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %%s" %% r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%%s*" %% tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%%s' doesn't start with prefix '%%s'" - print(fmt %% (full_tag, tag_prefix)) - pieces["error"] = ("tag '%%s' doesn't start with prefix '%%s'" - %% (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%%d" %% pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%%d" %% pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%%s" %% pieces["short"] - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%%s" %% pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%%s'" %% style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} -''' - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = {r[len(TAG):] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = {r for r in refs if re.search(r'\d', r)} - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %s" % r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%s*" % tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%s'" - % describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" - % (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def do_vcs_install(manifest_in, versionfile_source, ipy): - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py - for export-subst keyword substitution. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - files = [manifest_in, versionfile_source] - if ipy: - files.append(ipy) - try: - me = __file__ - if me.endswith(".pyc") or me.endswith(".pyo"): - me = os.path.splitext(me)[0] + ".py" - versioneer_file = os.path.relpath(me) - except NameError: - versioneer_file = "versioneer.py" - files.append(versioneer_file) - present = False - try: - f = open(".gitattributes", "r") - for line in f.readlines(): - if line.strip().startswith(versionfile_source): - if "export-subst" in line.strip().split()[1:]: - present = True - f.close() - except EnvironmentError: - pass - if not present: - f = open(".gitattributes", "a+") - f.write("%s export-subst\n" % versionfile_source) - f.close() - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %s but none started with prefix %s" % - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - -SHORT_VERSION_PY = """ -# This file was generated by 'versioneer.py' (0.17) from -# revision-control system data, or from the parent directory name of an -# unpacked source archive. Distribution tarballs contain a pre-generated copy -# of this file. - -import json - -version_json = ''' -%s -''' # END VERSION_JSON - - -def get_versions(): - return json.loads(version_json) -""" - - -def versions_from_file(filename): - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() - except EnvironmentError: - raise NotThisMethod("unable to read _version.py") - mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) - if not mo: - mo = re.search(r"version_json = '''\r\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - -def write_to_version_file(filename, versions): - """Write the given version number to the given _version.py file.""" - os.unlink(filename) - contents = json.dumps(versions, sort_keys=True, - indent=1, separators=(",", ": ")) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set {} to '{}'".format(filename, versions["version"])) - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - if ".post" in rendered: - # update the existing post tag - start = rendered.index(".post") + 5 - if len(rendered) == start: - rendered += "%d" % pieces["distance"] - else: - end = start + 1 - while end <= len(rendered) and rendered[start:end].isdigit(): - end += 1 - end -= 1 - distance = pieces["distance"] - if start != end: - distance += int(rendered[start:end]) - rendered = rendered[:start] + "%d" % distance + rendered[end:] - else: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - -def get_versions(verbose=False): - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. - """ - if "versioneer" in sys.modules: - # see the discussion in cmdclass.py:get_cmdclass() - del sys.modules["versioneer"] - - root = get_root() - cfg = get_config_from_root(root) - - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS - verbose = verbose or cfg.verbose - assert cfg.versionfile_source is not None, \ - "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) - - # extract version from first of: _version.py, VCS command (e.g. 'git - # describe'), parentdir. This is meant to work for developers using a - # source checkout, for users of a tarball created by 'setup.py sdist', - # and for users of a tarball/zipball created by 'git archive' or github's - # download-from-tag feature or the equivalent in other VCSes. - - get_keywords_f = handlers.get("get_keywords") - from_keywords_f = handlers.get("keywords") - if get_keywords_f and from_keywords_f: - try: - keywords = get_keywords_f(versionfile_abs) - ver = from_keywords_f(keywords, cfg.tag_prefix, verbose) - if verbose: - print("got version from expanded keyword %s" % ver) - return ver - except NotThisMethod: - pass - - try: - ver = versions_from_file(versionfile_abs) - if verbose: - print("got version from file {} {}".format(versionfile_abs, ver)) - return ver - except NotThisMethod: - pass - - from_vcs_f = handlers.get("pieces_from_vcs") - if from_vcs_f: - try: - pieces = from_vcs_f(cfg.tag_prefix, root, verbose) - ver = render(pieces, cfg.style) - if verbose: - print("got version from VCS %s" % ver) - return ver - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - ver = versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - if verbose: - print("got version from parentdir %s" % ver) - return ver - except NotThisMethod: - pass - - if verbose: - print("unable to compute version") - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, "error": "unable to compute version", - "date": None} - - -def get_version(): - """Get the short version string for this project.""" - return get_versions()["version"] - - -def get_cmdclass(): - """Get the custom setuptools/distutils subclasses used by Versioneer.""" - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and - # 'easy_install .'), in which subdependencies of the main project are - # built (using setup.py bdist_egg) in the same python process. Assume - # a main project A and a dependency B, which use different versions - # of Versioneer. A's setup.py imports A's Versioneer, leaving it in - # sys.modules by the time B's setup.py is executed, causing B to run - # with the wrong versioneer. Setuptools wraps the sub-dep builds in a - # sandbox that restores sys.modules to it's pre-build state, so the - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. - # Also see https://github.com/warner/python-versioneer/issues/52 - - cmds = {} - - # we add "version" to both distutils and setuptools - from distutils.core import Command - - class cmd_version(Command): - description = "report generated version string" - user_options = [] - boolean_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) - print(" dirty: %s" % vers.get("dirty")) - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) - cmds["version"] = cmd_version - - # we override "build_py" in both distutils and setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py - # distutils/install -> distutils/build ->.. - # setuptools/bdist_wheel -> distutils/install ->.. - # setuptools/bdist_egg -> distutils/install_lib -> build_py - # setuptools/install -> bdist_egg ->.. - # setuptools/develop -> ? - # pip install: - # copies source tree to a tempdir before running egg_info/etc - # if .git isn't copied too, 'git describe' will fail - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - - # we override different "build_py" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.build_py import build_py as _build_py - else: - from distutils.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: - target_versionfile = os.path.join(self.build_lib, - cfg.versionfile_build) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - cmds["build_py"] = cmd_build_py - - if "cx_Freeze" in sys.modules: # cx_freeze enabled? - from cx_Freeze.dist import build_exe as _build_exe - - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ - # "version": versioneer.get_version().split("+", 1)[0], # FILEVERSION - # "product_version": versioneer.get_version(), - # ... - - class cmd_build_exe(_build_exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _build_exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - - if 'py2exe' in sys.modules: # py2exe enabled? - try: - from py2exe.distutils_buildexe import py2exe as _py2exe # py3 - except ImportError: - from py2exe.build_exe import py2exe as _py2exe # py2 - - class cmd_py2exe(_py2exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _py2exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - cmds["py2exe"] = cmd_py2exe - - # we override different "sdist" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.sdist import sdist as _sdist - else: - from distutils.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): - def run(self): - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old - # version - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - - def make_release_tree(self, base_dir, files): - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) - # now locate _version.py in the new base_dir directory - # (remembering that it may be a hardlink) and replace it with an - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, - self._versioneer_generated_versions) - cmds["sdist"] = cmd_sdist - - return cmds - - -CONFIG_ERROR = """ -setup.cfg is missing the necessary Versioneer configuration. You need -a section like: - - [versioneer] - VCS = git - style = pep440 - versionfile_source = src/myproject/_version.py - versionfile_build = myproject/_version.py - tag_prefix = - parentdir_prefix = myproject- - -You will also need to edit your setup.py to use the results: - - import versioneer - setup(version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), ...) - -Please read the docstring in ./versioneer.py for configuration instructions, -edit setup.cfg, and re-run the installer or 'python versioneer.py setup'. -""" - -SAMPLE_CONFIG = """ -# See the docstring in versioneer.py for instructions. Note that you must -# re-run 'versioneer.py setup' after changing this section, and commit the -# resulting files. - -[versioneer] -#VCS = git -#style = pep440 -#versionfile_source = -#versionfile_build = -#tag_prefix = -#parentdir_prefix = - -""" - -INIT_PY_SNIPPET = """ -from ._version import get_versions -__version__ = get_versions()['version'] -del get_versions -""" - - -def do_setup(): - """Main VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) - except (EnvironmentError, configparser.NoSectionError, - configparser.NoOptionError) as e: - if isinstance(e, (EnvironmentError, configparser.NoSectionError)): - print("Adding sample versioneer config to setup.cfg", - file=sys.stderr) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) - return 1 - - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - - ipy = os.path.join(os.path.dirname(cfg.versionfile_source), - "__init__.py") - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() - except EnvironmentError: - old = "" - if INIT_PY_SNIPPET not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: - f.write(INIT_PY_SNIPPET) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) - ipy = None - - # Make sure both the top-level "versioneer.py" and versionfile_source - # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so - # they'll be copied into source distributions. Pip won't be able to - # install the package without this. - manifest_in = os.path.join(root, "MANIFEST.in") - simple_includes = set() - try: - with open(manifest_in, "r") as f: - for line in f: - if line.startswith("include "): - for include in line.split()[1:]: - simple_includes.add(include) - except EnvironmentError: - pass - # That doesn't cover everything MANIFEST.in can do - # (http://docs.python.org/2/distutils/sourcedist.html#commands), so - # it might give some false negatives. Appending redundant 'include' - # lines is safe, though. - if "versioneer.py" not in simple_includes: - print(" appending 'versioneer.py' to MANIFEST.in") - with open(manifest_in, "a") as f: - f.write("include versioneer.py\n") - else: - print(" 'versioneer.py' already in MANIFEST.in") - if cfg.versionfile_source not in simple_includes: - print(" appending versionfile_source ('%s') to MANIFEST.in" % - cfg.versionfile_source) - with open(manifest_in, "a") as f: - f.write("include %s\n" % cfg.versionfile_source) - else: - print(" versionfile_source already in MANIFEST.in") - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. - do_vcs_install(manifest_in, cfg.versionfile_source, ipy) - return 0 - - -def scan_setup_py(): - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False - errors = 0 - with open("setup.py", "r") as f: - for line in f.readlines(): - if "import versioneer" in line: - found.add("import") - if "versioneer.get_cmdclass()" in line: - found.add("cmdclass") - if "versioneer.get_version()" in line: - found.add("get_version") - if "versioneer.VCS" in line: - setters = True - if "versioneer.versionfile_source" in line: - setters = True - if len(found) != 3: - print("") - print("Your setup.py appears to be missing some important items") - print("(but I might be wrong). Please make sure it has something") - print("roughly like the following:") - print("") - print(" import versioneer") - print(" setup( version=versioneer.get_version(),") - print(" cmdclass=versioneer.get_cmdclass(), ...)") - print("") - errors += 1 - if setters: - print("You should remove lines like 'versioneer.VCS = ' and") - print("'versioneer.versionfile_source = ' . This configuration") - print("now lives in setup.cfg, and should be removed from setup.py") - print("") - errors += 1 - return errors - -if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": - errors = do_setup() - errors += scan_setup_py() - if errors: - sys.exit(1) From 280260d5292728b624daeb0ec297fba23d241f94 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 2 Dec 2023 18:24:12 +0100 Subject: [PATCH 092/112] chore(ci): bump `test_sdist` python from 3.11 to 3.12 (#423) * chore(ci): bump `test_sdist` python from 3.11 to 3.12 * chore: remove test_distribution.py It was always skipped in CI tests and relies on plugins that do not support python 3.12. Remove the file and move the version check to test_cmake. --- .github/workflows/build.yml | 2 +- docs/update_cmake_version.rst | 6 ++-- noxfile.py | 2 +- pyproject.toml | 2 +- requirements-test.txt | 9 +----- scripts/update_cmake_version.py | 4 +-- tests/test_cmake.py | 32 ++++++++++++++++--- tests/test_distribution.py | 54 --------------------------------- 8 files changed, 37 insertions(+), 74 deletions(-) delete mode 100644 tests/test_distribution.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b645bb02b..331790218 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -171,7 +171,7 @@ jobs: strategy: fail-fast: false matrix: - python: ["2.7", "3.6", "3.11"] + python: ["2.7", "3.6", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 72593ade9..39de93b47 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -40,15 +40,15 @@ Classic procedure: Updating docs/index.rst - done Updating README.rst Updating README.rst - done - Updating tests/test_distribution.py - Updating tests/test_distribution.py - done + Updating tests/test_cmake.py + Updating tests/test_cmake.py - done 3. Create a topic named `update-to-cmake-X.Y.Z` and commit the changes. For example:: release=3.27.8 git switch -c update-to-cmake-$release - git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst + 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" 4. Push the topic and create a `Pull Request`. diff --git a/noxfile.py b/noxfile.py index f545dea56..f62621c87 100644 --- a/noxfile.py +++ b/noxfile.py @@ -119,7 +119,7 @@ def bump(session: nox.Session) -> None: "CMakeUrls.cmake", "docs/index.rst", "README.rst", - "tests/test_distribution.py", + "tests/test_cmake.py", "docs/update_cmake_version.rst", ) _bump(session, "CMake", "kitware/cmake", "", "scripts/update_cmake_version.py", files) diff --git a/pyproject.toml b/pyproject.toml index f1106c5d4..cd362b076 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ before-all = [ before-build = "pip install -r requirements-repair.txt" repair-wheel-command = "python scripts/repair_wheel.py -w {dest_dir} {wheel}" test-extras = "test" -test-command = "pytest --ignore={project}/tests/test_distribution.py {project}/tests" +test-command = "pytest {project}/tests" build-verbosity = "1" [tool.cibuildwheel.linux] diff --git a/requirements-test.txt b/requirements-test.txt index 0b2a7cf67..45923ba3f 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,11 +1,4 @@ coverage>=4.2 -flake8>=3.0.4 -path.py>=11.5.0 +importlib_metadata>=2.0 pytest>=3.0.3 pytest-cov>=2.4.0 -pytest-runner>=2.9 -pytest-virtualenv>=1.7.0 -scikit-build>=0.10.0 -setuptools>=28.0.0 -virtualenv>=15.0.3 -wheel diff --git a/scripts/update_cmake_version.py b/scripts/update_cmake_version.py index cbdcc3ae5..20785402e 100755 --- a/scripts/update_cmake_version.py +++ b/scripts/update_cmake_version.py @@ -184,7 +184,7 @@ def update_tests(version): pattern = re.compile(r'expected_version = "\d.(\d)+.\d"') replacement = 'expected_version = "%s"' % version _update_file( - os.path.join(ROOT_DIR, "tests/test_distribution.py"), pattern, replacement + os.path.join(ROOT_DIR, "tests/test_cmake.py"), pattern, replacement ) @@ -228,7 +228,7 @@ def main(): Complete! Now run: git switch -c update-to-cmake-{release} - git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst + 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}" gh pr create --fill --body "Created by update_cmake_version.py" """ diff --git a/tests/test_cmake.py b/tests/test_cmake.py index db4a0e5b9..f3cf2bdc2 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -1,12 +1,18 @@ # -*- coding: utf-8 -*- +import os +import subprocess +import sysconfig import textwrap import pytest +from importlib_metadata import distribution import cmake from . import push_argv +all_tools = pytest.mark.parametrize("tool", ["cmake", "cpack", "ctest"]) + def _run(program, args): func = getattr(cmake, program) @@ -16,10 +22,9 @@ def _run(program, args): assert excinfo.value.code == 0 -def test_cmake_module(): - _run("cmake", ["--version"]) - _run("cpack", ["--version"]) - _run("ctest", ["--version"]) +@all_tools +def test_cmake_module(tool): + _run(tool, ["--version"]) def test_cmake_https(tmpdir): @@ -43,3 +48,22 @@ def test_cmake_https(tmpdir): )) _run("cmake", ["-DTMP_DIR:PATH=%s" % str(tmpdir), "-P", str(test_script)]) + + +def _get_scripts(): + dist = distribution("cmake") + scripts_paths = [os.path.abspath(sysconfig.get_path("scripts", scheme)) for scheme in sysconfig.get_scheme_names()] + scripts = [] + for file in dist.files: + if os.path.abspath(str(file.locate().parent)) in scripts_paths: + scripts.append(file.locate().resolve(strict=True)) + return scripts + + +@all_tools +def test_cmake_script(tool): + expected_version = "3.27.8" + 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] == "{} version {}".format(tool, expected_version) diff --git a/tests/test_distribution.py b/tests/test_distribution.py deleted file mode 100644 index 838f4127a..000000000 --- a/tests/test_distribution.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -import os -import textwrap - -import pytest -from path import Path, matchers - -DIST_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '../dist')) - - -def _check_cmake_install(virtualenv, tmpdir): - expected_version = "3.27.8" - - for executable_name in ["cmake", "cpack", "ctest"]: - output = virtualenv.run( - "%s --version" % executable_name, capture=True).splitlines()[0] - assert output == "{} version {}".format(executable_name, expected_version) - - test_script = tmpdir.join("test_cmake.cmake") - test_script.write(textwrap.dedent(r""" - message("${CMAKE_COMMAND}") - """)) - - output = virtualenv.run("cmake -P %s" % str(test_script), capture=True) - expected = os.path.realpath(virtualenv.virtualenv).replace(os.sep, "/") - assert output[:len(expected)].lower() == expected.lower() - - -@pytest.mark.skipif(not Path(DIST_DIR).exists(), reason="dist directory does not exist") -def test_source_distribution(virtualenv, tmpdir): - sdists = Path(DIST_DIR).files(match=matchers.CaseInsensitive("*.tar.gz")) - if not sdists: - pytest.skip("no source distribution available") - assert len(sdists) == 1 - - if "SETUP_CMAKE_ARGS" in os.environ: - virtualenv.env["SKBUILD_CONFIGURE_OPTIONS"] = os.environ["SETUP_CMAKE_ARGS"] - virtualenv.run("pip install %s" % sdists[0]) - assert "cmake" in virtualenv.installed_packages() - - _check_cmake_install(virtualenv, tmpdir) - - -@pytest.mark.skipif(not Path(DIST_DIR).exists(), reason="dist directory does not exist") -def test_wheel(virtualenv, tmpdir): - wheels = Path(DIST_DIR).files(match="*.whl") - if not wheels: - pytest.skip("no wheel available") - assert len(wheels) == 1 - print(wheels) - - virtualenv.run("pip install %s" % wheels[0]) - - _check_cmake_install(virtualenv, tmpdir) From 7569137bf8207e8e91a2f1426b0aa348999f25a1 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 2 Dec 2023 23:15:27 +0100 Subject: [PATCH 093/112] Update to CMake 3.27.9 (#429) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_cmake.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index a8929d4db..5a2de4715 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8.tar.gz") -set(unix_source_sha256 "fece24563f697870fbb982ea8bf17482c9d5f855d8c9bf0b82463d76c9e8d0cc") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9.tar.gz") +set(unix_source_sha256 "609a9b98572a6a5ea477f912cffb973109ed4d0a6a6b3f9e2353d2cdc048708e") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8.zip") -set(windows_source_sha256 "6ab05598f370ca68a174d9c879f4cb208f53e4af9f297483af306a40cbf7ec77") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9.zip") +set(windows_source_sha256 "3047381cd5cb5f44818fe25aae44b1eb97f3cfd6e718ae168e2e8ae9967b9384") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "6ab05598f370ca68a174d9c879f4cb208f53e4af9f297483af 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.27.8/cmake-3.27.8-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "dfedc30abe69dcabe326a4de632210bb52004185bd2c0b096c21924f4510681f") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "72b01478eeb312bf1a0136208957784fe55a7b587f8d9f9142a7fc9b0b9e9a28") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "28e4864f6f736d53d77edfa1516947ec716950778ee2a486a250b928214078fd") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "2ced09b99b265d18c5e215984e5898b7e3a0cc7a1293c3f3b45e4bec87a46814") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-windows-i386.zip") -set(win32_binary_sha256 "f40aa9f41279c861d8a78bf82ee0a3bf125481c97b2339c83cf772e7d8e3e909") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-windows-i386.zip") +set(win32_binary_sha256 "7296b5a46eb53bfd0e0ff1d818067745cb831ab8d3cef9d266bfc842a435d515") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-windows-x86_64.zip") -set(win64_binary_sha256 "53c6f57bda4a20e2a0515246a298e3c0784da3b687ef2a00a55bdcfad450998c") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-windows-x86_64.zip") +set(win64_binary_sha256 "c14e8b5d1c7be0baf0e7936ce8b5a39c5ee3450b14d7e3b32435083eddd9aff7") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-windows-arm64.zip") -set(winarm64_binary_sha256 "274661f38cf35c7af2096b5f5ac1bbdfc7c2f63e83416336d31debd4e1f0f6b7") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-windows-arm64.zip") +set(winarm64_binary_sha256 "bca795134956264ede142f79aa513476985f4f410f6501a727d602760e9212dd") diff --git a/README.rst b/README.rst index 6599444d6..9c5f4ae77 100644 --- a/README.rst +++ b/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 3.27.8 `_. +The CMake python wheels provide `CMake 3.27.9 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 8ee48ccf9..2947659ff 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.27.8 `_. +The CMake python wheels provide `CMake 3.27.9 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 39de93b47..b99179cc6 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.27.8 + $ release=3.27.9 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.8' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.9' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.8' - done - Updating 'CMakeUrls.cmake' with CMake version 3.27.8 - Updating 'CMakeUrls.cmake' with CMake version 3.27.8 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.9' - done + Updating 'CMakeUrls.cmake' with CMake version 3.27.9 + Updating 'CMakeUrls.cmake' with CMake version 3.27.9 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.27.8 + release=3.27.9 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" diff --git a/tests/test_cmake.py b/tests/test_cmake.py index f3cf2bdc2..320a4da61 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -62,7 +62,7 @@ def _get_scripts(): @all_tools def test_cmake_script(tool): - expected_version = "3.27.8" + expected_version = "3.27.9" 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") From 90f207394d11afee802920d3e54e6542a7afcdbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 09:24:40 +0100 Subject: [PATCH 094/112] chore(deps): bump cmake from 3.27.7 to 3.27.9 (#430) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.27.7 to 3.27.9. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.27.7...3.27.9) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index aee724b36..91a91fec6 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.27.7 +cmake==3.27.9 ninja==1.11.1.1 From 6c1ddf43bdea9785e0affb0b804ae542fa33bfa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 08:21:37 +0100 Subject: [PATCH 095/112] chore(deps): bump actions/setup-python from 4 to 5 (#431) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 331790218..9dabfafb2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: pre-commit/action@v3.0.0 @@ -175,7 +175,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 if: matrix.python != '2.7' name: Install Python ${{ matrix.python }} with: From 2b7878d727603addecae8a3073963383ef910e2c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 21:44:50 +0000 Subject: [PATCH 096/112] chore(deps): update pre-commit hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.1.6 → v0.1.7](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.6...v0.1.7) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c6627344e..cbb597804 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.1.6" + rev: "v0.1.7" hooks: - id: ruff args: [--fix, --show-fixes] From 6cdbf6237d6ba0d82d0aec5bb053d570db6c7c28 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Wed, 13 Dec 2023 00:22:01 -0500 Subject: [PATCH 097/112] Update to CMake 3.28.0 --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_cmake.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 5a2de4715..96dc18dbc 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9.tar.gz") -set(unix_source_sha256 "609a9b98572a6a5ea477f912cffb973109ed4d0a6a6b3f9e2353d2cdc048708e") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0.tar.gz") +set(unix_source_sha256 "e1dcf9c817ae306e73a45c2ba6d280c65cf4ec00dd958eb144adaf117fb58e71") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9.zip") -set(windows_source_sha256 "3047381cd5cb5f44818fe25aae44b1eb97f3cfd6e718ae168e2e8ae9967b9384") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0.zip") +set(windows_source_sha256 "84f5fde50154b8e64dd02de578f4f0b24d9edb43c22323ca9b631f1cbe4e9a40") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "3047381cd5cb5f44818fe25aae44b1eb97f3cfd6e718ae168e 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.27.9/cmake-3.27.9-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "72b01478eeb312bf1a0136208957784fe55a7b587f8d9f9142a7fc9b0b9e9a28") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "898f0b5ca6e2ea5286998e97bd33f030d7d09f18ca4b88be661fdfbad5dadd88") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "2ced09b99b265d18c5e215984e5898b7e3a0cc7a1293c3f3b45e4bec87a46814") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "3880f8c0ba174c3ae7ca4dec015dcd5b5b32cbb88661e49870baa975563855df") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-windows-i386.zip") -set(win32_binary_sha256 "7296b5a46eb53bfd0e0ff1d818067745cb831ab8d3cef9d266bfc842a435d515") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-windows-i386.zip") +set(win32_binary_sha256 "3a08a671e67168acefe533c212592d02b57224a215689725d9a60bd6320a1abb") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-windows-x86_64.zip") -set(win64_binary_sha256 "c14e8b5d1c7be0baf0e7936ce8b5a39c5ee3450b14d7e3b32435083eddd9aff7") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-windows-x86_64.zip") +set(win64_binary_sha256 "3096d5d708476cfe37f6c64da480b974f29c01bf5baae314c679c1e2fde8994f") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-windows-arm64.zip") -set(winarm64_binary_sha256 "bca795134956264ede142f79aa513476985f4f410f6501a727d602760e9212dd") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-windows-arm64.zip") +set(winarm64_binary_sha256 "91d36cfa2c1df7a638d68bf84b33a1d56131cd497275c5192826991e28a3a737") diff --git a/README.rst b/README.rst index 9c5f4ae77..6e18ae0d5 100644 --- a/README.rst +++ b/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 3.27.9 `_. +The CMake python wheels provide `CMake 3.28.0 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 2947659ff..898bd2afc 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.27.9 `_. +The CMake python wheels provide `CMake 3.28.0 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index b99179cc6..cb14f1417 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.27.9 + $ release=3.28.0 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.9' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.0' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.27.9' - done - Updating 'CMakeUrls.cmake' with CMake version 3.27.9 - Updating 'CMakeUrls.cmake' with CMake version 3.27.9 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.0' - done + Updating 'CMakeUrls.cmake' with CMake version 3.28.0 + Updating 'CMakeUrls.cmake' with CMake version 3.28.0 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.27.9 + release=3.28.0 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" diff --git a/tests/test_cmake.py b/tests/test_cmake.py index 320a4da61..27699c82d 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -62,7 +62,7 @@ def _get_scripts(): @all_tools def test_cmake_script(tool): - expected_version = "3.27.9" + expected_version = "3.28.0" 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") From bef410e79a5b27f5318550513fe8c629e195040e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 02:31:40 +0000 Subject: [PATCH 098/112] chore(deps): bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9dabfafb2..432de503b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -197,7 +197,7 @@ jobs: sudo apt-get install -y --no-install-recommends libssl-dev pip install -r requirements-test.txt - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist @@ -217,7 +217,7 @@ jobs: needs: [build_wheels, build_manylinux2010_wheels, build_sdist, test_sdist] runs-on: ubuntu-22.04 steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist @@ -235,7 +235,7 @@ jobs: permissions: id-token: write steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist From adbc86e63dce0f04b1c8de0cb23fab2c673f6e0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 02:31:36 +0000 Subject: [PATCH 099/112] chore(deps): bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 432de503b..ce1f75b93 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,7 +114,7 @@ jobs: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-${{ matrix.build }}*" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) with: path: ./wheelhouse/*.whl @@ -143,7 +143,7 @@ jobs: CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2010" CIBW_MANYLINUX_I686_IMAGE: "manylinux2010" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl @@ -159,7 +159,7 @@ jobs: - name: Build SDist run: pipx run build --sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: dist/*.tar.gz From 83a0f29a1249ef8e18a01d7fac6424e57c99cad8 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 15 Dec 2023 10:35:25 -0500 Subject: [PATCH 100/112] ci: support artifact v4 (#438) * ci: support artifact v4 Signed-off-by: Henry Schreiner * Update .github/workflows/build.yml --------- Signed-off-by: Henry Schreiner --- .github/workflows/build.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce1f75b93..22853157c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,6 +117,7 @@ jobs: - uses: actions/upload-artifact@v4 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) with: + name: Wheel-${{ matrix.os }}-${{ matrix.build }}${{ matrix.arch }} path: ./wheelhouse/*.whl build_manylinux2010_wheels: @@ -145,6 +146,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: Wheel-manylinux2010-${{ matrix.arch }} path: ./wheelhouse/*.whl build_sdist: @@ -161,6 +163,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: SDist path: dist/*.tar.gz test_sdist: @@ -199,7 +202,7 @@ jobs: - uses: actions/download-artifact@v4 with: - name: artifact + name: SDist path: dist - name: Install SDist @@ -219,10 +222,9 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: artifact - path: dist + path: all - - run: pipx run twine check --strict dist/* + - run: pipx run twine check --strict all/*/* upload_pypi: name: Upload to PyPI @@ -237,7 +239,11 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: artifact - path: dist + path: all + + - name: Merge files + run: | + mkdir dist + mv all/*/* dist/. - uses: pypa/gh-action-pypi-publish@release/v1 From ca122248526ea6c0baf1b8cd6914784c0c624263 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 15 Dec 2023 11:24:03 -0500 Subject: [PATCH 101/112] Update to CMake 3.28.1 (#439) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_cmake.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 96dc18dbc..96aa2dcbb 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0.tar.gz") -set(unix_source_sha256 "e1dcf9c817ae306e73a45c2ba6d280c65cf4ec00dd958eb144adaf117fb58e71") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1.tar.gz") +set(unix_source_sha256 "15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0.zip") -set(windows_source_sha256 "84f5fde50154b8e64dd02de578f4f0b24d9edb43c22323ca9b631f1cbe4e9a40") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1.zip") +set(windows_source_sha256 "6ffbd594f32eca54320cc9f58b1d82a8a9f696803a4623fe6e157e931ea699ee") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "84f5fde50154b8e64dd02de578f4f0b24d9edb43c22323ca9b 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.28.0/cmake-3.28.0-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "898f0b5ca6e2ea5286998e97bd33f030d7d09f18ca4b88be661fdfbad5dadd88") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "f76398c24362ad87bad1a3d6f1e8f4377632b5b1c360c4ba1fd7cd205fd9d8d4") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "3880f8c0ba174c3ae7ca4dec015dcd5b5b32cbb88661e49870baa975563855df") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "f2d296294921b209d9c7edbc12ce175e00644fcabba362b6a24c32b0a4624a9a") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-windows-i386.zip") -set(win32_binary_sha256 "3a08a671e67168acefe533c212592d02b57224a215689725d9a60bd6320a1abb") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-windows-i386.zip") +set(win32_binary_sha256 "e9591cfdb1d394eee84acdecf880cbd91cf0707dfd0d58bf3796b88475f46cb9") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-windows-x86_64.zip") -set(win64_binary_sha256 "3096d5d708476cfe37f6c64da480b974f29c01bf5baae314c679c1e2fde8994f") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-windows-x86_64.zip") +set(win64_binary_sha256 "671332249bc7cc7424523d6c2b5edd3e3de90a43b8b82e8782f42da4fe4c562d") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-windows-arm64.zip") -set(winarm64_binary_sha256 "91d36cfa2c1df7a638d68bf84b33a1d56131cd497275c5192826991e28a3a737") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-windows-arm64.zip") +set(winarm64_binary_sha256 "a839b8d32c11b24f078142b5b8c3361a955ebc65788f0f0353b2121fe2f74e49") diff --git a/README.rst b/README.rst index 6e18ae0d5..1bc3e4c98 100644 --- a/README.rst +++ b/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 3.28.0 `_. +The CMake python wheels provide `CMake 3.28.1 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 898bd2afc..3237ced86 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.28.0 `_. +The CMake python wheels provide `CMake 3.28.1 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index cb14f1417..77aa66603 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.28.0 + $ release=3.28.1 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.0' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.1' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.0' - done - Updating 'CMakeUrls.cmake' with CMake version 3.28.0 - Updating 'CMakeUrls.cmake' with CMake version 3.28.0 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.1' - done + Updating 'CMakeUrls.cmake' with CMake version 3.28.1 + Updating 'CMakeUrls.cmake' with CMake version 3.28.1 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.28.0 + release=3.28.1 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" diff --git a/tests/test_cmake.py b/tests/test_cmake.py index 27699c82d..5153555c0 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -62,7 +62,7 @@ def _get_scripts(): @all_tools def test_cmake_script(tool): - expected_version = "3.28.0" + expected_version = "3.28.1" 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") From da0ce5c7cd161d73d8ddcd9519b73ee97c616322 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:51:39 +0100 Subject: [PATCH 102/112] chore(deps): bump cmake from 3.27.9 to 3.28.1 (#440) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.27.9 to 3.28.1. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.27.9...3.28.1) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index 91a91fec6..6fdca89c8 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.27.9 +cmake==3.28.1 ninja==1.11.1.1 From 596be8cb588e4e7540bf287c07dfdfb1336bea3d Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 22 Dec 2023 23:29:28 -0500 Subject: [PATCH 103/112] ci: group dependabot updates (#442) Signed-off-by: Henry Schreiner --- .github/dependabot.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b39bdb44d..b6deae14d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,7 +4,11 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "daily" + interval: "weekly" + groups: + actions: + patterns: + - "*" # Maintain dependencies for pip constraints-ci.txt - package-ecosystem: "pip" directory: "/" From eeeb98341091cfb8fe4cade5a1ae1d90b382ccfd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 19:05:22 +0100 Subject: [PATCH 104/112] chore(deps): update pre-commit hooks (#441) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.1.7 → v0.1.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.7...v0.1.9) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cbb597804..8c10e92d4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.1.7" + rev: "v0.1.9" hooks: - id: ruff args: [--fix, --show-fixes] From 4d0377a43fbf4aee3d48d083c3fe890f57449139 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 20:33:07 +0100 Subject: [PATCH 105/112] chore(deps): bump the actions group with 1 update (#447) Bumps the actions group with 1 update: [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel). Updates `pypa/cibuildwheel` from 2.16.2 to 2.16.5 - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.16.2...v2.16.5) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22853157c..518c5a373 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.16.5 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -137,7 +137,7 @@ jobs: fetch-depth: 0 # required for versioneer to find tags - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_ARCHS: "${{ matrix.arch }}" CIBW_BUILD: "cp39-manylinux_*" From dcdfbe5a9f20d11cd089524e8ec69d1e5d6faea6 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Thu, 8 Feb 2024 21:06:08 +0100 Subject: [PATCH 106/112] Update to OpenSSL 3.0.13 (#448) --- scripts/manylinux-build-and-install-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/manylinux-build-and-install-openssl.sh b/scripts/manylinux-build-and-install-openssl.sh index dd89b6c8f..713594818 100755 --- a/scripts/manylinux-build-and-install-openssl.sh +++ b/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.0.12 -OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 +OPENSSL_ROOT=openssl-3.0.13 +OPENSSL_HASH=88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 cd /tmp From eb51b1ee10c8f771864f8b519e306a48b5c818b5 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Thu, 8 Feb 2024 21:31:06 +0100 Subject: [PATCH 107/112] chore(ci): use 4 threads to compile on GHA (#449) --- CMakeLists.txt | 7 ++++++- pyproject.toml | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fa5ff2c1..1201904a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,10 +286,15 @@ set(CMAKE_EXE_LINKER_FLAGS \"-lstdc++ -lgcc -lrt\" CACHE STRING \"Initial cache\ endif() if(RUN_CMAKE_TEST) + include(ProcessorCount) + ProcessorCount(NB_CPU) + if(NB_CPU EQUAL 0) + set(NB_CPU 2) + endif() ExternalProject_Add_Step(CMakeProject-build run_cmake_test_suite DEPENDEES ${CMAKEPROJECT_BUILD_LAST_STEP} COMMENT "Running CMake test suite, exclusion list: '${RUN_CMAKE_TEST_EXCLUDE}'" - COMMAND ./bin/ctest --force-new-ctest-process --stop-on-failure --output-on-failure -j2 -E ${RUN_CMAKE_TEST_EXCLUDE} + COMMAND ./bin/ctest --force-new-ctest-process --stop-on-failure --output-on-failure -j${NB_CPU} -E ${RUN_CMAKE_TEST_EXCLUDE} WORKING_DIRECTORY ${CMakeProject_BINARY_DIR} USES_TERMINAL 1 ) diff --git a/pyproject.toml b/pyproject.toml index cd362b076..a4c142e09 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,24 +31,24 @@ before-all = [ 'ninja --version', './scripts/manylinux-build-and-install-openssl.sh', ] -environment = { SKBUILD_CONFIGURE_OPTIONS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=2;link=1 -DCMAKE_CXX_STANDARD:STRING=11" } +environment = { SKBUILD_CONFIGURE_OPTIONS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=4;link=1 -DCMAKE_CXX_STANDARD:STRING=11" } [[tool.cibuildwheel.overrides]] select = ["*-manylinux_aarch64", "*-manylinux_ppc64le", "*-manylinux_s390x"] # disable tests on those platforms, QEMU is taking to long for jobs to pass on GHA -environment = { SKBUILD_CONFIGURE_OPTIONS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=2;link=1 -DCMAKE_CXX_STANDARD:STRING=11 -DRUN_CMAKE_TEST:BOOL=OFF" } +environment = { SKBUILD_CONFIGURE_OPTIONS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=4;link=1 -DCMAKE_CXX_STANDARD:STRING=11 -DRUN_CMAKE_TEST:BOOL=OFF" } [[tool.cibuildwheel.overrides]] select = ["*-musllinux_x86_64", "*-musllinux_i686"] # disable some tests # - BootstrapTest fails with custom OpenSSL and probably does not make much sense for this project # - ExportImport|RunCMake.install|RunCMake.file-GET_RUNTIME_DEPENDENCIES: c.f. https://discourse.cmake.org/t/cmake-test-suite-failing-on-alpine-linux/5064 -environment = { SKBUILD_CONFIGURE_OPTIONS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=2;link=1 -DRUN_CMAKE_TEST_EXCLUDE:STRING='BootstrapTest|ExportImport|RunCMake.install|RunCMake.file-GET_RUNTIME_DEPENDENCIES'" } +environment = { SKBUILD_CONFIGURE_OPTIONS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=4;link=1 -DRUN_CMAKE_TEST_EXCLUDE:STRING='BootstrapTest|ExportImport|RunCMake.install|RunCMake.file-GET_RUNTIME_DEPENDENCIES'" } [[tool.cibuildwheel.overrides]] select = ["*-musllinux_aarch64", "*-musllinux_ppc64le", "*-musllinux_s390x"] # disable tests on those platforms, QEMU is taking to long for jobs to pass on GHA -environment = { SKBUILD_CONFIGURE_OPTIONS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=2;link=1 -DRUN_CMAKE_TEST:BOOL=OFF" } +environment = { SKBUILD_CONFIGURE_OPTIONS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=4;link=1 -DRUN_CMAKE_TEST:BOOL=OFF" } [tool.cibuildwheel.macos.environment] MACOSX_DEPLOYMENT_TARGET = "10.10" From f9464063a1db4051e80f8d8368e4aa2309096a6c Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Thu, 8 Feb 2024 21:59:06 +0100 Subject: [PATCH 108/112] Update to CMake 3.28.3 (#450) --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/update_cmake_version.rst | 12 ++++++------ tests/test_cmake.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 96aa2dcbb..1445877a0 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1.tar.gz") -set(unix_source_sha256 "15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3.tar.gz") +set(unix_source_sha256 "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1.zip") -set(windows_source_sha256 "6ffbd594f32eca54320cc9f58b1d82a8a9f696803a4623fe6e157e931ea699ee") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3.zip") +set(windows_source_sha256 "b54943b9c98ac66061e9b97fd630b3f06a75a85143a561ef2dca88aa0e042c60") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "6ffbd594f32eca54320cc9f58b1d82a8a9f696803a4623fe6e 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.28.1/cmake-3.28.1-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "f76398c24362ad87bad1a3d6f1e8f4377632b5b1c360c4ba1fd7cd205fd9d8d4") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "804d231460ab3c8b556a42d2660af4ac7a0e21c98a7f8ee3318a74b4a9a187a6") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "f2d296294921b209d9c7edbc12ce175e00644fcabba362b6a24c32b0a4624a9a") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "5541339751cb96d1b03eb3244df7e750cd4e1dcb361ebbd68a179493dfccc5bf") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-windows-i386.zip") -set(win32_binary_sha256 "e9591cfdb1d394eee84acdecf880cbd91cf0707dfd0d58bf3796b88475f46cb9") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-windows-i386.zip") +set(win32_binary_sha256 "411812b6b29ac793faf69bdbd36c612f72659363c5491b9f0a478915db3fc58c") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-windows-x86_64.zip") -set(win64_binary_sha256 "671332249bc7cc7424523d6c2b5edd3e3de90a43b8b82e8782f42da4fe4c562d") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-windows-x86_64.zip") +set(win64_binary_sha256 "cac7916f7e1e73a25de857704c94fd5b72ba9fe2f055356b5602d2f960e50e5b") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-windows-arm64.zip") -set(winarm64_binary_sha256 "a839b8d32c11b24f078142b5b8c3361a955ebc65788f0f0353b2121fe2f74e49") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-windows-arm64.zip") +set(winarm64_binary_sha256 "cfe023b7e82812ef802fb1ec619f6cfa2fdcb58ee61165fc315086286fe9cdcc") diff --git a/README.rst b/README.rst index 1bc3e4c98..f16fb16bc 100644 --- a/README.rst +++ b/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 3.28.1 `_. +The CMake python wheels provide `CMake 3.28.3 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 3237ced86..f0cb1cf9a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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 `_ and `VTK `_. -The CMake python wheels provide `CMake 3.28.1 `_. +The CMake python wheels provide `CMake 3.28.3 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 77aa66603..be0f2daf8 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -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.28.1 + $ release=3.28.3 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.1' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.3' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.1' - done - Updating 'CMakeUrls.cmake' with CMake version 3.28.1 - Updating 'CMakeUrls.cmake' with CMake version 3.28.1 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.3' - done + Updating 'CMakeUrls.cmake' with CMake version 3.28.3 + Updating 'CMakeUrls.cmake' with CMake version 3.28.3 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -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.28.1 + release=3.28.3 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" diff --git a/tests/test_cmake.py b/tests/test_cmake.py index 5153555c0..3781e286c 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -62,7 +62,7 @@ def _get_scripts(): @all_tools def test_cmake_script(tool): - expected_version = "3.28.1" + expected_version = "3.28.3" 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") From 5ec8d552ddb1e09846910d244aaef00a7c3f3521 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 07:32:09 +0100 Subject: [PATCH 109/112] chore(deps): bump the actions group with 1 update (#453) Bumps the actions group with 1 update: [pre-commit/action](https://github.com/pre-commit/action). Updates `pre-commit/action` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/pre-commit/action/releases) - [Commits](https://github.com/pre-commit/action/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: pre-commit/action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 518c5a373..151953759 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.x" - - uses: pre-commit/action@v3.0.0 + - uses: pre-commit/action@v3.0.1 build_wheels: From 9e81ac3a30ebda0ac2a732a9727f5591bdae9d2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 07:32:22 +0100 Subject: [PATCH 110/112] chore(deps): bump cmake from 3.28.1 to 3.28.3 (#452) Bumps [cmake](https://github.com/scikit-build/cmake-python-distributions) from 3.28.1 to 3.28.3. - [Release notes](https://github.com/scikit-build/cmake-python-distributions/releases) - [Changelog](https://github.com/scikit-build/cmake-python-distributions/blob/master/HISTORY.rst) - [Commits](https://github.com/scikit-build/cmake-python-distributions/compare/3.28.1...3.28.3) --- updated-dependencies: - dependency-name: cmake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- constraints-ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints-ci.txt b/constraints-ci.txt index 6fdca89c8..d7fc56496 100644 --- a/constraints-ci.txt +++ b/constraints-ci.txt @@ -1,2 +1,2 @@ -cmake==3.28.1 +cmake==3.28.3 ninja==1.11.1.1 From 89af5c4a75882093a8d00bf90d81ff9215312381 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 07:49:53 +0100 Subject: [PATCH 111/112] chore(deps): update pre-commit hooks (#443) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.1.9 → v0.2.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.9...v0.2.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8c10e92d4..69e366460 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: fix-encoding-pragma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.1.9" + rev: "v0.2.1" hooks: - id: ruff args: [--fix, --show-fixes] From 30a96f66e3aeea2be72d517d415f2fb19542485f Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 14 Feb 2024 12:40:38 -0500 Subject: [PATCH 112/112] docs: fix up docs (#454) * docs: fix up docs Signed-off-by: Henry Schreiner * style: pre-commit fixes * chore: clean up a few things Signed-off-by: Henry Schreiner --------- Signed-off-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++++ .readthedocs.yaml | 16 +++++++++++++ CONTRIBUTING.rst | 2 +- HISTORY.rst | 2 +- README.rst | 12 +++++----- docs/build_system.rst | 10 ++------ docs/building.rst | 2 +- docs/conf.py | 4 ++-- docs/index.rst | 10 ++++---- docs/make.bat | 2 +- docs/make_a_release.rst | 2 +- docs/requirements-docs.txt | 5 ++-- noxfile.py | 48 +++++++++++++++++++++++++++---------- pyproject.toml | 20 +++++++--------- 14 files changed, 87 insertions(+), 52 deletions(-) create mode 100644 .readthedocs.yaml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 151953759..bafa91a39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,10 @@ on: tags: - "*.*.*" +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: USE_QEMU: ${{ fromJSON(github.event.inputs.use_qemu || 'false') || (github.event_name == 'schedule') || startsWith(github.ref, 'refs/tags/') }} diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 000000000..219a9bacb --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,16 @@ +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +version: 2 + +sphinx: + configuration: docs/conf.py + +build: + os: ubuntu-22.04 + tools: + python: "3.12" + +python: + install: + - requirements: docs/requirements-docs.txt diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 26b71f992..3918d8abc 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -103,7 +103,7 @@ Before you submit a pull request, check that it meets these guidelines: feature to the list in `README.rst`. 3. The pull request should work for Python 2.7, and 3.6+. - Check `GitHub Actions https://github.com/scikit-build/cmake-python-distributions/actions/workflows/build.yml`_ + Check `GitHub Actions `_ and make sure that the tests pass for all supported Python versions. diff --git a/HISTORY.rst b/HISTORY.rst index 3c3fc15cc..f365f6c72 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,4 +5,4 @@ History cmake-python-distributions was initially developed in September 2016 by Jean-Christophe Fillion-Robin to facilitate the distribution of project using -`scikit-build `_ and depending on CMake. +`scikit-build `_ and depending on CMake. diff --git a/README.rst b/README.rst index f16fb16bc..7879b8cdb 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ CMake Python Distributions ========================== -`CMake `_ is used to control the software compilation +`CMake `_ is used to control the software compilation process using simple platform and compiler independent configuration files, and generate native makefiles and workspaces that can be used in the compiler environment of your choice. @@ -74,14 +74,14 @@ The last version to provide ``manylinux1`` wheels was ``3.22.x``. Maintainers ----------- -* `How to update CMake version? `_ +* `How to update CMake version? `_ -* `How to make a release? `_ +* `How to make a release? `_ Miscellaneous ------------- -* Documentation: http://cmake-python-distributions.readthedocs.io/en/latest/ +* Documentation: https://cmake-python-distributions.readthedocs.io/en/latest/ * Source code: https://github.com/scikit-build/cmake-python-distributions * Mailing list: https://groups.google.com/forum/#!forum/scikit-build @@ -89,7 +89,7 @@ License ------- This project is maintained by Jean-Christophe Fillion-Robin from Kitware Inc. -It is covered by the `Apache License, Version 2.0 `_. +It is covered by the `Apache License, Version 2.0 `_. CMake is distributed under the OSI-approved BSD 3-clause License. -For more information about CMake, visit http://cmake.org +For more information about CMake, visit https://cmake.org diff --git a/docs/build_system.rst b/docs/build_system.rst index 4a2960a78..33b92724a 100644 --- a/docs/build_system.rst +++ b/docs/build_system.rst @@ -2,12 +2,8 @@ Understanding the Build-system ============================== -CMakeLists.txt --------------- -.. _CMakeLists: https://github.com/scikit-build/cmake-python-distributions/blob/master/CMakeLists.txt - -The build system is described by the `CMakeLists.txt `_ and is composed of few projects each responsible +The build system is described by the ``CMakeLists.txt`` and is composed of few projects each responsible for a specific task. Once configured, the `Outer Project` is responsible for driving the overall build composed of multiple project called `external project`. Here is the list of `external project`: @@ -16,8 +12,6 @@ composed of multiple project called `external project`. Here is the list of `ext * ``CMakeProject-build`` * ``CMakePythonDistributions``: This corresponds to the `Inner Project` represented below. -.. _ ..CMakeLists\.txt: https://github.com/scikit-build/cmake-python-distributions/blob/master/CMakeLists.txt - The flow chart represented below illustrates which external projects are included based on the configure options and describes the role of each one: @@ -36,7 +30,7 @@ options and describes the role of each one: color = "#FFF0D7"; // properties - configure [shape = beginpoint, label = "CMakeLists", description="See `CMakeLists.txt `_"]; + configure [shape = beginpoint, label = "CMakeLists", description="CMake configuration file"]; ask_download [label ="Download source ?", shape = diamond, description = "If option ``CMakeProject_SOURCE_DIR`` is set, skip source download."]; download_source [label ="Download Source archive", description = "External project downloading archives from https://cmake.org/files/."] reuse_source_dir [label ="Re-use source directory", description = "Empty external project."] diff --git a/docs/building.rst b/docs/building.rst index 410efd6ad..3e3a20aa3 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -5,7 +5,7 @@ Building the CMake Python wheel Overview -------- -This project has been designed to work with `scikit-build `_. +This project has been designed to work with `scikit-build `_. It provides a `setup.py` and allows to create both source and binary distributions of CMake. diff --git a/docs/conf.py b/docs/conf.py index d201f63d8..677bb35ca 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,7 +73,7 @@ # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = 'en' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -160,7 +160,7 @@ # 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, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +# html_static_path = ['_static'] # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied diff --git a/docs/index.rst b/docs/index.rst index f0cb1cf9a..a81884996 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -6,14 +6,14 @@ Welcome to CMake Python Distributions's documentation! ====================================================== -`CMake `_ is used to control the software compilation +`CMake `_ is used to control the software compilation process using simple platform and compiler independent configuration files, and generate native makefiles and workspaces that can be used in the compiler environment of your choice. 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 `_. +such as `ITK `_ and `VTK `_. The CMake python wheels provide `CMake 3.28.3 `_. @@ -49,11 +49,11 @@ Resources ========= This project is maintained by Jean-Christophe Fillion-Robin from Kitware Inc. -It is covered by the `Apache License, Version 2.0 `_. +It is covered by the `Apache License, Version 2.0 `_. CMake is distributed under the OSI-approved BSD 3-clause License. -For more information about CMake, visit http://cmake.org +For more information about CMake, visit https://cmake.org -* Documentation: http://cmake-python-distributions.readthedocs.io/en/latest/ +* Documentation: https://cmake-python-distributions.readthedocs.io/en/latest/ * Source code: https://github.com/scikit-build/cmake-python-distributions * Mailing list: https://groups.google.com/forum/#!forum/scikit-build diff --git a/docs/make.bat b/docs/make.bat index 7d1e4b264..0d0b48c79 100644 --- a/docs/make.bat +++ b/docs/make.bat @@ -67,7 +67,7 @@ if errorlevel 9009 ( echo.may add the Sphinx directory to PATH. echo. echo.If you don't have Sphinx installed, grab it from - echo.http://sphinx-doc.org/ + echo.https://sphinx-doc.org/ exit /b 1 ) diff --git a/docs/make_a_release.rst b/docs/make_a_release.rst index 1681dca19..eaaff7a55 100644 --- a/docs/make_a_release.rst +++ b/docs/make_a_release.rst @@ -122,7 +122,7 @@ means that ``echo "Hello"`` should be copied and evaluated in the terminal. .. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/ -.. _virtualenv: http://virtualenv.readthedocs.io +.. _virtualenv: https://virtualenv.pypa.io/en/latest .. _venv: https://docs.python.org/3/library/venv.html diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index c4bcd5a60..6b52089e9 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,7 +1,8 @@ docutils -funcparserlib>=1.0.0a0 +funcparserlib>=1.0.0 +pillow<10 pygments scikit-build sphinx sphinx_rtd_theme -sphinxcontrib-blockdiag +sphinxcontrib-blockdiag # old, not compatible with pillow 10+ diff --git a/noxfile.py b/noxfile.py index f62621c87..23c6adacf 100644 --- a/noxfile.py +++ b/noxfile.py @@ -55,25 +55,49 @@ def tests(session: nox.Session) -> str: session.run("pytest", *session.posargs) -@nox.session -def docs(session: nox.Session) -> str: +@nox.session(reuse_venv=True) +def docs(session: nox.Session) -> None: """ - Build the docs. + Build the docs. Pass "--serve" to serve. Pass "-b linkcheck" to check links. """ + parser = argparse.ArgumentParser() + parser.add_argument("--serve", action="store_true", help="Serve after building") + parser.add_argument( + "-b", dest="builder", default="html", help="Build target (default: html)" + ) + args, posargs = parser.parse_known_args(session.posargs) + + if args.builder != "html" and args.serve: + session.error("Must not specify non-HTML builder with --serve") + + extra_installs = ["sphinx-autobuild"] if args.serve else [] + wheel = build(session) - session.install("-r", "requirements-docs.txt") + session.install("-r", "docs/requirements-docs.txt", *extra_installs) session.install(f"./dist/{wheel}") session.chdir("docs") - session.run("sphinx-build", "-M", "html", ".", "_build") - - if session.posargs: - if "serve" in session.posargs: - print("Launching docs at http://localhost:8000/ - use Ctrl-C to quit") - session.run("python", "-m", "http.server", "8000", "-d", "_build/html") - else: - print("Unsupported argument to docs") + + if args.builder == "linkcheck": + session.run( + "sphinx-build", "-b", "linkcheck", ".", "_build/linkcheck", *posargs + ) + return + + shared_args = ( + "-n", # nitpicky mode + "-T", # full tracebacks + f"-b={args.builder}", + ".", + f"_build/{args.builder}", + *posargs, + ) + + if args.serve: + session.run("sphinx-autobuild", *shared_args) + else: + session.run("sphinx-build", "--keep-going", *shared_args) def _bump(session: nox.Session, name: str, repository: str, branch: str, script: str, files) -> None: diff --git a/pyproject.toml b/pyproject.toml index a4c142e09..dd2b71824 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ before-build = "pip install -r requirements-repair.txt" repair-wheel-command = "python scripts/repair_wheel.py -w {dest_dir} {wheel}" test-extras = "test" test-command = "pytest {project}/tests" -build-verbosity = "1" +build-verbosity = 1 [tool.cibuildwheel.linux] before-all = [ @@ -55,8 +55,10 @@ MACOSX_DEPLOYMENT_TARGET = "10.10" [tool.ruff] -select = [ - "E", "F", "W", # flake8 +src = ["src"] + +[tool.ruff.lint] +extend-select = [ "B", # flake8-bugbear "I", # isort "ARG", # flake8-unused-arguments @@ -75,22 +77,16 @@ select = [ "NPY", # NumPy specific rules "PD", # pandas-vet ] -extend-ignore = [ - "PLR", # Design related pylint codes - "E501", # Line too long +ignore = [ + "PLR09", # Too many X "RUF005", # Python 3 needed "B904", # Python 3 needed "SIM105", # Python 3 needed ] -src = ["src"] -unfixable = [ - "T20", # Removes print statements - "F841", # Removes unused variables -] exclude = ["src/cmake/_version.py"] flake8-unused-arguments.ignore-variadic-names = true -[tool.ruff.per-file-ignores] +[tool.ruff.lint.per-file-ignores] "docs/conf.py" = ["E402"] "*.pyi" = ["ARG001"] "noxfile.py" = ["PLW0603"] # Could be fixed if Python 2 dropped