Skip to content

Commit 4c5b682

Browse files
authored
Merge pull request #423 from thewtex/doc-build
doc build
2 parents 5dab4a6 + 75bef2a commit 4c5b682

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.github/workflows/build-test-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ jobs:
291291
292292
python -m pip install --upgrade pip
293293
python -m pip install ninja
294-
python -m pip install 'sphinx==4.4.0' 'docutils<0.18'
294+
python -m pip install 'sphinx==7.2.6'
295295
python -m pip install --ignore-installed six
296296
python -m pip install ipython
297297

Superbuild/External-ClangFormat.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ else()
2626
# `git config clangFormat.binary /path/to/clang-format`.
2727
endif()
2828

29+
# Set the timestamps of the extracted files to their archived
30+
# timestamps.
31+
if(${CMAKE_VERSION} VERSION_LESS 3.24)
32+
set(download_extract_timestamp_flag)
33+
else()
34+
set(download_extract_timestamp_flag DOWNLOAD_EXTRACT_TIMESTAMP TRUE)
35+
endif()
36+
2937
if(NOT TARGET ClangFormat AND _clang_format_hash)
3038
ExternalProject_add(ClangFormat
3139
URL ${_clang_format_url}
@@ -39,5 +47,6 @@ if(NOT TARGET ClangFormat AND _clang_format_hash)
3947
LOG_TEST 0
4048
LOG_INSTALL 0
4149
INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/ITKClangFormatConfig.cmake
50+
${download_extract_timestamp_flag}
4251
)
4352
endif()

Superbuild/External-Python.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ ExternalProject_Add(ITKPython
1717
DOWNLOAD_COMMAND ""
1818
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} -m venv "${_itk_venv}"
1919
BUILD_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --upgrade pip
20-
INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --ignore-installed itk>=5.4rc3 sphinx==4.4.0 docutils<0.18 traitlets==5.6.0 six black nbsphinx ipywidgets sphinx-contributors ipykernel matplotlib itkwidgets[lab,notebook]>=1.0a21 pydata-sphinx-theme
20+
INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --ignore-installed itk>=5.4rc3 sphinx==7.2.6 six black nbsphinx ipywidgets sphinx-contributors ipykernel matplotlib itkwidgets[lab,notebook]>=1.0a51 pydata-sphinx-theme
2121
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/ITKBlackConfig.cmake
2222
)

0 commit comments

Comments
 (0)