From 9709128359e604953ac4cf836e27ab5f9287750a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 4 Dec 2023 21:10:28 -0800 Subject: [PATCH] Release 23.12 (#478) Prepare the December release of ImpactX. --- CMakeLists.txt | 2 +- cmake/dependencies/ABLASTR.cmake | 6 +++--- cmake/dependencies/pyAMReX.cmake | 4 ++-- cmake/dependencies/pybind11.cmake | 4 ++-- docs/source/conf.py | 4 ++-- setup.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 645b2411a..b67929307 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.20.0) -project(ImpactX VERSION 23.11) +project(ImpactX VERSION 23.12) include(${ImpactX_SOURCE_DIR}/cmake/ImpactXFunctions.cmake) diff --git a/cmake/dependencies/ABLASTR.cmake b/cmake/dependencies/ABLASTR.cmake index acf74654d..555efa370 100644 --- a/cmake/dependencies/ABLASTR.cmake +++ b/cmake/dependencies/ABLASTR.cmake @@ -144,7 +144,7 @@ macro(find_ablastr) set(COMPONENT_DIM 3D) set(COMPONENT_PRECISION ${ImpactX_PRECISION} P${ImpactX_PRECISION}) - find_package(ABLASTR 23.11 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM}) + find_package(ABLASTR 23.12 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM}) message(STATUS "ABLASTR: Found version '${ABLASTR_VERSION}'") endif() @@ -178,7 +178,7 @@ set(ImpactX_openpmd_src "" set(ImpactX_ablastr_repo "https://github.com/ECP-WarpX/WarpX.git" CACHE STRING "Repository URI to pull and build ABLASTR from if(ImpactX_ablastr_internal)") -set(ImpactX_ablastr_branch "6eedf2cdb2ffcaf2d9bb26139e3671b3bcca73ec" +set(ImpactX_ablastr_branch "23.12" CACHE STRING "Repository branch for ImpactX_ablastr_repo if(ImpactX_ablastr_internal)") @@ -186,7 +186,7 @@ set(ImpactX_ablastr_branch "6eedf2cdb2ffcaf2d9bb26139e3671b3bcca73ec" set(ImpactX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(ImpactX_amrex_internal)") -set(ImpactX_amrex_branch "9b733ec45cd93a80234a7c98248b6eb4816589d5" +set(ImpactX_amrex_branch "" CACHE STRING "Repository branch for ImpactX_amrex_repo if(ImpactX_amrex_internal)") diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake index c303248ae..780bcda50 100644 --- a/cmake/dependencies/pyAMReX.cmake +++ b/cmake/dependencies/pyAMReX.cmake @@ -64,7 +64,7 @@ function(find_pyamrex) endif() elseif(NOT ImpactX_pyamrex_internal) # TODO: MPI control - find_package(pyAMReX 23.11 CONFIG REQUIRED) + find_package(pyAMReX 23.12 CONFIG REQUIRED) message(STATUS "pyAMReX: Found version '${pyAMReX_VERSION}'") endif() endfunction() @@ -79,7 +79,7 @@ option(ImpactX_pyamrex_internal "Download & build pyAMReX" ON) set(ImpactX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git" CACHE STRING "Repository URI to pull and build pyamrex from if(ImpactX_pyamrex_internal)") -set(ImpactX_pyamrex_branch "424c52f88d92d05f3fcd8dba766aaa88d28335fa" +set(ImpactX_pyamrex_branch "23.12" CACHE STRING "Repository branch for ImpactX_pyamrex_repo if(ImpactX_pyamrex_internal)") diff --git a/cmake/dependencies/pybind11.cmake b/cmake/dependencies/pybind11.cmake index a09d2e739..40f201120 100644 --- a/cmake/dependencies/pybind11.cmake +++ b/cmake/dependencies/pybind11.cmake @@ -37,7 +37,7 @@ function(find_pybind11) mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED_FETCHEDpybind11) endif() else() - find_package(pybind11 2.9.1 CONFIG REQUIRED) + find_package(pybind11 2.11.1 CONFIG REQUIRED) message(STATUS "pybind11: Found version '${pybind11_VERSION}'") endif() endfunction() @@ -52,7 +52,7 @@ option(ImpactX_pybind11_internal "Download & build pybind11" ON) set(ImpactX_pybind11_repo "https://github.com/pybind/pybind11.git" CACHE STRING "Repository URI to pull and build pybind11 from if(ImpactX_pybind11_internal)") -set(ImpactX_pybind11_branch "v2.10.1" +set(ImpactX_pybind11_branch "v2.11.1" CACHE STRING "Repository branch for ImpactX_pybind11_repo if(ImpactX_pybind11_internal)") diff --git a/docs/source/conf.py b/docs/source/conf.py index 284ac68e5..2488314a8 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -73,9 +73,9 @@ # built documents. # # The short X.Y version. -version = "23.11" +version = "23.12" # The full version, including alpha/beta/rc tags. -release = "23.11" +release = "23.12" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 3ce4c78c7..b1485ce58 100644 --- a/setup.py +++ b/setup.py @@ -235,7 +235,7 @@ def build_extension(self, ext): setup( name="impactx", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="23.11", + version="23.12", packages=["impactx"], # Python sources: package_dir={"": "src/python"},