Release: 23.02 (#105)

Author: ax3l

CMakeLists.txt

@@ -1,7 +1,7 @@
 # Preamble ####################################################################
 #
 cmake_minimum_required(VERSION 3.20.0)
-project(pyAMReX VERSION 23.01)
+project(pyAMReX VERSION 23.02)
 
 include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake)
 

cmake/dependencies/AMReX.cmake

@@ -67,7 +67,7 @@ macro(find_amrex)
     elseif(NOT pyAMReX_amrex_internal)
         message(STATUS "Searching for pre-installed AMReX ...")
         # https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#importing-amrex-into-your-cmake-project
-        find_package(AMReX 23.01 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
+        find_package(AMReX 23.02 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
         message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
     endif()
 endmacro()
@@ -82,7 +82,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON)
 set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)")
-set(pyAMReX_amrex_branch "d5ddf3b22e949e7cc346a2f8660d1c73edfa391a"
+set(pyAMReX_amrex_branch "23.02"
     CACHE STRING
     "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")
 

setup.py

@@ -110,7 +110,6 @@ def build_extension(self, ext):
             ## dependency control (developers & package managers)
             "-DpyAMReX_amrex_internal=" + AMReX_internal,
             "-DpyAMReX_amrex_repo=" + AMReX_repo,
-            "-DpyAMReX_amrex_branch=" + AMReX_branch,
             "-DpyAMReX_pybind11_internal=" + pybind11_internal,
             # PEP-440 conformant version from package
             "-DpyAMReX_VERSION_INFO=" + self.distribution.get_version(),
@@ -124,6 +123,8 @@ def build_extension(self, ext):
             #          or same dir as calling executable
         ]
         # further dependency control (developers & package managers)
+        if AMReX_branch:
+            cmake_args.append("-DpyAMReX_amrex_branch=" + AMReX_branch)
         if AMReX_src:
             cmake_args.append("-DpyAMReX_amrex_src=" + AMReX_src)
 
@@ -185,9 +186,7 @@ def build_extension(self, ext):
 AMReX_src = os.environ.get("AMREX_SRC")
 AMReX_internal = os.environ.get("AMREX_INTERNAL", "ON")
 AMReX_repo = os.environ.get("AMREX_REPO", "https://github.com/AMReX-Codes/amrex.git")
-AMReX_branch = os.environ.get(
-    "AMREX_BRANCH", "d5ddf3b22e949e7cc346a2f8660d1c73edfa391a"
-)
+AMReX_branch = os.environ.get("AMREX_BRANCH")
 pybind11_internal = os.environ.get("PYBIND11_INTERNAL", "ON")
 
 # https://cmake.org/cmake/help/v3.0/command/if.html
@@ -222,7 +221,7 @@ def build_extension(self, ext):
 setup(
     name="amrex",
     # note PEP-440 syntax: x.y.zaN but x.y.z.devN
-    version="23.01",
+    version="23.02",
     packages=["amrex"],
     # Python sources:
     package_dir={"": "src"},