From f72de17c85994ece369291b9b484a76c0ea24c3a Mon Sep 17 00:00:00 2001 From: Francesco Biscani Date: Fri, 6 Oct 2023 13:48:58 +0200 Subject: [PATCH 1/2] Bump to version 3. --- CMakeLists.txt | 4 ++-- doc/changelog.rst | 10 ++++++++++ doc/install.rst | 2 +- tools/gha_manylinux.sh | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bfd7a6c..1cfa4d8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ if(NOT CMAKE_BUILD_TYPE) FORCE) endif() -project(heyoka.py VERSION 2.0.0 LANGUAGES CXX C) +project(heyoka.py VERSION 3.0.0 LANGUAGES CXX C) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/yacma") @@ -118,7 +118,7 @@ find_package(fmt REQUIRED CONFIG) message(STATUS "fmt version: ${fmt_VERSION}") # heyoka. -find_package(heyoka 2.0.0 REQUIRED CONFIG) +find_package(heyoka 3.0.0 REQUIRED CONFIG) # Python. diff --git a/doc/changelog.rst b/doc/changelog.rst index e39677f0..60c22bd3 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -3,6 +3,16 @@ Changelog ========= +3.0.0 (unreleased) +------------------ + +Changes +~~~~~~~ + +- heyoka.py now requires version 3.0.0 of the + heyoka C++ library + (`#137 `__). + 2.0.0 (2023-09-22) ------------------ diff --git a/doc/install.rst b/doc/install.rst index 7ef67970..544509a2 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -9,7 +9,7 @@ Dependencies heyoka.py has several Python and C++ dependencies. On the C++ side, heyoka.py depends on: * the `heyoka C++ library `__, - version 2.0.x (**mandatory**), + version 3.0.x (**mandatory**), * the `Boost `__ C++ libraries (**mandatory**), * the `{fmt} `__ library (**mandatory**), * the `TBB `__ library (**mandatory**), diff --git a/tools/gha_manylinux.sh b/tools/gha_manylinux.sh index 4b391a94..32834556 100644 --- a/tools/gha_manylinux.sh +++ b/tools/gha_manylinux.sh @@ -38,7 +38,7 @@ echo "PYTHON_DIR: ${PYTHON_DIR}" export NUMPY_VERSION="1.24.*" # The heyoka version to be used for releases. -export HEYOKA_VERSION_RELEASE="2.0.0" +export HEYOKA_VERSION_RELEASE="3.0.0" # Check if this is a release build. if [[ "${GITHUB_REF}" == "refs/tags/v"* ]]; then From 62e7e73f93c611c8373aa6ddd21e52692613f2fe Mon Sep 17 00:00:00 2001 From: Francesco Biscani Date: Fri, 6 Oct 2023 14:31:49 +0200 Subject: [PATCH 2/2] Pin to llvm 16 now for the static builds. --- tools/gha_conda_static.sh | 2 +- tools/gha_osx_heyoka_head_static.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gha_conda_static.sh b/tools/gha_conda_static.sh index a963380c..81ca066f 100755 --- a/tools/gha_conda_static.sh +++ b/tools/gha_conda_static.sh @@ -16,7 +16,7 @@ export PATH="$HOME/miniconda/bin:$PATH" bash miniconda.sh -b -p $HOME/miniconda conda config --add channels conda-forge conda config --set channel_priority strict -conda create -y -q -p $deps_dir python=3.10 git pybind11 numpy mpmath cmake llvmdev tbb-devel tbb boost-cpp mppp sleef fmt spdlog sympy cloudpickle c-compiler cxx-compiler numba zlib +conda create -y -q -p $deps_dir python=3.10 git pybind11 numpy mpmath cmake 'llvmdev=16.*' tbb-devel tbb boost-cpp mppp sleef fmt spdlog sympy cloudpickle c-compiler cxx-compiler numba zlib source activate $deps_dir # Checkout, build and install heyoka's HEAD. diff --git a/tools/gha_osx_heyoka_head_static.sh b/tools/gha_osx_heyoka_head_static.sh index 5f455e91..40149f10 100644 --- a/tools/gha_osx_heyoka_head_static.sh +++ b/tools/gha_osx_heyoka_head_static.sh @@ -13,7 +13,7 @@ export PATH="$HOME/miniconda/bin:$PATH" bash miniconda.sh -b -p $HOME/miniconda conda config --add channels conda-forge conda config --set channel_priority strict -conda create -y -q -p $deps_dir python=3.10 git pybind11 numpy cmake llvmdev tbb-devel tbb astroquery boost-cpp sleef fmt spdlog sympy cloudpickle mppp numba +conda create -y -q -p $deps_dir python=3.10 git pybind11 numpy cmake 'llvmdev=16.*' tbb-devel tbb astroquery boost-cpp sleef fmt spdlog sympy cloudpickle mppp numba source activate $deps_dir # Checkout, build and install heyoka's HEAD.