Merge branch 'root-project:master' into curl-send-put-req

Author: JasMehta08

.github/workflows/cibuildwheel-impl/action.yml

@@ -9,7 +9,7 @@ runs:
   using: "composite"
   steps:
     - name: Build wheel
-      uses: pypa/cibuildwheel@v3.0.1
+      uses: pypa/cibuildwheel@v3.4.1
       env:
         CIBW_BUILD: ${{ inputs.build-tag }}
 

.github/workflows/cppinterop-diff.yml

@@ -29,4 +29,4 @@ jobs:
         run: |
           rm -rf .git .github discord.svg
       - name: Compare
-        run: diff --exclude=CMakeLists.txt -ur CppInterOp/ root/interpreter/CppInterOp/
+        run: diff -ur CppInterOp/ root/interpreter/CppInterOp/

.github/workflows/python_wheel_build.yml

@@ -3,11 +3,11 @@ name: 'ROOT Python wheels'
 on:
   workflow_dispatch:
     inputs:
-      branch:
-        description: 'The branch for which the Python wheel has to be generated'
+      ref:
+        description: 'The git ref to build the wheel from (branch, tag, or commit SHA).'
         type: string
         required: true
-        default: "master"
+        default: ''
   schedule:
     - cron: '01 1 * * *'
   pull_request:
@@ -28,10 +28,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [cp310-manylinux_x86_64, cp311-manylinux_x86_64, cp312-manylinux_x86_64, cp313-manylinux_x86_64]
+        target: [cp310-manylinux_x86_64, cp311-manylinux_x86_64, cp312-manylinux_x86_64, cp313-manylinux_x86_64, cp314-manylinux_x86_64]
     name: ${{ matrix.target }}
     steps:
       - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event.inputs.ref }}
       - uses: ./.github/workflows/cibuildwheel-impl
         with:
           build-tag: ${{ matrix.target }}
