Merge pull request #2601 from gnestor/upgrade-deps

Upgrade bower dependencies

bower.json

@@ -5,7 +5,7 @@
     "backbone": "components/backbone#~1.2",
     "bootstrap": "components/bootstrap#~3.3",
     "bootstrap-tour": "0.9.0",
-    "codemirror": "components/codemirror#~5.22.2",
+    "codemirror": "components/codemirror#~5.27",
     "es6-promise": "~1.0",
     "font-awesome": "components/font-awesome#~4.7.0",
     "google-caja": "5669",
@@ -21,6 +21,6 @@
     "requirejs": "~2.1",
     "text-encoding": "~0.1",
     "underscore": "components/underscore#~1.8.3",
-    "xterm.js": "sourcelair/xterm.js#~2.3.2"
+    "xterm.js": "sourcelair/xterm.js#~2.7.0"
   }
 }

setupbase.py

@@ -364,15 +364,6 @@ class Bower(Command):
             return True
         return mtime(self.node_modules) < mtime(pjoin(repo_root, 'package.json'))
 
-    def patch_codemirror(self):
-        """Patch CodeMirror until https://github.com/codemirror/CodeMirror/issues/4454 is resolved"""
-        
-        try:
-            shutil.copyfile('tools/patches/codemirror.js', 'notebook/static/components/codemirror/lib/codemirror.js')
-        except OSError as e:
-            print("Failed to patch codemirror.js: %s" % e, file=sys.stderr)
-            raise
-            
     def run(self):
         if not self.should_run():
             print("bower dependencies up to date")
@@ -396,7 +387,6 @@ class Bower(Command):
             print("Failed to run bower: %s" % e, file=sys.stderr)
             print("You can install js dependencies with `npm install`", file=sys.stderr)
             raise
-        self.patch_codemirror()
         # self.npm_components()
         os.utime(self.bower_dir, None)
         # update package data in case this created new files