Merge pull request #47 from vidartf/cleanup

Cleanup

Author: vidartf

.travis.yml

@@ -1,6 +1,9 @@
 language: python
+dist: xenial
+services:
+  - xvfb
 python:
-  - 3.6
+  - 3.7
 sudo: false
 addons:
   apt_packages:
@@ -21,8 +24,6 @@ install:
 before_script:
   - |
     export CHROME_BIN=chromium-browser
-    export DISPLAY=:99.0
-    sh -e /etc/init.d/xvfb start
 script:
   - py.test
   - npm test
@@ -35,6 +36,8 @@ script:
   - pip uninstall -y ipywidgettestwidgets
   - pip install .
   - jupyter nbextension enable --py --sys-prefix ipywidgettestwidgets
+  # Validate nbextension (enable does not use exit code):
+  - python -c "from notebook.nbextensions import validate_nbextension; import sys; sys.exit(validate_nbextension('ipywidgettestwidgets/extension') or 0)"
   - pip install jupyterlab
   # Make sure our lab extension was installed.
   - jupyter labextension list

{{cookiecutter.github_project_name}}/.travis.yml

@@ -1,9 +1,12 @@
 language: python
 python:
+  - 3.7
   - 3.6
   - 3.5
-  - 3.4
 sudo: false
+dist: xenial
+services:
+  - xvfb
 addons:
   apt_packages:
     - pandoc
@@ -45,8 +48,6 @@ before_script:
   - |
     if [[ $GROUP == js ]]; then
       export CHROME_BIN=chromium-browser
-      export DISPLAY=:99.0
-      sh -e /etc/init.d/xvfb start
     fi
     git config --global user.email [email protected]
     git config --global user.name "Travis CI"

{{cookiecutter.github_project_name}}/setup.py

@@ -90,7 +90,7 @@
     ],
     extras_require = {
         'test': [
-            'pytest',
+            'pytest>=3.6',
             'pytest-cov',
             'nbval',
         ],

{{cookiecutter.github_project_name}}/src/extension.ts

@@ -8,6 +8,6 @@
 // Some static assets may be required by the custom widget javascript. The base
 // url for the notebook is not known at build time and is therefore computed
 // dynamically.
-(window as any).__webpack_public_path__ = document.querySelector('body')!.getAttribute('data-base-url') + 'nbextensions/{{ cookiecutter.npm_package_name }}';
+(window as any).__webpack_public_path__ = document.querySelector('body')!.getAttribute('data-base-url') + 'nbextensions/{{ cookiecutter.python_package_name }}';
 
 export * from './index';

{{cookiecutter.github_project_name}}/tsconfig.json

@@ -13,8 +13,10 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "target": "es2015",
-    "types": ["node"]
+    "target": "es2015"
   },
-  "include": ["src/*"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+  ]
 }

{{cookiecutter.github_project_name}}/{{cookiecutter.python_package_name}}/nbextension/__init__.py

@@ -8,6 +8,6 @@ def _jupyter_nbextension_paths():
     return [{
         'section': 'notebook',
         'src': 'nbextension/static',
-        'dest': '{{ cookiecutter.npm_package_name }}',
-        'require': '{{ cookiecutter.npm_package_name }}/extension'
+        'dest': '{{ cookiecutter.python_package_name }}',
+        'require': '{{ cookiecutter.python_package_name }}/extension'
     }]

{{cookiecutter.github_project_name}}/{{cookiecutter.python_package_name}}/nbextension/static/extension.js

@@ -6,7 +6,7 @@ define(function() {
     window['requirejs'].config({
         map: {
             '*': {
-                '{{ cookiecutter.npm_package_name }}': 'nbextensions/{{ cookiecutter.npm_package_name }}/index',
+                '{{ cookiecutter.npm_package_name }}': 'nbextensions/{{ cookiecutter.python_package_name }}/index',
             },
         }
     });