@@ -42,11 +44,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
     name: test-wheel-cp${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v6
-
+        with:
+          ref: ${{ github.event.inputs.ref }}
       - name: Download produced wheels
         uses: actions/download-artifact@v4
         with:
@@ -121,3 +124,23 @@ jobs:
           kinit  -p ${{ secrets.KRB5USER }}@${{ secrets.KRB5REALM }} -kt ${KT_FILE_NAME}
           echo +++ Running the copy
           xrdcp --parallel ${NFILES} -rf wheelhouse/* ${EOS_ENDPOINT}/${EOS_PATH}/
+
+  publish-to-pypi:
+      if: github.event_name == 'workflow_dispatch'
+      needs: build-wheels
+      runs-on: ubuntu-latest
+      name: >-
+        Publish Python distribution to PyPI
+      environment:
+        name: pypi
+        url: https://pypi.org/p/root
+      permissions:
+        id-token: write
+      steps:
+      - name: Download produced wheels
+        uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          path: dist/
+      - name: Publish distribution to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/root-ci.yml

@@ -223,7 +223,7 @@ jobs:
           path: /Users/sftnight/ROOT-CI/build/TestResults.xml
 
       - name: Upload binaries
-        if:   ${{ !cancelled() && (inputs.binaries || github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) }}
+        if:   ${{ !cancelled() && !matrix.is_special && (inputs.binaries || github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) }}
         uses: actions/upload-artifact@v6
         with:
           name: Binaries ${{ matrix.platform }} ${{ matrix.arch }}
@@ -576,7 +576,7 @@ jobs:
           path: /github/home/ROOT-CI/build/TestResults.xml
 
       - name: Upload binaries
-        if:   ${{ !cancelled() && (inputs.binaries || github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) }}
+        if:   ${{ !cancelled() && !matrix.is_special && (inputs.binaries || github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) }}
         uses: actions/upload-artifact@v6
         with:
           name: Binaries ${{ matrix.image }} ${{ matrix.property }}
@@ -588,14 +588,17 @@ jobs:
           ccache -s || true
 
       - name: Install
+        if: ${{ !cancelled() && !matrix.is_special }}
         run: "cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_DIR }}"
 
       - name: Build post-install test project
+        if: ${{ !cancelled() && !matrix.is_special }}
         run: |
           cmake -S test/PostInstall/ -B ${{ env.POST_INSTALL_DIR }} -DCMAKE_PREFIX_PATH=${{ env.INSTALL_DIR }};
           cmake --build ${{ env.POST_INSTALL_DIR }};
 
       - name: CTest in post-install test project
+        if: ${{ !cancelled() && !matrix.is_special }}
         working-directory: ${{ env.POST_INSTALL_DIR }}
         run: ctest --output-on-failure -j $(nproc)
 
@@ -615,3 +618,48 @@ jobs:
       with:
         name: Event File
         path: ${{ github.event_path }}
+
+  publish_binaries:
+    # Publish the binary tarballs to the website
+    if: ${{ github.event_name == 'workflow_dispatch' && inputs.binaries}}
+    name: "Publish binaries on the web"
+    needs: [build-linux, build-windows, build-macos]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download All Artifacts
+      uses: actions/download-artifact@v8
+    - name: Install Kerberos utilities
+      run: sudo apt-get install -y krb5-user
+    - name: Install XRootD client
+      run: sudo apt-get -y install xrootd-client
+    - name: Copy Binaries to EOS
+      env:
+        RWEBEOS_KT: ${{ secrets.RWEBEOS_KT }}
+        KT_FILE_NAME: /tmp/decoded.keytab
+        EOS_PATH: /eos/project/r/root-eos/website/download
+        EOS_ENDPOINT: root://eosproject-r.cern.ch
+        KRB5CCNAME: /tmp/krb5cc
+      working-directory: ${{ env.WORKDIR }}
+      run: |
+        echo +++ Content
+        ls
+        echo +++ Retrieving the secret
+        echo ${RWEBEOS_KT} | base64 -d > ${KT_FILE_NAME}
+        echo +++ Creating the token
+        kinit  -p ${{ secrets.KRB5USER }}@${{ secrets.KRB5REALM }} -kt ${KT_FILE_NAME}
+        echo +++ Running the copy
+        xrdcp -rf Binaries*/root_v* ${EOS_ENDPOINT}/${EOS_PATH}/
+
+
+  invoke_rn_creation:
+    # Create release notes
+    if: ${{ github.event_name == 'workflow_dispatch' && inputs.binaries}}
+    name: "Invoke the creation of the Release Notes"
+    needs: publish_binaries
+    uses: ./.github/workflows/root-rn-ci.yml
+    secrets:
+      RWEBEOS_KT: ${{ secrets.RWEBEOS_KT }}
+      KRB5REALM: ${{ secrets.KRB5REALM }}
+      KRB5USER: ${{ secrets.KRB5USER }}
+    with:
+      branch: ${{ github.head_ref || github.ref_name }}

.github/workflows/root-rn-ci.yml

@@ -8,7 +8,19 @@ on:
         type: string
         required: true
         default: "master"
-
+  workflow_call:
+    inputs:
+      branch:
+        type: string
+        required: true
+    secrets:
+      RWEBEOS_KT:
+        required: true
+      KRB5REALM:
+        required: true
+      KRB5USER:
+        required: true
+      
 jobs:
   create_release_notes:
     runs-on: ubuntu-latest

.github/workflows/root-src-tarball.yml

@@ -0,0 +1,85 @@
+name: 'Src Tarball'
+
+on:
+  workflow_dispatch:
+    inputs:
+      major:
+        type: choice
+        description: Major
+        options: 
+        - 6
+        - 7
+        - 8
+        required: true
+        default: 6
+      minor:
+        type: choice
+        description: Minor
+        options: 
+        - 26
+        - 28
+        - 30
+        - 32
+        - 36
+        - 38
+        - 40
+        - 42
+        - 44
+        - 46
+        - 48
+        required: true
+        default: 40
+      patch:
+        type: choice
+        description: Patch
+        options: 
+        - "00"
+        - "02"
+        - "04"
+        - "06"
+        - "08"
+        - "10"
+        - "12"
+        - "14"
+        - "16"
+        - "18"
+        - "20"
+        - "22"
+        - "24"
+        - "26"
+        - "28"
+        - "30"
+        required: true
+        default: "00"
+
+jobs:
+  check-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the official ROOT repo
+        uses: actions/checkout@v6
+        with:
+          path: root
+          ref: v${{ inputs.major }}-${{ inputs.minor }}-${{ inputs.patch }}
+      - name: Install Kerberos utilities
+        run: sudo apt-get install -y krb5-user
+      - name: Install XRootD client
+        run: sudo apt-get -y install xrootd-client
+      - name: Create a Source Tarball
+        run: sh root/cmake/unix/makedistsrc.sh ${{ inputs.major }}.${{ inputs.minor }}.${{ inputs.patch }} root
+      - name: Copy Source Tarball to EOS
+        env:
+          RWEBEOS_KT: ${{ secrets.RWEBEOS_KT }}
+          KT_FILE_NAME: /tmp/decoded.keytab
+          EOS_PATH: /eos/project/r/root-eos/website/download
+          EOS_ENDPOINT: root://eosproject-r.cern.ch
+          KRB5CCNAME: /tmp/krb5cc
+        run: |
+          echo +++ Content
+          ls
+          echo +++ Retrieving the secret
+          echo ${RWEBEOS_KT} | base64 -d > ${KT_FILE_NAME}
+          echo +++ Creating the token
+          kinit  -p ${{ secrets.KRB5USER }}@${{ secrets.KRB5REALM }} -kt ${KT_FILE_NAME}
+          echo +++ Running the copy
+          xrdcp -rf root_v${{ inputs.major }}.${{ inputs.minor }}.${{ inputs.patch }}.source.tar.gz ${EOS_ENDPOINT}/${EOS_PATH}/

README/ReleaseNotes/v640/index.md

@@ -59,7 +59,8 @@ The following people have contributed to this new version:
 * The `TFTP`, `TNetFile`, `TNetFileStager`, and `TNetSystem` classes are deprecated and will be removed in ROOT 6.42. These classes rely on **rootd**, which was removed in release 6.16.
 * The ROOT **auth** package together with `TVirtualAuth` and `TROOT::GetListOfSecContexts()`, and the **authenticated sockets** (`TSocket::CreateAuthSocket()`) feature are deprecated and will be remove in ROOT 6.42.
   The security assumtions in the current socket authentication implementation is not up to date anymore.
-  Secure communication should be provided by standard means, such as SSL sockets or SSH tunneling.
+  Secure communication should be provided by external means, such as SSH tunneling.
+* The `TSSLSocket` class is deprecated and should not be used in user code anymore. Secure communication should be provided by externals means, such as SSH tunneling.
 * The `builtin_davix` build option has been removed.
   The Davix I/O code in ROOT remains uneffected and is built as before provided that the Davix library is found on the system.
 * `RRealField::SetQuantized` now has a new overload and the existing signature has been deprecated. The new overload enforces proper ordering of the arguments.
@@ -335,6 +336,7 @@ Given the risk of silently incorrect physics results, and the absence of known w
 
 ## RDataFrame
 
+- The RDataFrame documentation now contains a section to help translate `TTree::Draw` expressions to RDataFrame, the ["Rosetta stone"](https://root.cern/doc/master/classROOT_1_1RDataFrame.html#rosetta-stone).
 - The change of default compression settings used by Snapshot for the TTree output data format introduced in 6.38 (was 101 before 6.38, became 505 in 6.38) is reverted. That choice was based on evidence available up to that point that indicated that ZSTD was outperforming ZLIB in all cases for the available datasets. New evidence demonstrated that this is not always the case, and in particular for the notable case of TTree branches made of collections where many (up to all) of them are empty. The investigation is described at https://github.com/vepadulano/ttree-lossless-compression-studies. The new default compression settings for Snapshot are respectively `kUndefined` for the compression algorithm and `0` for the compression level. When Snapshot detects `kUndefined` used in the options, it changes the compression settings to the new defaults of 101 (for TTree) and 505 (for RNTuple).
 - Signatures of the HistoND and HistoNSparseD operations have been changed. Previously, the list of input column names was allowed to contain an extra column for events weights. This was done to align the logic with the THnBase::Fill method. But this signature was inconsistent with all other Histo* operations, which have a separate function argument that represents the column to get the weights from. Thus, HistoND and HistoNSparseD both now have a separate function argument for the weights. The previous signature is still supported, but deprecated: a warning will be raised if the user passes the column name of the weights as an extra element of the list of input column names. In a future version of ROOT this functionality will be removed. From now on, creating a (sparse) N-dim histogram with weights should be done by calling `HistoN[Sparse]D(histoModel, inputColumns, weightColumn)`.
 - The string expressions passed to `Vary` calls can now be shortened. If the string begins with '{' and ends with '}' (excluding whitespace, tab and newline characters), RDataFrame will automatically inject the return type in the generated lambda expression before declaring it to the interpreter. This for example allows writing an expression such as `{{px * 0.9, px * 1.1}, {py * 0.9, py * 1.1}}` instead of `ROOT::RVec<ROOT::RVec<ROOT::RVec<float>>>{{px * 0.9, px * 1.1}, {py * 0.9, py * 1.1}}`
@@ -801,4 +803,3 @@ More than 130 items were addressed for this release:
   * [[ROOT-7499](https://its.cern.ch/jira/browse/ROOT-7499)] - ExpectedData generated from RooSimultaneous does not have non-integer weights
   * [[ROOT-5306](https://its.cern.ch/jira/browse/ROOT-5306)] - Read a file with a versioned class layout fails if the current class layout is unversioned
   * [[ROOT-5174](https://its.cern.ch/jira/browse/ROOT-5174)] - rootcling without linkdef
-

bindings/pyroot/pythonizations/python/ROOT/__init__.py

@@ -10,6 +10,7 @@
 
 from __future__ import annotations
 
+import atexit
 import builtins
 import os
 import platform
@@ -188,3 +189,28 @@ def find_spec(self, fullname: str, path, target=None) -> ModuleSpec:
         from . import _jupyroot  # noqa: F401  # imported the side effect of setting up JupyROOT
 
         # from . import JsMVA
+
+
+def _cleanup():
+    # Delete TBrowser instances while the GUI event loop is still alive,
+    # which fixed https://github.com/root-project/root/issues/21912.
+    #
+    # The cleanup is kept tight on purpose. A previous version called
+    # TROOT::EndOfProcessCleanups() outright (removed in commit e9d2803), which
+    # also ran gInterpreter->ResetGlobals() and ShutDown() and interfered with
+    # Python objects still alive at exit time, by cleaning up objects that
+    # might be referenced by other Python proxies outside the control of gROOT.
+    facade = sys.modules[__name__]
+
+    # Skip if the C++ runtime was never initialized (i.e. _finalSetup did
+    # not run): nothing to clean up, and we don't want to drag cppyy in.
+    if "_cppyy" not in facade.__dict__:
+        return
+
+    if not getattr(facade.PyConfig, "ShutDown", True):
+        return
+
+    facade.gROOT.GetListOfBrowsers().Delete()
+
+
+atexit.register(_cleanup)

bindings/pyroot/pythonizations/python/ROOT/_facade.py

@@ -155,6 +155,11 @@ def __init__(self, module, is_ipython):
         # calls). We reproduce their semantics here using LiveProxy.
         self.gDirectory = TDirectoryPythonAdapter()
 
+        def _gclient_resolver():
+            import ROOT
+
+            return ROOT.TGClient.Instance()
+
         def _gpad_resolver():
             import ROOT
 
@@ -165,6 +170,7 @@ def _gvirtualx_resolver():
 
             return ROOT.TVirtualX.Instance()
 
+        self.gClient = LiveProxy(_gclient_resolver)
         self.gPad = LiveProxy(_gpad_resolver)
         self.gVirtualX = LiveProxy(_gvirtualx_resolver)
 
@@ -300,6 +306,14 @@ def _finalSetup(self):
         # Make sure the interpreter is initialized once gROOT has been initialized
         self._cppyy.gbl.TInterpreter.Instance()
 
+        # Release the GIL on the heavy TInterpreter functions. This lets
+        # background Python threads make progress - in particular, JupyROOT's
+        # StreamCapture polling thread can drain stdout/stderr live to the
+        # notebook frontend instead of waiting for the cell to finish.
+        TInterpreter = self._cppyy.gbl.TInterpreter
+        for name in ("ProcessLine", "ProcessLineSynch", "Declare", "LoadFile", "LoadMacro", "ExecuteMacro"):
+            getattr(TInterpreter, name).__release_gil__ = True
+
         # Setup interactive usage from Python
         self.__dict__["app"] = PyROOTApplication(self.PyConfig, self._is_ipython)
         if not self.gROOT.IsBatch() and self.PyConfig.StartGUIThread: