From ac7c94424de0a6a9c8e94152cf95744d34bb0b11 Mon Sep 17 00:00:00 2001
From: Hamish Graham <hgraham@hpc-201-11-01-a.cr.cnaf.infn.it>
Date: Wed, 15 Sep 2021 11:55:12 +0200
Subject: [PATCH] making pandas_skeleton and monitoring_sim available in
tree_maker
---
tree_maker/__init__.py | 7 ++++---
tree_maker/monitoring_sim.py | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tree_maker/__init__.py b/tree_maker/__init__.py
index f25827e..c96423d 100644
--- a/tree_maker/__init__.py
+++ b/tree_maker/__init__.py
@@ -10,8 +10,9 @@ from .NodeJob import NodeJob
from .general import tree_from_yaml
from .general import from_yaml
from .tag import *
-from .pandas_skeleton import *
-from .monitoring_sim import *
-
+#from .pandas_skeleton import *
+import pandas_skeleton
+#from .monitoring_sim import *
+import monitoring_sim
diff --git a/tree_maker/monitoring_sim.py b/tree_maker/monitoring_sim.py
index 50a387a..4eac5c6 100644
--- a/tree_maker/monitoring_sim.py
+++ b/tree_maker/monitoring_sim.py
@@ -1,5 +1,6 @@
-import pandas_skeleton as ps
+#import pandas_skeleton as ps
import tree_maker as tm
+ps = tm.pandas_skeleton
from pandas import DataFrame
from bokeh.layouts import column
@@ -106,4 +107,4 @@ def bkapp(doc, root, last_key, my_dict):
button.on_click(update_color2)
- doc.add_root(column(plot, button, select))
\ No newline at end of file
+ doc.add_root(column(plot, button, select))
--
GitLab