Address review comments

Author: vepadulano

bindings/CMakeLists.txt

@@ -17,7 +17,7 @@ if(pyroot)
   endif()
 endif()
 
-if(tpython AND NOT (DEFINED ROOT_WHEEL_BUILD AND ROOT_WHEEL_BUILD))
+if(tpython)
   add_subdirectory(tpython)
 endif()
 

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

@@ -8,29 +8,9 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.                    #
 ################################################################################
 
-# First, check for presence of important dependencies
+import importlib
 import os
-import shlex
 import sys
-import subprocess
-import textwrap
-
-import platform
-if platform.system() != "Windows":
-    try:
-        # Mimic what cling does to find standard headers include path
-        cmd = shlex.split('c++ -xc++ -E -v /dev/null')
-        env = os.environ
-        env.update({'LC_ALL': 'C'})
-        subprocess.run(cmd, env=env, check=True,
-                    stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    except Exception as e:
-        msg = (
-            "Could not find a C++ compiler when importing ROOT. Make sure a C++ compiler as well as the C++ standard "
-            "libraries are installed. For example, run `[apt,dnf] install g++` or follow similar instructions for your "
-            "distribution. For more info, visit https://root.cern/install/dependencies"
-        )
-        raise ImportError(textwrap.fill(msg, width=80)) from e
 
 # Prevent cppyy's check for the PCH
 os.environ["CLING_STANDARD_PCH"] = "none"

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

@@ -11,6 +11,7 @@
 from ._numbadeclare import _NumbaDeclareDecorator
 from ._pythonization import pythonization
 
+
 class PyROOTConfiguration(object):
     """Class for configuring PyROOT"""
 

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

@@ -6,15 +6,14 @@
 
 
 def main() -> None:
-    # Ensure all ROOT libraries are found at runtime by the process
-    os.environ['LD_LIBRARY_PATH'] = os.path.join(ROOT_HOME, 'lib')
-    # Finds the ROOT executable from the current installation directory
-    bindir = os.path.join(ROOT_HOME, 'bin')
-    rootexe = os.path.join(bindir, 'root.exe')
+    # Find the ROOT executable from the current installation directory
+    bindir = os.path.join(ROOT_HOME, "bin")
+    rootexe = os.path.join(bindir, "root.exe")
     if not os.path.exists(rootexe):
         raise FileNotFoundError(
-            f"Could not find 'root' executable in directory '{bindir}'. "
-            "Something is wrong in the ROOT installation.")
+            f"Could not find 'root.exe' executable in directory '{bindir}'. "
+            "Something is wrong in the ROOT installation."
+        )
     # Make sure command line arguments are preserved
     args = [rootexe] + sys.argv[1:]
     # Run the actual ROOT executable and return the exit code to the main Python process

cmake/modules/SearchInstalledSoftware.cmake

@@ -676,14 +676,12 @@ set(Python3_FIND_FRAMEWORK LAST)
 
 # Even if we don't build PyROOT, one still need python executable to run some scripts
 list(APPEND python_components Interpreter)
-if(pyroot OR tmva-pymva)
-  if(DEFINED ROOT_WHEEL_BUILD AND ROOT_WHEEL_BUILD)
-    # We have to only look for the Python development module in order to be able to build ROOT with a pip backend
-    # In particular, it is forbidden to link against libPython.so, see https://peps.python.org/pep-0513/#libpythonx-y-so-1
-    list(APPEND python_components Development.Module)
-  else()
-    list(APPEND python_components Development)
-  endif()
+if(pyroot AND NOT (tpython OR tmva-pymva))
+  # We have to only look for the Python development module in order to be able to build ROOT with a pip backend
+  # In particular, it is forbidden to link against libPython.so, see https://peps.python.org/pep-0513/#libpythonx-y-so-1
+  list(APPEND python_components Development.Module)
+elseif(tpython OR tmva-pymva)
+  list(APPEND python_components Development)
 endif()
 if(tmva-pymva)
   list(APPEND python_components NumPy)
@@ -1780,7 +1778,7 @@ if(pyroot)
 endif()
 
 #---Check for TPython---------------------------------------------------------------------
-if(tpython AND NOT (DEFINED ROOT_WHEEL_BUILD AND ROOT_WHEEL_BUILD))
+if(tpython)
 
   if(NOT Python3_Development_FOUND)
     if(fail-on-missing)

setup.py

@@ -19,16 +19,16 @@
 generate the wheel with CPython extension metadata.
 """
 
-from setuptools import setup, find_packages, Extension
+import os
 import pathlib
+import shlex
+import subprocess
 import tempfile
+
+from setuptools import Extension, find_packages, setup
 from setuptools.command.build import build as _build
 from setuptools.command.install import install as _install
 
-import subprocess
-import os
-import shlex
-
 # Get the long description from the README file
 SOURCE_DIR = pathlib.Path(__file__).parent.resolve()
 LONG_DESCRIPTION = (SOURCE_DIR / "README.md").read_text(encoding="utf-8")
@@ -50,7 +50,8 @@ def run(self):
         configure_command = shlex.split(
             "cmake -GNinja -Dccache=ON "
             "-Dgminimal=ON -Dasimage=ON -Dopengl=OFF "  # Graphics
-            "-Druntime_cxxmodules=ON -Drpath=ON -Dfail-on-missing=ON -DROOT_WHEEL_BUILD=ON "  # Generic build configuration
+            "-Druntime_cxxmodules=ON -Drpath=ON -Dfail-on-missing=ON "  # Generic build configuration
+            "-Dtmva-pymva=OFF -Dtpython=OFF "  # Turn off explicitly components that link against libPython
             "-Dbuiltin_nlohmannjson=ON -Dbuiltin_tbb=ON -Dbuiltin_xrootd=ON "  # builtins
             "-Dbuiltin_lz4=ON -Dbuiltin_lzma=ON -Dbuiltin_zstd=ON -Dbuiltin_xxhash=ON "  # builtins
             "-Dpyroot=ON -Ddataframe=ON -Dxrootd=ON -Dssl=ON -Dimt=ON "
@@ -87,8 +88,6 @@ def run(self):
 
         install_path = self._get_install_path()
 
-        lib_dir = os.path.join(INSTALL_DIR, "lib")
-
         # Copy ROOT installation tree to the ROOT package directory in the pip installation path
         self.copy_tree(os.path.join(INSTALL_DIR, ROOT_BUILD_INTERNAL_DIRNAME), install_path)
 
@@ -97,7 +96,6 @@ def run(self):
         # After the copy of the "mock" package structure from the ROOT installations, these are the
         # leftover directories that still need to be copied
         self.copy_tree(os.path.join(INSTALL_DIR, "cmake"), os.path.join(root_package_dir, "cmake"))
-        self.copy_tree(os.path.join(INSTALL_DIR, "config"), os.path.join(root_package_dir, "config"))
         self.copy_tree(os.path.join(INSTALL_DIR, "etc"), os.path.join(root_package_dir, "etc"))
         self.copy_tree(os.path.join(INSTALL_DIR, "fonts"), os.path.join(root_package_dir, "fonts"))
         self.copy_tree(os.path.join(INSTALL_DIR, "icons"), os.path.join(root_package_dir, "icons"))