Merge branch 'master' into 'pythoncompression'

# Conflicts: # src/ReaderAscii.cc # src/ReaderAsciiHepMC2.cc
hep-mirrors · Jan 14, 2025 · 21ef2a7 · 21ef2a7
2 parents 9bef5e5 + 7c7f4e5
commit 21ef2a7
Show file tree

Hide file tree

Showing 77 changed files with 1,742 additions and 978 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,31 +12,66 @@ jobs:
       matrix:
         python-version: ["3.9"]
         config:
-        - {
-            name: "MacOSX-12",
-            os: macos-12,
-            cc: "clang",
-            cxx: "clang++"
-          }
-        - {
-            name: "MacOSX-11",
-            os: macos-11,
-            cc: "clang",
-            cxx: "clang++"
-          }
         - {
             name: "MacOSX-13",
             os: macos-13,
-            cc: "clang",
             cxx: "clang++"
           }
-        - {
-            name: "MacOSX-14",
-            os: macos-14,
-            cc: "clang",
-            cxx: "clang++"
-          }
-
+        #- {
+            #name: "MacOSX-13",
+            #os: macos-13-xlarge,
+            #cxx: "clang++"
+          #}
+        #- {
+            #name: "MacOSX-14",
+            #os: macos-14,
+            #cxx: "clang++"
+          #}
+        #- {
+            #name: "MacOSX-14",
+            #os: macos-14-xlarge,
+            #cxx: "clang++"
+          #}
+        #- {
+            #name: "MacOSX-15",
+            #os: macos-15,
+            #cxx: "clang++"
+          #}
+        #- {
+            #name: "MacOSX-15",
+            #os: macos-15-xlarge,
+            #cxx: "clang++"
+          #}
+        #- {
+            #name: "MacOSX-13",
+            #os: macos-13,
+            #cxx: "g++-14"
+          #}
+        #- {
+            #name: "MacOSX-13",
+            #os: macos-13-xlarge,
+            #cxx: "g++-14"
+          #}
+        #- {
+            #name: "MacOSX-14",
+            #os: macos-14,
+            #cxx: "g++-14"
+          #}
+        #- {
+            #name: "MacOSX-14",
+            #os: macos-14-xlarge,
+            #cxx: "g++-14"
+          #}
+        #- {
+            #name: "MacOSX-15",
+            #os: macos-15,
+            #cxx: "g++-14"
+          #}
+        #- {
+            #name: "MacOSX-15",
+            #os: macos-15-xlarge,
+            #cxx: "g++-14"
+          #}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
@@ -47,7 +82,9 @@ jobs:
       run:  |
         brew install protobuf
         brew install doxygen
-        cmake -S. -B BUILD -DCMAKE_INSTALL_PREFIX=./INSTALL -DHEPMC3_BUILD_DOCS:BOOL=OFF -DHEPMC3_BUILD_EXAMPLES:BOOL=ON -DHEPMC3_ENABLE_ROOTIO:BOOL=OFF -DHEPMC3_ENABLE_PROTOBUFIO:BOOL=ON -DHEPMC3_ENABLE_TEST:BOOL=ON -DHEPMC3_PYTHON_VERSIONS=3
+        set -x
+        uname -m
+        cmake -S. -B BUILD  -DCMAKE_CXX_COMPILER=${{matrix.config.cxx}} -DCMAKE_C_COMPILER=${{matrix.config.cc}} -DCMAKE_INSTALL_PREFIX=./INSTALL -DHEPMC3_ENABLE_PYTHON=OFF -DHEPMC3_BUILD_DOCS:BOOL=OFF -DHEPMC3_BUILD_EXAMPLES:BOOL=ON -DHEPMC3_ENABLE_ROOTIO:BOOL=OFF -DHEPMC3_ENABLE_PROTOBUFIO:BOOL=OFF -DHEPMC3_ENABLE_TEST:BOOL=ON -DHEPMC3_PYTHON_VERSIONS=3
         cmake --build BUILD
         cmake --install BUILD
         cd BUILD

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,59 +1,69 @@
 variables:
   DOCKER_DRIVER: overlay2
