Merge branch 'update-to-cmake-3.10.1'

* update-to-cmake-3.10.1:
  Update to CMake v3.10.1
  script: Fix CMake version update script to support minor version with 2 digits

Author: jcfr

CMakeUrls.cmake

@@ -1,26 +1,26 @@
 
 #-----------------------------------------------------------------------------
 # CMake sources
-set(unix_source_url       "https://cmake.org/files/v3.10/cmake-3.10.0.tar.gz")
-set(unix_source_sha256    "b3345c17609ea0f039960ef470aa099de9942135990930a57c14575aae884987")
+set(unix_source_url       "https://cmake.org/files/v3.10/cmake-3.10.1.tar.gz")
+set(unix_source_sha256    "7be36ee24b0f5928251b644d29f5ff268330a916944ef4a75e23ba01e7573284")
 
-set(windows_source_url    "https://cmake.org/files/v3.10/cmake-3.10.0.zip")
-set(windows_source_sha256 "1094abe1050e4b1b813dd22c91b5e64fc1d583b728b714883154a565065823d7")
+set(windows_source_url    "https://cmake.org/files/v3.10/cmake-3.10.1.zip")
+set(windows_source_sha256 "4f1eb69d116574c0c2fddce618b04ce40f56b6920f5dff1b6ecb26a422e9d868")
 
 #-----------------------------------------------------------------------------
 # CMake binaries
 
 set(linux32_binary_url    "NA")  # Linux 32-bit binaries not available
 set(linux32_binary_sha256 "NA")
 
-set(linux64_binary_url    "https://cmake.org/files/v3.10/cmake-3.10.0-Linux-x86_64.tar.gz")
-set(linux64_binary_sha256 "6b5ea290042fac96023fd5387cd65cc69fdf4f48bad91177eb8697ba37e3deb3")
+set(linux64_binary_url    "https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.tar.gz")
+set(linux64_binary_sha256 "f0f84761a254324ed9076c23fca502eb135ec49c0b752212a6298f317d303438")
 
-set(macosx_binary_url    "https://cmake.org/files/v3.10/cmake-3.10.0-Darwin-x86_64.tar.gz")
-set(macosx_binary_sha256 "1610b6bbc0f22659455e878be9f4be4c6ba57643dabf35d8dabeeb05e7213039")
+set(macosx_binary_url    "https://cmake.org/files/v3.10/cmake-3.10.1-Darwin-x86_64.tar.gz")
+set(macosx_binary_sha256 "8684f9e084fe4a5565dd2b9538ba843832acb207955e71047a686219f928fb3d")
 
-set(win32_binary_url    "https://cmake.org/files/v3.10/cmake-3.10.0-win32-x86.zip")
-set(win32_binary_sha256 "dce666e897f95a88d3eed6cddd1faa3f44179d519b33ca6065b385bbc7072419")
+set(win32_binary_url    "https://cmake.org/files/v3.10/cmake-3.10.1-win32-x86.zip")
+set(win32_binary_sha256 "6fe010cce1201d884cd7a9535db8a1f16d98b8965341251fde8f1c5069ee58c0")
 
-set(win64_binary_url    "https://cmake.org/files/v3.10/cmake-3.10.0-win64-x64.zip")
-set(win64_binary_sha256 "b530586b92241bc10aaaaa391bc9b8f1ae830a676050f9f5e6003d2ce6085abc")
+set(win64_binary_url    "https://cmake.org/files/v3.10/cmake-3.10.1-win64-x64.zip")
+set(win64_binary_sha256 "8251f70c85b58f3ca1f24e4a3b0637e2d609b5e4a341d00b70e02e89244d5029")

README.rst

@@ -20,7 +20,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.10.0 <https://cmake.org/cmake/help/v3.10/index.html>`_.
+The CMake python wheels provide `CMake 3.10.1 <https://cmake.org/cmake/help/v3.10/index.html>`_.
 
 This project is maintained by Jean-Christophe Fillion-Robin from Kitware Inc.
 It is covered by the `Apache License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0>`_.

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 <https://www.itk.org>`_ and `VTK <http://www.vtk.org>`_.
 
-The CMake python wheels provide `CMake 3.10.0 <https://cmake.org/cmake/help/v3.10/index.html>`_.
+The CMake python wheels provide `CMake 3.10.1 <https://cmake.org/cmake/help/v3.10/index.html>`_.
 
 .. toctree::
    :maxdepth: 2

scripts/update_cmake_version.py

@@ -148,7 +148,7 @@ def _update_file(filepath, regex, replacement):
 
 def update_docs(version):
     pattern = re.compile(
-        r"CMake \d.\d.\d <https://cmake.org/cmake/help/v\d.\d/index.html>")
+        r"CMake \d.(\d)+.\d <https://cmake.org/cmake/help/v\d.(\d)+/index.html>")
     replacement = (
         "CMake %s <https://cmake.org/cmake/help/v%s/index.html>" % (
             version, _major_minor(version)))
@@ -157,7 +157,7 @@ def update_docs(version):
 
 
 def update_tests(version):
-    pattern = re.compile(r'expected_version = "\d.\d.\d"')
+    pattern = re.compile(r'expected_version = "\d.(\d)+.\d"')
     replacement = 'expected_version = "%s"' % version
     _update_file(os.path.join(
         ROOT_DIR, "tests/test_wheel.py"), pattern, replacement)

tests/test_wheel.py

@@ -13,7 +13,7 @@ def test_command_line(virtualenv, tmpdir):
 
     virtualenv.run("pip install %s" % wheels[0])
 
-    expected_version = "3.10.0"
+    expected_version = "3.10.1"
 
     for executable_name in ["cmake", "cpack", "ctest"]:
         output = virtualenv.run(