Skip to content

Commit c908cd0

Browse files
feat: initial version to 9.4.1
Version is both fetch from build system and hardcoded to ensure everything is coherent.
1 parent 76fc5ea commit c908cd0

File tree

3 files changed

+20
-68
lines changed

3 files changed

+20
-68
lines changed

CMakeLists.txt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
cmake_minimum_required(VERSION 3.21)
22

3-
set(VTK_VERSION "9.2.5")
3+
set(VTK_VERSION "9.4.1") # major.minor.patch
4+
if(NOT VTK_VERSION VERSION_EQUAL SKBUILD_PROJECT_VERSION)
5+
message(
6+
FATAL_ERROR
7+
"Hardcoded VTK version \"${VTK_VERSION}\" disagrees from git tag version \"${SKBUILD_PROJECT_VERSION}\"."
8+
"This check is performed to ensure that the version is the intended one, especially when a specific tag is checked out."
9+
"Please ensure that git tags are up to date and that VTK_VERSION has the expected value.")
10+
endif()
411

512
project(
613
vtk-sdk
@@ -19,15 +26,13 @@ find_package(
1926

2027
include(cmake/vtk-sdk-urls.cmake)
2128

22-
set(download_dir ${PROJECT_BINARY_DIR})
23-
set(extract_dir ${PROJECT_BINARY_DIR}/vtk-wheel-sdk)
29+
set(download_dir ${CMAKE_CURRENT_BINARY_DIR})
30+
set(extract_dir ${CMAKE_CURRENT_BINARY_DIR}/vtk-wheel-sdk)
2431

2532
include(FetchContent)
2633
FetchContent_Populate(
2734
vtkwheelsdk
28-
URL ${VTK_SDK_BINARY_URL}
29-
URL_HASH SHA256=${VTK_SDK_EXPECTED_SHA256}
30-
DOWNLOAD_DIR ${download_dir}
35+
URL ${VTK_SDK_BINARY_URL} DOWNLOAD_DIR ${download_dir}
3136
SOURCE_DIR ${extract_dir})
3237

3338
# ----------------------------------------------------------------------------

cmake/vtk-sdk-urls.cmake

Lines changed: 8 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22
# Set URLs for downloading the VTK SDK stored as a tar.xz archive on Kitware
33
# hosted server
44

5-
message(STATUS "Setting VTK_SDK_BINARY_URL")
6-
75
# Python and ABI tags
86
set(python_tag "cp${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
97
set(abi_tag "${python_tag}")
10-
message(STATUS " python_tag: ${python_tag}")
11-
message(STATUS " abi_tag: ${abi_tag}")
12-
138
# Platform tag
149
if(LINUX AND Python_SOABI MATCHES "x86_64")
1510
set(plaform_tag "manylinux_2_17_x86_64.manylinux2014_x86_64")
@@ -26,59 +21,14 @@ if(NOT DEFINED plaform_tag)
2621
FATAL_ERROR
2722
"Failed to set plaform_tag based of Python_SOABI [${Python_SOABI}]")
2823
endif()
29-
message(STATUS " plaform_tag: ${plaform_tag}")
30-
31-
set(VTK_SDK_BINARY_URL
32-
"https://vtk.org/files/wheel-sdks/vtk-wheel-sdk-${VTK_VERSION}-${python_tag}-${abi_tag}-${plaform_tag}.tar.xz"
33-
)
34-
message(STATUS "Setting VTK_SDK_BINARY_URL: ${VTK_SDK_BINARY_URL}")
35-
36-
# ----------------------------------------------------------------------------
37-
# Set expected checksum
38-
39-
message(STATUS "Setting VTK_SDK_EXPECTED_SHA256")
4024

41-
set(sha256_9.2.5-cp38-cp38-macosx_10_10_x86_64
42-
"a97438851a029fc3e9a630261a101001f5fc2edae45710f1cb0cde2dd2899334")
43-
set(sha256_9.2.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64
44-
"f67ab5114eeccda490bd5a7ab8e6921e0b59d51489e7f47eb0ebc7f18e7cbd93")
45-
set(sha256_9.2.5-cp38-cp38-win_amd64
46-
"306360396efa3cffb03ecda75c4df84a89ededf05d0adfda4894d80adf2542ec")
25+
message(STATUS "- python_tag: ${python_tag}")
26+
message(STATUS "- abi_tag: ${abi_tag}")
27+
message(STATUS "- plaform_tag: ${plaform_tag}")
4728

48-
set(sha256_9.2.5-cp39-cp39-macosx_10_10_x86_64
49-
"6a63d28a726188194fa7858d33645f43ea9ef21e696b8da91cc0536cf4c9131a")
50-
set(sha256_9.2.5-cp39-cp39-macosx_11_0_arm64
51-
"3747b3448b1ae0f511a389f82398a1ec5a883189ed01ed35c870ef746096ec6d")
52-
set(sha256_9.2.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64
53-
"8199f0cff9a43831eadeba0e4d89421c947002c53c030c50edb50312bb0726cd")
54-
set(sha256_9.2.5-cp39-cp39-win_amd64
55-
"befbbea3bfc8584c5dd3b2c04b5ce7273eeb4581a5586adf10cb35b859609026")
56-
57-
set(sha256_9.2.5-cp310-cp310-macosx_10_10_x86_64
58-
"a0d37d8f93521753cb3bed8da3548f9f6c1f45cee493070b5dcc3801f62b33e5")
59-
set(sha256_9.2.5-cp310-cp310-macosx_11_0_arm64
60-
"99120ac6448907865b1feb95be4111992d2d511954d2c381bd5299ec87c6f76c")
61-
set(sha256_9.2.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64
62-
"79f8a8c6caf9d98aef29426637ea9eb9228682072dfa5b69bb97dc3baa2e93d7")
63-
set(sha256_9.2.5-cp310-cp310-win_amd64
64-
"b85c5d48e6c36082c590276dd34458e5238cea7ae37156b5b30a2ca3e133d2b9")
65-
66-
set(sha256_9.2.5-cp311-cp311-macosx_10_10_x86_64
67-
"f0bf60a0c740b9c92bb0f35cadb1f0c38d23b3994bdf24295ac986761dc6e59c")
68-
set(sha256_9.2.5-cp311-cp311-macosx_11_0_arm64
69-
"d2948347e7c803d8e691b48d58dd057ddb2265baf603eb0d7036a71a538e037d")
70-
set(sha256_9.2.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64
71-
"dcd452e018b3a5a7a0b5dfab8e38af2ddbd0e0e387b1a8488b4516354c4a30fb")
72-
set(sha256_9.2.5-cp311-cp311-win_amd64
73-
"f70dca96484ba357fad52ce4d998b6480e5717e7e1d0f707f20c494c41d7a00e")
74-
75-
if(NOT DEFINED sha256_${VTK_VERSION}-${python_tag}-${abi_tag}-${plaform_tag})
76-
message(
77-
FATAL_ERROR
78-
"Variable sha256_${VTK_VERSION}-${python_tag}-${abi_tag}-${plaform_tag} is not defined"
79-
)
80-
endif()
29+
set(archive_name
30+
"vtk-wheel-sdk-${VTK_VERSION}-${python_tag}-${abi_tag}-${plaform_tag}.tar.xz"
31+
)
32+
set(VTK_SDK_BINARY_URL "https://vtk.org/files/wheel-sdks/${archive_name}")
8133

82-
set(VTK_SDK_EXPECTED_SHA256
83-
${sha256_${VTK_VERSION}-${python_tag}-${abi_tag}-${plaform_tag}})
84-
message(STATUS "Setting VTK_SDK_EXPECTED_SHA256: ${VTK_SDK_EXPECTED_SHA256}")
34+
message(STATUS "Setting VTK_SDK_BINARY_URL: ${VTK_SDK_BINARY_URL}")

pyproject.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,15 @@ metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
6767
sdist.include = ["src/vtk_sdk/_version.py"]
6868
wheel.packages = ["src/vtk_sdk"]
6969

70-
7170
[tool.setuptools_scm]
71+
git_describe_command = [ "git", "describe", "--tags" ] # we are only interested by last tag name
7272
write_to = "src/vtk_sdk/_version.py"
7373

74-
7574
[tool.cibuildwheel]
7675
test-command = "pytest {project}/tests"
7776
test-extras = ["test"]
7877
test-skip = ["*universal2:arm64"]
7978

80-
8179
[tool.pytest.ini_options]
8280
minversion = "6.0"
8381
addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
@@ -90,7 +88,6 @@ testpaths = [
9088
"tests",
9189
]
9290

93-
9491
[tool.coverage]
9592
run.source = ["vtk_sdk"]
9693
report.exclude_also = [

0 commit comments

Comments
 (0)