-  STANDARDFLAGS: -DHEPMC3_TEST_VALGRIND=ON  -DHEPMC3_ENABLE_PROTOBUFIO:BOOL=ON -DHEPMC3_ENABLE_ROOTIO:BOOL=ON -DHEPMC3_BUILD_EXAMPLES:BOOL=ON -DHEPMC3_ENABLE_TEST:BOOL=ON -DHEPMC3_TEST_VALGRIND:BOOL=ON -DHEPMC3_ENABLE_PYTHON:BOOL=ON -DHEPMC3_INSTALL_INTERFACES:BOOL=ON -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON -DHEPMC3_BUILD_DOCS:BOOL=ON
+  STANDARDFLAGS: -DHEPMC3_TEST_VALGRIND=ON  -DHEPMC3_ENABLE_PROTOBUFIO:BOOL=ON -DHEPMC3_ENABLE_ROOTIO:BOOL=ON -DHEPMC3_BUILD_EXAMPLES:BOOL=ON -DHEPMC3_ENABLE_TEST:BOOL=ON -DHEPMC3_TEST_VALGRIND:BOOL=ON -DHEPMC3_ENABLE_PYTHON:BOOL=ON -DHEPMC3_INSTALL_INTERFACES:BOOL=ON -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON -DHEPMC3_BUILD_DOCS:BOOL=ON  -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON 
   #-DCMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra"
 stages:
   - check_if_dockerfile_updated
   - build_docker_image
   - build
   - LCG
 ########################################################################
-.LCGcmake: &LCGcmake
-    - mkdir BUILD
-    - cd BUILD
-    - set -x
-    - cmake .. -DCMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" ${STANDARDFLAGS} ${LARG}  ${EXTRACMAKEFLAGS}
-    - set +x
-    - make -j $(nproc)
-    - make -j $(nproc) install
-    - ctest -j 5 --output-on-failure
 
-LCG_99_x86_64-centos7-gcc8-opt:
+LCG_x86_64-alma9:
   only:
     variables:
      - $CI_SERVER_HOST=="gitlab.cern.ch"
-  image: gitlab-registry.cern.ch/sft/docker:lcg-cc7
+  image: gitlab-registry.cern.ch/sft/docker/alma9-core:latest
   tags:
     - k8s-cvmfs
   stage: LCG
-  before_script:
-    - export LCGPLATFORM=x86_64-centos7-gcc8-opt
-    - export LCG_LOCATION=/cvmfs/sft.cern.ch/lcg/releases/LCG_99
-    - source /cvmfs/sft.cern.ch/lcg/contrib/gcc/8.2.0/${LCGPLATFORM}/setup.sh
-    - source ${LCG_LOCATION}/ROOT/v6.22.06/${LCGPLATFORM}/ROOT-env.sh
-    - export PATH=/cvmfs/sft.cern.ch/lcg/contrib/CMake/latest/Linux-x86_64/bin/:${PATH}
-    - export ROOTSYS=${LCG_LOCATION}/ROOT/v6.22.06/${LCGPLATFORM}/
-    - source ${LCG_LOCATION}/valgrind/3.16.1/${LCGPLATFORM}/valgrind-env.sh
-    - source ${LCG_LOCATION}/graphviz/2.40.1/${LCGPLATFORM}/graphviz-env.sh
-    - source ${LCG_LOCATION}/zlib/1.2.11/${LCGPLATFORM}/zlib-env.sh
-    - source ${LCG_LOCATION}/Python/3.8.6/${LCGPLATFORM}/Python-env.sh
-    - source ${LCG_LOCATION}/HepMC/2.06.11/${LCGPLATFORM}/HepMC-env.sh
-    - source ${LCG_LOCATION}/protobuf/2.5.0/${LCGPLATFORM}/protobuf-env.sh
-#LCG 99 calls its variable Protobuf__HOME instead of Protobuf_HOME
-    - export Protobuf_ROOT=$(pkg-config protobuf --variable=prefix)
   script:
