Use jsroot 7.9.0 in jupyter and http server docu [6.36]

bindings/jupyroot/python/JupyROOT/helpers/utils.py

@@ -13,13 +13,13 @@
 ################################################################################
 
 
 from __future__ import print_function
 
 import os
 import sys
 import select
 import tempfile
 import itertools
 import re
 import fnmatch
 import time
@@ -74,7 +74,7 @@
 
     // We are in jupyter notebooks, use require.js which should be configured already
     requirejs.config({{
-       paths: {{ 'JSRootCore' : [ 'build/jsroot', 'https://root.cern/js/7.7.4/build/jsroot', 'https://jsroot.gsi.de/7.7.4/build/jsroot' ] }}
+       paths: {{ 'JSRootCore' : [ 'build/jsroot', 'https://root.cern/js/7.9.0/build/jsroot', 'https://jsroot.gsi.de/7.9.0/build/jsroot' ] }}
     }})(['JSRootCore'],  function(Core) {{
        display_{jsDivId}(Core);
     }});
@@ -97,7 +97,7 @@
     // Try loading a local version of requirejs and fallback to cdn if not possible.
     script_load_{jsDivId}(base_url + 'static/build/jsroot.js', function(){{
         console.error('Fail to load JSROOT locally, please check your jupyter_notebook_config.py file');
-        script_load_{jsDivId}('https://root.cern/js/7.7.4/build/jsroot.js', function(){{
+        script_load_{jsDivId}('https://root.cern/js/7.9.0/build/jsroot.js', function(){{
             document.getElementById("{jsDivId}").innerHTML = "Failed to load JSROOT";
         }});
     }});
@@ -231,7 +231,7 @@
     out = ""
     try:
         out = check_output(command.split())
     except:
         if errMsg:
             sys.stderr.write("%s (command was %s)\n" %(errMsg,command))
     return out
@@ -246,7 +246,7 @@
     the library, which we then load.
     '''
     command = 'root -l -q -b -e gSystem->CompileMacro(\"%s\",\"k\")*0'%fileName
     out = _checkOutput(command, "Error ivoking ACLiC")
     libNameBase = fileName.replace(".C","_C")
     ROOT.gSystem.Load(libNameBase)
 
@@ -261,7 +261,7 @@
     >>> _codeToFilename(code)[-2:]
     '.C'
     '''
     code_enc = code if type(code) == bytes else code.encode('utf-8')
     fileNameBase = sha1(code_enc).hexdigest()[0:8]
     timestamp = datetime.now().strftime("%H%M%S%f")
     return fileNameBase + "_" + timestamp + ".C"
@@ -279,12 +279,12 @@
     '''
     fileName = _codeToFilename(code)
     with open (fileName,'w') as ofile:
       code_dec = code if type(code) != bytes else code.decode('utf-8')
       ofile.write(code_dec)
     return fileName
 
 def isPlatformApple():
    return _getPlatform() == 'darwin';
 
 def invokeAclic(cell):
     fileName = _dumpToUniqueFile(cell)
@@ -317,7 +317,7 @@
 
    cnt = 0
    for n in range(colors.GetLast()+1):
       if colors.At(n): cnt = cnt+1
 
    # add all colors if there are more than 598 colors defined
    if cnt < 599 or prim.FindObject(colors):
@@ -338,7 +338,7 @@
    canvas_json = ROOT.TBufferJSON.ConvertToJSON(canvas, 23)
 
    # Cleanup primitives after conversion
    if style is not None: prim.Remove(style)
    if colors is not None: prim.Remove(colors)
    if palette is not None: prim.Remove(palette)
 

net/http/src/THttpServer.cxx

@@ -350,8 +350,8 @@ void THttpServer::AddLocation(const char *prefix, const char *path)
 ///
 /// One could specify address like:
 ///
-/// * https://root.cern/js/7.6.0/
-/// * https://jsroot.gsi.de/7.6.0/
+/// * https://root.cern/js/7.9.0/
+/// * https://jsroot.gsi.de/7.9.0/
 ///
 /// This allows to get new JSROOT features with old server,
 /// reduce load on THttpServer instance, also startup time can be improved