From bd13bdfc1ad51765c9e055947bace356f28ba5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxence=20Th=C3=A9venet?= Date: Wed, 4 Oct 2023 09:31:39 +0200 Subject: [PATCH] Prepare for Release 23.10: proper release number and amrex version (#1022) * update release number * build on corresponding amrex release --- CMakeLists.txt | 2 +- cmake/dependencies/AMReX.cmake | 2 +- docs/source/conf.py | 4 ++-- license.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5503753574..d2fbe79729 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.18.0) -project(HiPACE VERSION 23.07) +project(HiPACE VERSION 23.10) # helper functions include(${HiPACE_SOURCE_DIR}/cmake/HiPACEFunctions.cmake) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 01ede8bf04..d5ff357c59 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -157,7 +157,7 @@ set(HiPACE_amrex_src "" set(HiPACE_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(HiPACE_amrex_internal)") -set(HiPACE_amrex_branch "development" +set(HiPACE_amrex_branch "23.10" CACHE STRING "Repository branch for HiPACE_amrex_repo if(HiPACE_amrex_internal)") diff --git a/docs/source/conf.py b/docs/source/conf.py index 3833443276..9e1bccf2c3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -26,8 +26,8 @@ project = 'HiPACE++' copyright = '2021, Severin Diederichs, Axel Huebl, Remi Lehe, Andrew Myers, Alexander Sinn, Maxence Thevenet, Weiqun Zhang' author = 'Severin Diederichs, Axel Huebl, Remi Lehe, Andrew Myers, Alexander Sinn, Maxence Thevenet, Weiqun Zhang' -version = u'23.07' -release = u'23.07' +version = u'23.10' +release = u'23.10' # -- General configuration --------------------------------------------------- diff --git a/license.txt b/license.txt index 784fc3a707..cc3bea8de2 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -HiPACE++ v23.07 Copyright (c) 2021-2023, The Regents of the University of California, +HiPACE++ v23.10 Copyright (c) 2021-2023, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy) and Deutsches Elektronen-Synchrotron (DESY). All rights reserved.