-    - export
-    - LARG=" "
-    - LARG="$LARG "-DPYTHIA8_ROOT_DIR=${LCG_LOCATION}/MCGenerators/pythia8/244/${LCGPLATFORM}
-    - LARG="$LARG "-DHEPMC2_ROOT_DIR=${LCG_LOCATION}/HepMC/2.06.11/${LCGPLATFORM}/
-    - LARG="$LARG "-DGRAPHVIZ_ROOT=${LCG_LOCATION}/graphviz/2.40.1/${LCGPLATFORM}/
-    - LARG="$LARG "-DProtobuf_INCLUDE_DIR=${Protobuf_ROOT}/include
-    - LARG="$LARG "-DProtobuf_LIBRARY=${Protobuf_ROOT}/lib/libprotobuf.so
-    - LARG="$LARG "-DHEPMC3_USE_INTERFACE_FROM_PYTHIA8:BOOL=OFF
-    - LARG="$LARG "-DHEPMC3_PYTHON_VERSIONS=3
-    - LARG="$LARG "-DCMAKE_INSTALL_PREFIX=$(pwd)/install
-    - LARG="$LARG "-DHEPMC3_Python_SITEARCH38=$(pwd)/install/lib/python3.8/site-packages
-    - *LCGcmake
+    - |
+      export ATLAS_LOCAL_ROOT_BASE=/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase
+      uname -m
+      export LCGRELEASE=LCG_106a_ATLAS_8 
+      UNAME=$(uname -m)
+      export GCCV=13
+      set -x
+      export LCGPLATFORM=$UNAME"-el9-gcc"$GCCV"-opt"
+      export LCGLOCATION=/cvmfs/sft.cern.ch/lcg/releases/$LCGRELEASE
+      export HM3_ROOT_VERSION=$(cat  $LCGLOCATION/LCG_externals_$LCGPLATFORM'.txt' | grep 'ROOT;' | cut -f 3 -d';' | tr -d ' ')
+      export HM3_VALGRIND_VERSION=$(cat  $LCGLOCATION/LCG_externals_$LCGPLATFORM'.txt' | grep 'valgrind;' | cut -f 3 -d';' | tr -d ' ')
+      export HM3_GRAPHVIZ_VERSION=$(cat  $LCGLOCATION/LCG_externals_$LCGPLATFORM'.txt' | grep '^graphviz;' | cut -f 3 -d';' | tr -d ' ')
+      export HM3_PYTHON_VERSION=$(cat  $LCGLOCATION/LCG_externals_$LCGPLATFORM'.txt' | grep 'Python;' | cut -f 3 -d';' | tr -d ' ')
+      export PYTHON3VERSION=$(echo $HM3_PYTHON_VERSION | cut -f 1,2 -d. | tr -d .)
+      export PYTHON3DOTVERSION=$(echo $HM3_PYTHON_VERSION | cut -f 1,2 -d. )
+      export HM3_HEPMC_VERSION=$(cat  $LCGLOCATION/LCG_externals_$LCGPLATFORM'.txt' | grep 'HepMC;' | cut -f 3 -d';' | tr -d ' ')
+      export HM3_PROTOBUF_VERSION=$(cat  $LCGLOCATION/LCG_externals_$LCGPLATFORM'.txt' | grep 'protobuf;' | cut -f 3 -d';' | tr -d ' ')
+      export HM3_PROTOBUF2_VERSION=$(cat  $LCGLOCATION/LCG_externals_$LCGPLATFORM'.txt' | grep 'protobuf2;' | cut -f 3 -d';' | tr -d ' ')
+      export HM3_PYTHIA8_VERSION=$(cat  $LCGLOCATION/LCG_generators_$LCGPLATFORM'.txt' | grep 'pythia8;' | cut -f 3 -d';' | tr -d ' ')
+      source /cvmfs/sft.cern.ch/lcg/contrib/gcc/${GCCV}/${LCGPLATFORM}/setup.sh
+      export PATH=/cvmfs/sft.cern.ch/lcg/contrib/CMake/latest/Linux-x86_64/bin/:${PATH}
+      source ${LCGLOCATION}/ROOT/${HM3_ROOT_VERSION}/${LCGPLATFORM}/ROOT-env.sh
+      export ROOTSYS=${LCGLOCATION}/ROOT/${HM3_ROOT_VERSION}/${LCGPLATFORM}/
+      source ${LCGLOCATION}/valgrind/${HM3_VALGRIND_VERSION}/${LCGPLATFORM}/valgrind-env.sh
+      source ${LCGLOCATION}/graphviz/${HM3_GRAPHVIZ_VERSION}/${LCGPLATFORM}/graphviz-env.sh
+      source ${LCGLOCATION}/Python/${HM3_PYTHON_VERSION}/${LCGPLATFORM}/Python-env.sh
+      source ${LCGLOCATION}/HepMC/${HM3_HEPMC_VERSION}/${LCGPLATFORM}/HepMC-env.sh
+      source ${LCGLOCATION}/protobuf2/${HM3_PROTOBUF2_VERSION}/${LCGPLATFORM}/protobuf2-env.sh
+      export Protobuf_ROOT=$(pkg-config protobuf --variable=prefix)
+      export LARG=" "
+      export LARG="$LARG "-DPYTHIA8_ROOT_DIR=${LCGLOCATION}/MCGenerators/pythia8/${HM3_PYTHIA8_VERSION}/${LCGPLATFORM}
+      export LARG="$LARG "-DHEPMC2_ROOT_DIR=${LCGLOCATION}/HepMC/${HM3_HEPMC_VERSION}/${LCGPLATFORM}/
+      export LARG="$LARG "-DGRAPHVIZ_ROOT=${LCGLOCATION}/graphviz/${HM3_GRAPHVIZ_VERSION}/${LCGPLATFORM}/
+      export LARG="$LARG "-DProtobuf_INCLUDE_DIR=${Protobuf_ROOT}/include
+      export LARG="$LARG "-DProtobuf_LIBRARY=${Protobuf_ROOT}/lib/libprotobuf.so
+      export LARG="$LARG "-DHEPMC3_USE_INTERFACE_FROM_PYTHIA8:BOOL=OFF
+      export LARG="$LARG "-DCMAKE_INSTALL_PREFIX=$(pwd)/install
+      export LARG="$LARG "-DHEPMC3_Python_SITEARCH${PYTHON3VERSION}=$(pwd)/install/lib/python${PYTHON3DOTVERSION}/site-packages
+      mkdir BUILD
+      cd BUILD
+      set -x
+      cmake .. -DCMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" ${STANDARDFLAGS} ${LARG}  ${EXTRACMAKEFLAGS}
+      set +x
+      make -j $(nproc)
+      make -j $(nproc) install
+      ctest -j 5 --output-on-failure
 
 .check_commit: &check_commit
   stage: check_if_dockerfile_updated
