Merge pull request #17 from martinRenou/fix_build

Fix CI environment

.travis.yml

@@ -19,12 +19,12 @@ before_install:
   - conda info -a
   - conda create -q -n test-environment python=$PYTHON_VERSION ipywidgets runipy
   - source activate test-environment
-  - conda install -c conda-forge pytest pytest-cov nodejs
+  - conda install -c conda-forge pytest pytest-cov nodejs pscript
   - pip install coveralls
 install:
   - pip install -e .
 script:
   - py.test --cov-report= --cov=ipysheet
   - (cd js && npm install && ./node_modules/.bin/karma start --single-run)
 after_success:
-  coveralls
+  coveralls

ipysheet/easy.py

@@ -32,11 +32,11 @@ def sheet(key=None, rows=5, columns=5, column_width=None, row_headers=True, colu
     >>> assert sheet2 is ipysheet.current()
     >>> assert sheet1 is ipysheet.sheet('key1')
     >>> assert sheet1 is ipysheet.current()
- 
+
     Parameters
     ----------
     key : any
-        If not used before, register the sheet under this key. If used before, return the previous `Sheet` instance 
+        If not used before, register the sheet under this key. If used before, return the previous `Sheet` instance
         registered with this key.
 
     Returns
@@ -278,12 +278,12 @@ def renderer(code, name):
     ----------
     code : str or code or function objject
         If a string object, it is assumed to be a JavaScript snippet, else it is assumed
-        to be a function or code object and will be transpiled to javascript using flexx.pyscript.
+        to be a function or code object and will be transpiled to javascript using flexxui/pscript.
     name : name of the renderer
     """
     if not isinstance(code, six.string_types):
-        import flexx.pyscript
-        code_transpiled = flexx.pyscript.py2js(code, new_name='the_renderer', indent=4)        
+        from pscript import py2js
+        code_transpiled = py2js(code, new_name='the_renderer', indent=4)
         code = '''
 function() {
   %s
@@ -321,7 +321,7 @@ def hold_cells():
     """Hold adding any cell widgets until leaving this context.
 
     This may give a better performance when adding many cells.
-    
+
     Example
     -------
 

js/karma.conf.js

@@ -2,6 +2,8 @@
 // Generated on Fri Apr 14 2017 18:21:49 GMT+0200 (CEST)
 //var webpackConfig = require('./webpack.config')[1];
 var webpack = require('webpack');
+const process = require('process');
+process.env.CHROME_BIN = require('puppeteer').executablePath();
 
 module.exports = function(config) {
   config.set({
@@ -57,8 +59,8 @@ module.exports = function(config) {
     browsers: ['HeadlessChrome'],
     customLaunchers: {
       HeadlessChrome: {
-        base: 'Chrome',
-        flags: ['--headless', '--disable-gpu', '--remote-debugging-port=9222']
+          base: 'ChromeHeadless',
+          flags: ['--no-sandbox']
       }
     },
     // if true, Karma captures browsers, runs the tests and exits

js/package.json

@@ -44,8 +44,9 @@
     "sinon-chai": "^2.11.0",
     "style-loader": "^0.18.2",
     "ts-loader": "~2.2.2",
-    "typescript": "~2.3.1",
-    "webpack": "^1.12.14"
+    "typescript": "^3.3.1",
+    "webpack": "^1.12.14",
+    "puppeteer": "^1.12.1"
   },
   "dependencies": {
     "@jupyter-widgets/base": "^1.0.1",
@@ -56,4 +57,4 @@
     "style-loader": "^0.18.2",
     "underscore": "^1.8.3"
   }
-}
+}