镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ message(STATUS "xtensor-python v${${PROJECT_NAME}_VERSION}")
# Dependencies
# ============

set(xtensor_REQUIRED_VERSION 0.26.0)
set(xtensor_REQUIRED_VERSION 0.27.0)
if(TARGET xtensor)
set(xtensor_VERSION ${XTENSOR_VERSION_MAJOR}.${XTENSOR_VERSION_MINOR}.${XTENSOR_VERSION_PATCH})
# Note: This is not SEMVER compatible comparison
Expand All @@ -48,7 +48,7 @@ endif()

find_package(Python COMPONENTS Interpreter REQUIRED)

set(pybind11_REQUIRED_VERSION 2.6.1)
set(pybind11_REQUIRED_VERSION 3.0.0)
if (NOT TARGET pybind11::headers)
# Defaults to ON for cmake >= 3.18
# https://github.com/pybind/pybind11/blob/35ff42b56e9d34d9a944266eb25f2c899dbdfed7/CMakeLists.txt#L96
Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- cmake
- ninja
# Host dependencies
- xtensor>=0.26,<0.27
- xtensor>=0.27,<0.28
- numpy>=2.0
- pybind11>=2.12.0,<4
# Test dependencies
Expand Down
6 changes: 3 additions & 3 deletions test_python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def cpp_flag(compiler):
"""Return the -std=c++17 compiler flag and errors when the flag is
no available.
"""
if has_flag(compiler, '-std=c++17'):
return '-std=c++17'
if has_flag(compiler, '-std=c++20'):
return '-std=c++20'
else:
raise RuntimeError('C++17 support is required by xtensor!')

Expand All @@ -104,7 +104,7 @@ def build_extensions(self):
opts.append('-fvisibility=hidden')
elif ct == 'msvc':
opts.append('/DVERSION_INFO=\\"%s\\"' % self.distribution.get_version())
opts.append('/std:c++17')
opts.append('/std:c++20')
for ext in self.extensions:
ext.extra_compile_args = opts
build_ext.build_extensions(self)
Expand Down
Loading