Skip to content

Commit 411dd1d

Browse files
committed
Remove workaround for importing submodule
1 parent 58efb5c commit 411dd1d

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@
1111
from ._numbadeclare import _NumbaDeclareDecorator
1212
from ._pythonization import pythonization
1313

14-
# Because the facade acts as the actual ROOT package for `import` purposes,
15-
# we have to expose any further scripts that must be picked up by the pip
16-
# build backend so that the generated executable can properly run
17-
# `from ROOT._name_of_script import main`. See pyproject.toml for the list
18-
# of enabled scripts.
19-
from . import _rootcli as _rootexe
20-
2114
class PyROOTConfiguration(object):
2215
"""Class for configuring PyROOT"""
2316

@@ -62,8 +55,6 @@ def _subimport(name):
6255
class ROOTFacade(types.ModuleType):
6356
"""Facade class for ROOT module"""
6457

65-
_rootcli = _rootexe
66-
6758
def __init__(self, module, is_ipython):
6859
types.ModuleType.__init__(self, module.__name__)
6960

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def run(self):
4747
"-Dgminimal=ON -Dasimage=ON -Dopengl=OFF " # Graphics
4848
"-Druntime_cxxmodules=ON -Drpath=ON -Dfail-on-missing=ON -DROOT_WHEEL_BUILD=ON " # Generic build configuration
4949
"-Dbuiltin_nlohmannjson=ON -Dbuiltin_tbb=ON -Dbuiltin_xrootd=ON " # builtins
50-
"-Dbuiltin_lz4=ON -Dbuiltin_lzma=ON -Dbuiltin_zstd=ON -Dbuiltin_xxhash=ON" # builtins
50+
"-Dbuiltin_lz4=ON -Dbuiltin_lzma=ON -Dbuiltin_zstd=ON -Dbuiltin_xxhash=ON " # builtins
5151
"-Dpyroot=ON -Ddataframe=ON -Dxrootd=ON -Dssl=ON -Dimt=ON "
5252
"-Droofit=ON "
5353
f"-DCMAKE_INSTALL_PREFIX={INSTALL_DIR} -B {BUILD_DIR} -S {SOURCE_DIR}"

0 commit comments

Comments
 (0)