Merge branch 'feat/update-to-relase-24' into 'main'

feat: Update to Release 24 (!12)

See merge request gstark/pycolumnarprototype!12

.gitlab-ci.yml

@@ -7,7 +7,7 @@ before_script:
 
 compile:
   stage: build
-  image: gitlab-registry.cern.ch/atlas/athena/analysisbase:22.2.113
+  image: gitlab-registry.cern.ch/atlas/athena/analysisbase:24.2.3
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
   script:
@@ -21,10 +21,10 @@ compile:
 
 run:
   stage: test
-  image: gitlab-registry.cern.ch/atlas/athena/analysisbase:22.2.113
+  image: gitlab-registry.cern.ch/atlas/athena/analysisbase:24.2.3
   before_script:
     - source /release_setup.sh
-    - python3 -m venv .venv
+    - bash <(curl -sL https://raw.githubusercontent.com/matthewfeickert/cvmfs-venv/v0.0.4/cvmfs-venv.sh) .venv
     - . .venv/bin/activate
     - python -m pip install --upgrade --requirement requirements.txt
     - python -m pip list

.gitmodules

 [submodule "src/columnarprototype"]
-	path = src/columnarprototype
+	path = src/ColumnarPrototype
 	url = ../../krumnack/columnarprototype
 [submodule "src/nanobind"]
 	path = src/nanobind

README.md

@@ -13,7 +13,7 @@ bash build_local.sh
 which is doing something similar to
 
 ```
-asetup AnalysisBase,22.2.113
+asetup AnalysisBase,24.2.3
 cmake -S src -B build
 cmake --build build --clean-first
 PYTHONPATH="$(dirname $(find . -type f -iname "PyColumnarPrototype*.so")):${PYTHONPATH}" python3 -c 'import PyColumnarPrototype; print(f"{PyColumnarPrototype.column_maker()=}")'

build_local.sh

 #!/bin/bash
 
-_ANALYSISBASE_VERSION=22.2.113
+_ANALYSISBASE_VERSION=24.2.3
 if [ -d "/cvmfs/atlas.cern.ch" ]; then
     if [ "$(basename -- $0)" = "$(basename ${BASH_SOURCE})" ]; then
         # running in subshell
@@ -24,7 +24,7 @@ fi
 python3 -c 'import awkward' &> /dev/null
 if [ $? -eq 1 ]; then
     if [ ! -d .venv ]; then
-        python3 -m venv --system-site-packages .venv
+        bash <(curl -sL https://raw.githubusercontent.com/matthewfeickert/cvmfs-venv/v0.0.4/cvmfs-venv.sh) .venv
     fi
     . .venv/bin/activate
     python3 -m pip install --upgrade --requirement requirements.txt

run_docker_env.sh

 #!/bin/bash
 
-RUNNER_IMAGE="gitlab-registry.cern.ch/atlas/athena/analysisbase:22.2.113"
+RUNNER_IMAGE="gitlab-registry.cern.ch/atlas/athena/analysisbase:24.2.3"
 
 docker pull "${RUNNER_IMAGE}"
 
 # As default user 'atlas' is uid 1000
 # ```
-# $ docker run --rm gitlab-registry.cern.ch/atlas/athena/analysisbase:22.2.113 /bin/bash -c 'id'
+# $ docker run --rm gitlab-registry.cern.ch/atlas/athena/analysisbase:24.2.3 /bin/bash -c 'id'
 # uid=1000(atlas) gid=1000(atlas) groups=1000(atlas),0(root),10(wheel)
 # ```
 # match it with `--user 1000:1000`` to ensure that output files from bindmount are under user control

src/CMakeLists.txt

@@ -23,7 +23,7 @@ cmake_minimum_required( VERSION 3.18...3.22 )
 project( PyColumnarPrototypeDemo VERSION 1.0.0 LANGUAGES CXX )
 
 # Find the base project.
-find_package( AnalysisBase 22.2 REQUIRED )
+find_package( AnalysisBase 24.2 REQUIRED )
 
 # Set up the project's custom CMake code.
 list( PREPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" )
@@ -50,7 +50,7 @@ add_subdirectory(bindings)
 message(STATUS "${Python_LIBRARIES}")
 
 # Set the ATLAS project, for building all packages in the repository.
-atlas_project( USE AnalysisBase 22.2 )
+atlas_project( USE AnalysisBase 24.2 )
 
 # Set up the runtime environment setup script(s).
 lcg_generate_env( SH_FILE ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/env_setup.sh )