Merge branch 'master' into develop

Author: Zerline

.gitignore

@@ -14,3 +14,4 @@ js/node_modules/
 package-lock.json
 *.[1-9]
 *.print
+/.tox

README.rst

@@ -18,9 +18,9 @@ Also :
 
 Installation
 ------------
+Assuming your pip install on Python3:
 
-   $ pip3 install sage_combinat_widgets
-
+   $ pip install sage_combinat_widgets
 
 Local install from source
 ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -35,6 +35,10 @@ Change to the root directory and run::
 
 NB: For this to work, you need a recent `nodejs` installation.
 
+For use on Jupyterlab, you might also need to install `@jupyter-widgets/jupyterlab-manager`:
+
+    $ jupyter labextension @jupyter-widgets/jupyterlab-manager
+
 Usage
 -----
 
@@ -66,6 +70,10 @@ Shorthand::
 
     $ make test
 
+If you have ``tox`` installed, you can also test the package like this::
+
+    $ tox
+
 Documentation
 -------------
 

setup.py

@@ -27,11 +27,11 @@ def readfile(filename):
 # For the tests
 class SageTest(TestCommand):
     def run_tests(self):
-        import os
-        errno = os.system("sage -t --force-lib sage_widget_adapters")
+        import os, sys
+        errno = os.system("sage -t --force-lib --optional=sage sage_widget_adapters")
         if errno != 0:
             sys.exit(1)
-        errno = os.system("sage -t --force-lib sage_combinat_widgets")
+        errno = os.system("sage -t --force-lib --optional=sage sage_combinat_widgets")
         if errno != 0:
             sys.exit(1)
 

tox.ini

@@ -0,0 +1,14 @@
+[tox]
+envlist = sage
+# "setup.py sdist" fails because "devDependencies" from js/package.json are not installed
+skipsdist = true
+
+[testenv]
+whitelist_externals = sage
+passenv =
+    SAGE_ROOT
+    SAGE_LOCAL
+    HOME
+
+commands =
+    sage setup.py test