@@ -145,7 +155,7 @@ LCG_99_x86_64-centos7-gcc8-opt:
     - cd $TTOP
 
 .cmake: &cmake
-    - $CMAKE -S . -B BUILD -DCMAKE_INSTALL_PREFIX=$(pwd)/INSTALL -DCMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra"  ${STANDARDFLAGS} ${EXTRACMAKEFLAGS} $CACHINGFLAGS
+    - $CMAKE -S . -B BUILD -DCMAKE_INSTALL_PREFIX=$(pwd)/INSTALL -DCMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra"  -DCMAKE_Fortran_FLAGS="-Wpedantic -Wall -Wextra"  ${STANDARDFLAGS} ${EXTRACMAKEFLAGS} $CACHINGFLAGS
     - $CMAKE --build BUILD -j 10  --verbose
     - $CMAKE --install BUILD
     - cd BUILD
@@ -155,7 +165,7 @@ LCG_99_x86_64-centos7-gcc8-opt:
 .oldcmake: &oldcmake
     - mkdir -p BUILD
     - cd  BUILD
-    - $CMAKE ..  -DCMAKE_INSTALL_PREFIX=$(pwd)/../INSTALL -DCMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra"  ${STANDARDFLAGS} ${EXTRACMAKEFLAGS} $CACHINGFLAGS
+    - $CMAKE ..  -DCMAKE_INSTALL_PREFIX=$(pwd)/../INSTALL -DCMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" -DCMAKE_Fortran_FLAGS="-Wpedantic -Wall -Wextra"  ${STANDARDFLAGS} ${EXTRACMAKEFLAGS} $CACHINGFLAGS
     - make -j 10  SHELL='sh -x'
     - make install
     - $CTEST -j 5 --output-on-failure
@@ -339,7 +349,7 @@ Fedora38-GNU:
     - job: build_image_Fedora38
 
 Fedora37-LLVM:
-  variables: { OS: Fedora, FREL: 37, TOOLSET: LLVM,  EXTRACMAKEFLAGS: }
+  variables: { OS: Fedora, FREL: 37, TOOLSET: LLVM,  EXTRACMAKEFLAGS: -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF}
   extends: .any-cmake
   needs:
     - job: build_image_Fedora37
