Skip to content

Commit

Permalink
900: pybind 2.13.6 and python 3.8 (#1054)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
thattil authored Nov 25, 2024
1 parent 98c40c7 commit 8c120f2
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 12 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -304,20 +304,20 @@ if (SLS_USE_INTEGRATION_TESTS)
endif (SLS_USE_INTEGRATION_TESTS)

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)
FetchContent_Declare(
pybind11
GIT_REPOSITORY https://github.com/pybind/pybind11
GIT_TAG v2.13.0
GIT_TAG v2.13.6
)

else()
# https://github.com/pybind/pybind11/releases
FetchContent_Declare(
pybind11
URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/pybind11/v2.13.0.tar.gz
URL_HASH MD5=10cb1efba3aca997389d08bceb0ea767
URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/pybind11/v2.13.6.tar.gz
URL_HASH MD5=a04dead9c83edae6d84e2e343da7feeb
)
endif()
FetchContent_MakeAvailable(pybind11)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ make rst # rst only, saves time in case the API did not change
pybind11 is built
* by default from tar file in repo (libs/pybind/v2.1x.0.tar.gz)
* 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)

**v7.x.x**:
Expand Down
10 changes: 7 additions & 3 deletions RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@ This document describes the differences between v9.0.0 and v8.0.2
=====================


* Python version
Minimum python version is changed from 3.6 to 3.8


* Pybind11 version
In-built version and the one picked up from github
updated from v2.11 to v2.13
updated from v2.11.0 to v2.13.6


* Python version
* Python lib versioning
slsdet.__version__ now returns the package release version.


* Python build in Conda
* Python version in conda build
Added python 3.13 also to conda build


Expand Down
4 changes: 2 additions & 2 deletions docs/src/dependencies.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ the shared libraries these are needed:
Python bindings
-----------------------

* Python > 3.6
* pybind11 2.13.0 (packaged in libs)
* Python > 3.8
* pybind11 2.13.6 (packaged in libs)

.. note ::
Expand Down
2 changes: 1 addition & 1 deletion docs/src/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ Pybind and Zeromq
| pybind11 is built
| * 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>`__].
| * v9.0.0+: pybind11 (v2.13.0)
| * v9.0.0+: pybind11 (v2.13.6)
| * v8.x.x : pybind11 (v2.11.0)
|
| v7.x.x:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pygettingstarted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Getting Started
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
<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.
Expand Down
Binary file removed libs/pybind11/v2.13.0.tar.gz
Binary file not shown.
Binary file added libs/pybind11/v2.13.6.tar.gz
Binary file not shown.

0 comments on commit 8c120f2

Please sign in to comment.