Skip to content

Commit 05aa7c4

Browse files
committed
[Python] Don't include JsMVA in builds
The JsMVA package is undocumented, untested, and lagging behind in terms of the JsROOT version that it uses. At this point, there is no clear reason for including it in the ROOT builds, so this commit suggests to remove it from the build and install tree temporarily, until we are sure that it works (also with the newest JsROOT version).
1 parent 9428920 commit 05aa7c4

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,9 @@ file(GLOB_RECURSE artifact_files RELATIVE ${CMAKE_SOURCE_DIR} etc/*)
345345
# Exclude the *.in files, just like in the install tree
346346
list(FILTER artifact_files EXCLUDE REGEX "\.(in)$")
347347

348+
# Exclude etc/notebook/JsMVA
349+
list(FILTER artifact_files EXCLUDE REGEX "^etc/notebook/JsMVA/")
350+
348351
foreach(artifact_file ${artifact_files})
349352
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${artifact_file}
350353
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/${artifact_file} ${CMAKE_BINARY_DIR}/${artifact_file}
@@ -625,6 +628,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
625628
endif()
626629
install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
627630
${DIR_PERMISSIONS}
631+
PATTERN "notebook/JsMVA" EXCLUDE
628632
PATTERN "system.rootrc" EXCLUDE
629633
PATTERN "system.rootauthrc" EXCLUDE
630634
PATTERN "system.rootdaemonrc" EXCLUDE

bindings/pyroot/pythonizations/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ list(APPEND PYROOT_EXTRA_HEADERS
7171
inc/TPyDispatcher.h)
7272

7373
set(py_sources
74-
ROOT/JsMVA/DataLoader.py
75-
ROOT/JsMVA/Factory.py
76-
ROOT/JsMVA/JPyInterface.py
77-
ROOT/JsMVA/JsMVAMagic.py
78-
ROOT/JsMVA/OutputTransformer.py
79-
ROOT/JsMVA/__init__.py
74+
#ROOT/JsMVA/DataLoader.py
75+
#ROOT/JsMVA/Factory.py
76+
#ROOT/JsMVA/JPyInterface.py
77+
#ROOT/JsMVA/JsMVAMagic.py
78+
#ROOT/JsMVA/OutputTransformer.py
79+
#ROOT/JsMVA/__init__.py
8080
ROOT/_application.py
8181
ROOT/_asan.py
8282
ROOT/_facade.py

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def find_spec(self, fullname: str, path, target=None) -> ModuleSpec:
180180
ip = get_ipython()
181181
if hasattr(ip, "kernel"):
182182
import JupyROOT
183-
from . import JsMVA
183+
# from . import JsMVA
184184

185185
# Register cleanup
186186
import atexit

0 commit comments

Comments
 (0)