Skip to content

Commit

Permalink
Merge pull request #137 from bluescarni/pr/updates
Browse files Browse the repository at this point in the history
Bump to version 3
  • Loading branch information
bluescarni authored Oct 6, 2023
2 parents c65f760 + 62e7e73 commit 34d268a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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.

Expand Down
10 changes: 10 additions & 0 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
Changelog
=========

3.0.0 (unreleased)
------------------

Changes
~~~~~~~

- heyoka.py now requires version 3.0.0 of the
heyoka C++ library
(`#137 <https://github.com/bluescarni/heyoka.py/pull/137>`__).

2.0.0 (2023-09-22)
------------------

Expand Down
2 changes: 1 addition & 1 deletion doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/bluescarni/heyoka>`__,
version 2.0.x (**mandatory**),
version 3.0.x (**mandatory**),
* the `Boost <https://www.boost.org/>`__ C++ libraries (**mandatory**),
* the `{fmt} <https://fmt.dev/latest/index.html>`__ library (**mandatory**),
* the `TBB <https://github.com/oneapi-src/oneTBB>`__ library (**mandatory**),
Expand Down
2 changes: 1 addition & 1 deletion tools/gha_conda_static.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tools/gha_manylinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/gha_osx_heyoka_head_static.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 34d268a

Please sign in to comment.