mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-19 10:30:02 +02:00
dev: pybind 2.13.6 and python 3.8 (#1055)
* changed pybind 2.13.0 to 2.13.6, kept conda at min 2.13.0 * changed min python version from 3.6 to 3.8
This commit is contained in:
parent
1f16f84fed
commit
aeb59364c5
@ -304,20 +304,20 @@ if (SLS_USE_INTEGRATION_TESTS)
|
|||||||
endif (SLS_USE_INTEGRATION_TESTS)
|
endif (SLS_USE_INTEGRATION_TESTS)
|
||||||
|
|
||||||
if (SLS_USE_PYTHON)
|
if (SLS_USE_PYTHON)
|
||||||
find_package (Python 3.6 COMPONENTS Interpreter Development)
|
find_package (Python 3.8 COMPONENTS Interpreter Development)
|
||||||
if(SLS_FETCH_PYBIND11_FROM_GITHUB)
|
if(SLS_FETCH_PYBIND11_FROM_GITHUB)
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
pybind11
|
pybind11
|
||||||
GIT_REPOSITORY https://github.com/pybind/pybind11
|
GIT_REPOSITORY https://github.com/pybind/pybind11
|
||||||
GIT_TAG v2.13.0
|
GIT_TAG v2.13.6
|
||||||
)
|
)
|
||||||
|
|
||||||
else()
|
else()
|
||||||
# https://github.com/pybind/pybind11/releases
|
# https://github.com/pybind/pybind11/releases
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
pybind11
|
pybind11
|
||||||
URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/pybind11/v2.13.0.tar.gz
|
URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/pybind11/v2.13.6.tar.gz
|
||||||
URL_HASH MD5=10cb1efba3aca997389d08bceb0ea767
|
URL_HASH MD5=a04dead9c83edae6d84e2e343da7feeb
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
FetchContent_MakeAvailable(pybind11)
|
FetchContent_MakeAvailable(pybind11)
|
||||||
|
@ -243,7 +243,7 @@ make rst # rst only, saves time in case the API did not change
|
|||||||
pybind11 is built
|
pybind11 is built
|
||||||
* by default from tar file in repo (libs/pybind/v2.1x.0.tar.gz)
|
* by default from tar file in repo (libs/pybind/v2.1x.0.tar.gz)
|
||||||
* or use advanced option SLS_FETCH_PYBIND11_FROM_GITHUB [link].
|
* or use advanced option SLS_FETCH_PYBIND11_FROM_GITHUB [link].
|
||||||
* v9.0.0+: pybind11 (v2.13.0)
|
* v9.0.0+: pybind11 (v2.13.6)
|
||||||
* v8.x.x : pybind11 (v2.11.0)
|
* v8.x.x : pybind11 (v2.11.0)
|
||||||
|
|
||||||
**v7.x.x**:
|
**v7.x.x**:
|
||||||
|
@ -20,8 +20,8 @@ the shared libraries these are needed:
|
|||||||
Python bindings
|
Python bindings
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
* Python > 3.6
|
* Python > 3.8
|
||||||
* pybind11 2.13.0 (packaged in libs)
|
* pybind11 2.13.6 (packaged in libs)
|
||||||
|
|
||||||
.. note ::
|
.. note ::
|
||||||
|
|
||||||
|
@ -292,7 +292,7 @@ Pybind and Zeromq
|
|||||||
| pybind11 is built
|
| pybind11 is built
|
||||||
| * by default from tar file in repo (libs/pybind/v2.1x.0.tar.gz)
|
| * by default from tar file in repo (libs/pybind/v2.1x.0.tar.gz)
|
||||||
| * or use advanced option SLS_FETCH_PYBIND11_FROM_GITHUB [`link <https://github.com/pybind/pybind11>`__].
|
| * or use advanced option SLS_FETCH_PYBIND11_FROM_GITHUB [`link <https://github.com/pybind/pybind11>`__].
|
||||||
| * v9.0.0+: pybind11 (v2.13.0)
|
| * v9.0.0+: pybind11 (v2.13.6)
|
||||||
| * v8.x.x : pybind11 (v2.11.0)
|
| * v8.x.x : pybind11 (v2.11.0)
|
||||||
|
|
|
|
||||||
| v7.x.x:
|
| v7.x.x:
|
||||||
|
@ -6,7 +6,7 @@ Getting Started
|
|||||||
Which Python?
|
Which Python?
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
We require at least Python 3.6 and strongly recommended that you don't use the system
|
We require at least Python 3.8 and strongly recommended that you don't use the system
|
||||||
Python installation. The examples in this documentation uses `conda
|
Python installation. The examples in this documentation uses `conda
|
||||||
<https://docs.conda.io/en/latest/miniconda.html>`_ since it provides good support
|
<https://docs.conda.io/en/latest/miniconda.html>`_ since it provides good support
|
||||||
also for non Python packages but there are also other alternatives like, pyenv.
|
also for non Python packages but there are also other alternatives like, pyenv.
|
||||||
|
Binary file not shown.
BIN
libs/pybind11/v2.13.6.tar.gz
Normal file
BIN
libs/pybind11/v2.13.6.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user