@@ -357,7 +367,7 @@ Fedora34-GNU:
     - job: build_image_Fedora34
 
 Fedora34-LLVM:
-  variables: { OS: Fedora, FREL: 34, TOOLSET: LLVM,  EXTRACMAKEFLAGS: }
+  variables: { OS: Fedora, FREL: 34, TOOLSET: LLVM,  EXTRACMAKEFLAGS:  -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF}
   extends: .any-cmake
   needs:
     - job: build_image_Fedora34

diff --git a/CI/Fedora/Dockerfile b/CI/Fedora/Dockerfile
@@ -15,6 +15,9 @@ RUN                   if [ $(cat /etc/fedora-release  | grep -Eo '[0-9]+') -eq
 RUN                   if [ $(cat /etc/fedora-release  | grep -Eo '[0-9]+') -eq  33 ]; then yum -y  install pypy pypy-devel; fi && yum -y clean all
 RUN                   if [ $(cat /etc/fedora-release  | grep -Eo '[0-9]+') -gt  30 ]; then yum -y  install liburing  liburing-devel; fi && yum -y clean all
 RUN                   if [ $(cat /etc/fedora-release  | grep -Eo '[0-9]+') -gt  32 ]; then yum -y  install python3-zstandard; fi && yum -y clean all
+# Uproot5
+RUN                   if [ $(cat /etc/fedora-release  | grep -Eo '[0-9]+') -gt  39 ]; then yum -y  install xxhash xxhash-devel python3-xxhash python3-cramjam python3-fsspec python3-packaging; fi && yum -y clean all
+RUN                   if [ $(cat /etc/fedora-release  | grep -Eo '[0-9]+') -gt  39 ]; then pip install uproot --upgrade --upgrade-strategy only-if-needed; fi 
 
 # cat /etc/fedora-release | grep -Eo '[0-9]+'
 # 22 -- cmake is too old, no libzstd libzstd-devel

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 #----------------------------------------------------------------------------
 project(HepMC3 LANGUAGES CXX)
-set(PROJECT_VERSION 3.02.08)
-SET(HEPMC3_VERSION 3.02.08)
+set(PROJECT_VERSION 3.03.00)
+SET(HEPMC3_VERSION 3.03.00)
 SET(HEPMC3_VERSION_MAJOR  3)
-SET(HEPMC3_VERSION_MINOR  2)
-SET(HEPMC3_VERSION_PATCH  8)
+SET(HEPMC3_VERSION_MINOR  3)
+SET(HEPMC3_VERSION_PATCH  0)
 
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 #This module respects HFS, e.g. defines lib or lib64 when it is needed.
@@ -21,6 +21,7 @@ endif(CMAKE_BUILD_TYPE)
 message(STATUS "HepMC3: CMAKE_VERSION=${CMAKE_VERSION}")
 if (${CMAKE_VERSION} VERSION_GREATER "3.8")
   cmake_policy(SET CMP0069 NEW)
+  include(CheckIPOSupported)
 endif()
 
 string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
@@ -122,7 +123,10 @@ include(CheckCXXCompilerFlag)
 if (NOT HEPMC3_CXX_STANDARD)
   set(HEPMC3_CXX_STANDARD 11)
 endif()
-set(HEPMC3_FEATURES "")
+set(HEPMC3_FEATURES "lib")
+if (HEPMC3_BUILD_STATIC_LIBS)
+  list(APPEND HEPMC3_FEATURES "lib_static")
+endif()
 set(HEPMC3_COMPONENTS "")
 if(HEPMC3_ENABLE_ROOTIO)
   list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
@@ -182,8 +186,8 @@ set(PGI_CXX_FLAGS_TO_CHECK "-Wc,--pending_instantiations=0;-noswitcherror;--diag
 set(NVHPC_CXX_FLAGS_TO_CHECK "-Wc,--pending_instantiations=0;-noswitcherror;--diag_suppress=code_is_unreachable;--diag_suppress=offset_in_non_POD_nonstandard;--diag_suppress=set_but_not_used")
 set(Intel_CXX_FLAGS_TO_CHECK "-diag-disable=2196")
 set(IntelLLVM_CXX_FLAGS_TO_CHECK "-diag-disable=2196;-Wno-unused-command-line-argument")
-set(GNU_CXX_FLAGS_TO_CHECK "-Wno-strict-aliasing;-Wno-unused-command-line-argument;-Wno-gnu-zero-variadic-macro-arguments;-Wno-deprecated-declarations")
-set(Clang_CXX_FLAGS_TO_CHECK "-Wno-strict-aliasing;-Wno-unused-command-line-argument;-Wno-gnu-zero-variadic-macro-arguments;-Wno-deprecated-declarations")
+set(GNU_CXX_FLAGS_TO_CHECK "-Wlto-type-mismatch;-Werror=lto-type-mismatch;-Wno-old-style-cast;-Wno-strict-aliasing;-Wno-unused-command-line-argument;-Wno-gnu-zero-variadic-macro-arguments;-Wno-deprecated-declarations")
+set(Clang_CXX_FLAGS_TO_CHECK "-Wlto-type-mismatch;-Werror=lto-type-mismatch;-Wno-old-style-cast;-Wno-strict-aliasing;-Wno-unused-command-line-argument;-Wno-gnu-zero-variadic-macro-arguments;-Wno-deprecated-declarations")
 set(AppleClang_CXX_FLAGS_TO_CHECK "-Wno-strict-aliasing;-Wno-unused-command-line-argument;-Wno-gnu-zero-variadic-macro-arguments;-Wno-deprecated-declarations")
 set(XL_CXX_FLAGS_TO_CHECK "-qsuppress=1500-030")
 foreach(fl ${${CMAKE_CXX_COMPILER_ID}_CXX_FLAGS_TO_CHECK})
@@ -282,6 +286,9 @@ set(INTERFACES_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/HepMC3/interfaces)
 if(HEPMC3_ENABLE_SEARCH)
   add_subdirectory(search)
   list(APPEND HEPMC3_FEATURES "search")
+  if (HEPMC3_BUILD_STATIC_LIBS)
+    list(APPEND HEPMC3_FEATURES "search_static")
+  endif()
   list(APPEND HEPMC3_COMPONENTS "search")
 endif()
 
@@ -304,6 +311,9 @@ if(Protobuf_FOUND)
   add_subdirectory(protobufIO)
   list(APPEND HEPMC3_FEATURES "protobufIO")
   list(APPEND HEPMC3_FEATURES "protobufIO${Protobuf_VERSION}")
+  if (HEPMC3_BUILD_STATIC_LIBS)
+    list(APPEND HEPMC3_FEATURES "protobufIO_static")
+  endif()  
   list(APPEND HEPMC3_COMPONENTS "protobufIO")
 endif()
 
@@ -437,7 +447,6 @@ if (ASTYLE)
     test/*cc
     test/*h
     interfaces/*/include/*.h
-    interfaces/*/include/*/*.h
     interfaces/*/include/*/*.cc
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
   )
@@ -479,8 +488,8 @@ set(CPACK_PACKAGE_VENDOR "HepMC3 Developers")
 #Should the version be defined above?
 set(CPACK_PACKAGE_VERSION 3)
 set(CPACK_PACKAGE_VERSION_MAJOR 3)
-set(CPACK_PACKAGE_VERSION_MINOR 2)
-set(CPACK_PACKAGE_VERSION_PATCH 8)
+set(CPACK_PACKAGE_VERSION_MINOR 3)
+set(CPACK_PACKAGE_VERSION_PATCH 0)
 set(CPACK_PACKAGE_RELEASE 0)
 set(CPACK_PACKAGE_FILE_NAME "HepMC3")
 set(CPACK_PACKAGE_DESCRIPTION "Event record library for high energy physics Monte Carlo")

diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,13 @@
   --------------------------  HepMC3.3.0-pre ----------------------
+2024-05-23 Andrii Verbytskyi
+         * Update python bindings with binder 1.4.2
+         * Update bxzstr to bxzstr 1.2.2 + patches
+         * Formatting
+2024-05-26 Andy Buckley
+         * Explicitly return for inf-generating eta / massless rapidity along pz, to avoid FPE triggering.
 2024-04-20 Andy Buckley
          * Suppress cross-section/weight count-mismatch warning if only one cross-section.
-2024-04-08 Mattias Ellert
+2024-04-08 Andrii Verbytskyi
          * Add support for reading with uproot
          * Drop Python2 support
 2023-10-24 Mattias Ellert