From cc631a5b6de97367eef08d3d47eb852248026fc5 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 2 Jul 2021 07:23:16 -0700 Subject: [PATCH] Release 21.07 (#2047) * AMReX/PICSAR: 21.07 * WarpX: 21.07 --- CMakeLists.txt | 2 +- Docs/source/conf.py | 4 ++-- LICENSE.txt | 2 +- Python/setup.py | 2 +- cmake/dependencies/AMReX.cmake | 4 ++-- cmake/dependencies/PICSAR.cmake | 2 +- run_test.sh | 2 +- setup.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d59436587c5..9d5f17ccb08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.15.0) -project(WarpX VERSION 21.06) +project(WarpX VERSION 21.07) include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake) diff --git a/Docs/source/conf.py b/Docs/source/conf.py index 4f6c36cdbe1..b2852e3cdd6 100644 --- a/Docs/source/conf.py +++ b/Docs/source/conf.py @@ -66,9 +66,9 @@ # built documents. # # The short X.Y version. -version = u'21.06' +version = u'21.07' # The full version, including alpha/beta/rc tags. -release = u'21.06' +release = u'21.07' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/LICENSE.txt b/LICENSE.txt index 9528ae262bd..d92924bd2ea 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -WarpX v21.06 Copyright (c) 2018-2021, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved. +WarpX v21.07 Copyright (c) 2018-2021, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Python/setup.py b/Python/setup.py index a028b8023f8..c5f5e968105 100644 --- a/Python/setup.py +++ b/Python/setup.py @@ -54,7 +54,7 @@ package_data = {} setup(name = 'pywarpx', - version = '21.06', + version = '21.07', packages = ['pywarpx'], package_dir = {'pywarpx': 'pywarpx'}, description = """Wrapper of WarpX""", diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index f28c7362dcd..6b008cb7b78 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -217,7 +217,7 @@ macro(find_amrex) endif() set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PRECISION}) - find_package(AMReX 21.06 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} TINYP LSOLVERS) + find_package(AMReX 21.07 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} TINYP LSOLVERS) message(STATUS "AMReX: Found version '${AMReX_VERSION}'") endif() endmacro() @@ -231,7 +231,7 @@ set(WarpX_amrex_src "" set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)") -set(WarpX_amrex_branch "55cb40092910183729ca81e6eef3d0ce386af317" +set(WarpX_amrex_branch "21.07" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") diff --git a/cmake/dependencies/PICSAR.cmake b/cmake/dependencies/PICSAR.cmake index f75764b514f..fb2b1b6b9eb 100644 --- a/cmake/dependencies/PICSAR.cmake +++ b/cmake/dependencies/PICSAR.cmake @@ -82,7 +82,7 @@ function(find_picsar) #message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'") else() # not supported by PICSAR (yet) - #find_package(PICSAR 21.06 CONFIG REQUIRED QED) + #find_package(PICSAR 21.07 CONFIG REQUIRED QED) #message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'") message(FATAL_ERROR "PICSAR: Cannot be used as externally installed " "library yet. " diff --git a/run_test.sh b/run_test.sh index acbee788d93..a6de7f64d0b 100755 --- a/run_test.sh +++ b/run_test.sh @@ -51,7 +51,7 @@ echo "cd $PWD" # Clone PICSAR and AMReX git clone https://github.com/AMReX-Codes/amrex.git -cd amrex && git checkout 55cb40092910183729ca81e6eef3d0ce386af317 && cd - +cd amrex && git checkout 21.07 && cd - # Use QED brach for QED tests git clone https://github.com/ECP-WarpX/picsar.git cd picsar && git checkout c16b642e3dcf860480dd1dd21cefa3874f395773 && cd - diff --git a/setup.py b/setup.py index 81c6591a425..96ffdf43e83 100644 --- a/setup.py +++ b/setup.py @@ -233,7 +233,7 @@ def build_extension(self, ext): setup( name='pywarpx', # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version = '21.06', + version = '21.07', packages = ['pywarpx'], package_dir = {'pywarpx': 'Python/pywarpx'}, author='Jean-Luc Vay, David P. Grote, Maxence Thévenet, Rémi Lehe, Andrew Myers, Weiqun Zhang, Axel Huebl, et al.',