Merge pull request #8305 from minrk/rm-notebook

remove notebook

.travis.yml

@@ -2,36 +2,16 b''
 language: python
 python:
     - 3.4
+    - 3.3
     - 2.7
 sudo: false
-env:
-  global:
-    - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH
-  matrix:
-    - GROUP=
-    - GROUP=js/base
-    - GROUP=js/notebook
-    - GROUP=js/services
-    - GROUP=js/tree
-    - GROUP=js/widgets
 before_install:
-    - 'if [[ $GROUP != js* ]]; then wget https://7de4dfdec62155b49b44-d726a73613a1989d29b147f20996e7c1.ssl.cf2.rackcdn.com/pandoc-1.12.3-linux-debian-x86_64.zip && unzip pandoc-1.12.3-linux-debian-x86_64.zip; fi'
-    - 'if [[ $GROUP == js* ]]; then wget https://7de4dfdec62155b49b44-d726a73613a1989d29b147f20996e7c1.ssl.cf2.rackcdn.com/mathjax.zip; fi'
-    - 'if [[ $GROUP == js* ]]; then npm install -g casperjs; fi'
     - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
-    - 'if [[ $GROUP != js* ]]; then COVERAGE="--coverage xml"; fi'
+    - 'if [[ $GROUP != js* ]]; then COVERAGE=""; fi'
 install:
-    - pip install -f travis-wheels/wheelhouse -r requirements.txt -e file://$PWD#egg=ipython[test,notebook] coveralls
-before_script:
-    - 'if [[ $GROUP == js* ]]; then python -m IPython.external.mathjax mathjax.zip; fi'
+    - pip install -f travis-wheels/wheelhouse -r requirements.txt -e file://$PWD#egg=ipython[test] coveralls
 script:
-    - cd /tmp && iptest $GROUP $COVERAGE && cd -
-
-matrix:
-    include:
-        - python: 3.3
-          env: GROUP=
-
+    - cd /tmp && iptest --coverage xml && cd -
 after_success:
     - cp /tmp/ipy_coverage.xml ./
     - cp /tmp/.coverage ./

IPython/core/profiledir.py

@@ -141,7 +141,10 b' class ProfileDir(LoggingConfigurable):'
         self._mkdir(self.static_dir)
         custom = os.path.join(self.static_dir, 'custom')
         self._mkdir(custom)
-        from IPython.html import DEFAULT_STATIC_FILES_PATH
+        try:
+            from jupyter_notebook import DEFAULT_STATIC_FILES_PATH
+        except ImportError:
+            return
         for fname in ('custom.js', 'custom.css'):
             src = os.path.join(DEFAULT_STATIC_FILES_PATH, 'custom', fname)
             dest = os.path.join(custom, fname)

IPython/core/tests/test_display.py

@@ -50,11 +50,8 b' def test_image_filename_defaults():'
                      embed=True)
     nt.assert_raises(ValueError, display.Image)
     nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True)
-    from IPython.html import DEFAULT_STATIC_FILES_PATH
     # check boths paths to allow packages to test at build and install time
-    imgfile = os.path.join(tpath, 'html/static/base/images/logo.png')
-    if not os.path.exists(imgfile):
-        imgfile = os.path.join(DEFAULT_STATIC_FILES_PATH, 'base/images/logo.png')
+    imgfile = os.path.join(tpath, 'core/tests/2x2.png')
     img = display.Image(filename=imgfile)
     nt.assert_equal('png', img.format)
     nt.assert_is_not_none(img._repr_png_())

IPython/core/tests/test_magic.py

@@ -619,18 +619,16 b' def test_extension():'
         tmpdir.cleanup()
 
 
-# The nose skip decorator doesn't work on classes, so this uses unittest's skipIf
-@skipIf(dec.module_not_available('IPython.nbformat'), 'nbformat not importable')
-class NotebookExportMagicTests(TestCase):
-    def test_notebook_export_json(self):
-        _ip = get_ipython()
-        _ip.history_manager.reset()   # Clear any existing history.
-        cmds = [u"a=1", u"def b():\n  return a**2", u"print('noël, été', b())"]
-        for i, cmd in enumerate(cmds, start=1):
-            _ip.history_manager.store_inputs(i, cmd)
-        with TemporaryDirectory() as td:
-            outfile = os.path.join(td, "nb.ipynb")
-            _ip.magic("notebook -e %s" % outfile)
[e-mail]_without('jupyter_nbformat')
+def test_notebook_export_json():
+    _ip = get_ipython()
+    _ip.history_manager.reset()   # Clear any existing history.
+    cmds = [u"a=1", u"def b():\n  return a**2", u"print('noël, été', b())"]
+    for i, cmd in enumerate(cmds, start=1):
+        _ip.history_manager.store_inputs(i, cmd)
+    with TemporaryDirectory() as td:
+        outfile = os.path.join(td, "nb.ipynb")
+        _ip.magic("notebook -e %s" % outfile)
 
 
 class TestEnv(TestCase):

IPython/core/tests/test_run.py

@@ -375,10 +375,10 b' tclass.py: deleting object: C-third'
         with tt.AssertNotPrints('SystemExit'):
             _ip.magic('run -e %s' % self.fname)
 
-    @dec.skip_without('IPython.nbformat')  # Requires jsonschema
+    @dec.skip_without('jupyter_nbformat')  # Requires jsonschema
     def test_run_nb(self):
         """Test %run notebook.ipynb"""
-        from IPython.nbformat import v4, writes
+        from jupyter_nbformat import v4, writes
         nb = v4.new_notebook(
            cells=[
                 v4.new_markdown_cell("The Ultimate Question of Everything"),

IPython/terminal/tests/test_help.py

@@ -25,6 +25,6 b' def test_locate_help():'
 def test_locate_profile_help():
     tt.help_all_output_test("locate profile")
 
-@skip_without('IPython.nbformat')  # Requires jsonschema to be installed
+@skip_without('jupyter_nbformat')  # Requires jsonschema to be installed
 def test_trust_help():
     tt.help_all_output_test("trust")

IPython/testing/iptest.py

@@ -34,7 +34,6 b' from nose.core import TestProgram'
 from nose.plugins import Plugin
 from nose.util import safe_str
 
-from IPython.utils.process import is_cmd_found
 from IPython.utils.py3compat import bytes_to_str
 from IPython.utils.importstring import import_item
 from IPython.testing.plugin.ipdoctest import IPythonDoctest
@@ -118,27 +117,9 b' def test_for(item, min_version=None, callback=extract_version):'
 # have available at test run time
 have = {}
 
-have['curses'] = test_for('_curses')
 have['matplotlib'] = test_for('matplotlib')
-have['numpy'] = test_for('numpy')
-have['pexpect'] = test_for('pexpect')
-have['pymongo'] = test_for('pymongo')
 have['pygments'] = test_for('pygments')
 have['sqlite3'] = test_for('sqlite3')
-have['tornado'] = test_for('tornado.version_info', (4,0), callback=None)
-have['jinja2'] = test_for('jinja2')
-have['mistune'] = test_for('mistune')
-have['requests'] = test_for('requests')
-have['sphinx'] = test_for('sphinx')
-have['jsonschema'] = test_for('jsonschema')
-have['terminado'] = test_for('terminado')
-have['casperjs'] = is_cmd_found('casperjs')
-have['phantomjs'] = is_cmd_found('phantomjs')
-have['slimerjs'] = is_cmd_found('slimerjs')
-
-min_zmq = (13,)
-
-have['zmq'] = test_for('zmq.pyzmq_version_info', min_zmq, callback=lambda x: x())
 
 #-----------------------------------------------------------------------------
 # Test suite definitions
@@ -146,7 +127,6 b" have['zmq'] = test_for('zmq.pyzmq_version_info', min_zmq, callback=lambda x: x()"
 
 test_group_names = ['core',
                     'extensions', 'lib', 'terminal', 'testing', 'utils',
-                    'html',
                    ]
 
 class TestSection(object):
@@ -169,12 +149,8 b' class TestSection(object):'
     def will_run(self):
         return self.enabled and all(have[p] for p in self.dependencies)
 
-shims = {
-    'html': 'jupyter_notebook',
-}
-
 # Name -> (include, exclude, dependencies_met)
-test_sections = {n:TestSection(n, [shims.get(n, 'IPython.%s' % n)]) for n in test_group_names}
+test_sections = {n:TestSection(n, ['IPython.%s' % n]) for n in test_group_names}
 
 
 # Exclusions and dependencies
@@ -191,8 +167,7 b" if not have['matplotlib']:"
 
 # lib:
 sec = test_sections['lib']
-if not have['zmq']:
-    sec.exclude('kernel')
+sec.exclude('kernel')
 if not have['pygments']:
     sec.exclude('tests.test_lexers')
 # We do this unconditionally, so that the test suite doesn't import
@@ -228,20 +203,6 b" test_sections['autoreload'] = TestSection('autoreload',"
         ['IPython.extensions.autoreload', 'IPython.extensions.tests.test_autoreload'])
 test_group_names.append('autoreload')
 
-# html:
-sec = test_sections['html']
-sec.requires('zmq', 'tornado', 'requests', 'sqlite3', 'jsonschema')
-# The notebook 'static' directory contains JS, css and other
-# files for web serving.  Occasionally projects may put a .py
-# file in there (MathJax ships a conf.py), so we might as
-# well play it safe and skip the whole thing.
-sec.exclude('static')
-sec.exclude('tasks')
-if not have['jinja2']:
-    sec.exclude('notebookapp')
-if not have['terminado']:
-    sec.exclude('terminal')
-
 
 #-----------------------------------------------------------------------------
 # Functions and classes

IPython/testing/iptestcontroller.py

@@ -247,218 +247,15 b' class PyTestController(TestController):'
         super(PyTestController, self).launch(buffer_output=buffer_output)
 
 
-js_prefix = 'js/'
-
-def get_js_test_dir():
-    import IPython.html.tests as t
-    return os.path.join(os.path.dirname(t.__file__), '')
-
-def all_js_groups():
-    import glob
-    test_dir = get_js_test_dir()
-    all_subdirs = glob.glob(test_dir + '[!_]*/')
-    return [js_prefix+os.path.relpath(x, test_dir) for x in all_subdirs]
-
-class JSController(TestController):
-    """Run CasperJS tests """
-    
-    requirements =  ['zmq', 'tornado', 'jinja2', 'casperjs', 'sqlite3',
-                     'jsonschema']
-
-    def __init__(self, section, xunit=True, engine='phantomjs', url=None):
-        """Create new test runner."""
-        TestController.__init__(self)
-        self.engine = engine
-        self.section = section
-        self.xunit = xunit
-        self.url = url
-        self.slimer_failure = re.compile('^FAIL.*', flags=re.MULTILINE)
-        js_test_dir = get_js_test_dir()
-        includes = '--includes=' + os.path.join(js_test_dir,'util.js')
-        test_cases = os.path.join(js_test_dir, self.section[len(js_prefix):])
-        self.cmd = ['casperjs', 'test', includes, test_cases, '--engine=%s' % self.engine]
-
-    def setup(self):
-        self.ipydir = TemporaryDirectory()
-        self.nbdir = TemporaryDirectory()
-        self.dirs.append(self.ipydir)
-        self.dirs.append(self.nbdir)
-        os.makedirs(os.path.join(self.nbdir.name, os.path.join(u'sub ∂ir1', u'sub ∂ir 1a')))
-        os.makedirs(os.path.join(self.nbdir.name, os.path.join(u'sub ∂ir2', u'sub ∂ir 1b')))
-
-        if self.xunit:
-            self.add_xunit()
-
-        # If a url was specified, use that for the testing.
-        if self.url:
-            try:
-                alive = requests.get(self.url).status_code == 200
-            except:
-                alive = False
-
-            if alive:
-                self.cmd.append("--url=%s" % self.url)
-            else:
-                raise Exception('Could not reach "%s".' % self.url)
-        else:
-            # start the ipython notebook, so we get the port number
-            self.server_port = 0
-            self._init_server()
-            if self.server_port:
-                self.cmd.append("--port=%i" % self.server_port)
-            else:
-                # don't launch tests if the server didn't start
-                self.cmd = [sys.executable, '-c', 'raise SystemExit(1)']
-
-    def add_xunit(self):
-        xunit_file = os.path.abspath(self.section.replace('/','.') + '.xunit.xml')
-        self.cmd.append('--xunit=%s' % xunit_file)
-
-    def launch(self, buffer_output):
-        # If the engine is SlimerJS, we need to buffer the output because
-        # SlimerJS does not support exit codes, so CasperJS always returns 0.
-        if self.engine == 'slimerjs' and not buffer_output:
-            return super(JSController, self).launch(capture_output=True)
-
-        else:
-            return super(JSController, self).launch(buffer_output=buffer_output)
-
-    def wait(self, *pargs, **kwargs):
-        """Wait for the JSController to finish"""
-        ret = super(JSController, self).wait(*pargs, **kwargs)
-        # If this is a SlimerJS controller, check the captured stdout for
-        # errors.  Otherwise, just return the return code.
-        if self.engine == 'slimerjs':
-            stdout = bytes_to_str(self.stdout)
-            if ret != 0:
-                # This could still happen e.g. if it's stopped by SIGINT
-                return ret
-            return bool(self.slimer_failure.search(strip_ansi(stdout)))
-        else:
-            return ret
-
-    def print_extra_info(self):
-        print("Running tests with notebook directory %r" % self.nbdir.name)
-
-    @property
-    def will_run(self):
-        should_run = all(have[a] for a in self.requirements + [self.engine])
-        return should_run
-
-    def _init_server(self):
-        "Start the notebook server in a separate process"
-        self.server_command = command = [sys.executable,
-            '-m', 'IPython.html',
-            '--no-browser',
-            '--ipython-dir', self.ipydir.name,
-            '--notebook-dir', self.nbdir.name,
-        ]
-        # ipc doesn't work on Windows, and darwin has crazy-long temp paths,
-        # which run afoul of ipc's maximum path length.
-        if sys.platform.startswith('linux'):
-            command.append('--KernelManager.transport=ipc')
-        self.stream_capturer = c = StreamCapturer()
-        c.start()
-        env = os.environ.copy()
-        if self.engine == 'phantomjs':
-            env['IPYTHON_ALLOW_DRAFT_WEBSOCKETS_FOR_PHANTOMJS'] = '1'
-        self.server = subprocess.Popen(command,
-            stdout=c.writefd,
-            stderr=subprocess.STDOUT,
-            cwd=self.nbdir.name,
-            env=env,
-        )
-        self.server_info_file = os.path.join(self.ipydir.name,
-            'profile_default', 'security', 'nbserver-%i.json' % self.server.pid
-        )
-        self._wait_for_server()
-    
-    def _wait_for_server(self):
-        """Wait 30 seconds for the notebook server to start"""
-        for i in range(300):
-            if self.server.poll() is not None:
-                return self._failed_to_start()
-            if os.path.exists(self.server_info_file):
-                try:
-                    self._load_server_info()
-                except ValueError:
-                    # If the server is halfway through writing the file, we may
-                    # get invalid JSON; it should be ready next iteration.
-                    pass
-                else:
-                    return
-            time.sleep(0.1)
-        print("Notebook server-info file never arrived: %s" % self.server_info_file,
-            file=sys.stderr
-        )
-    
-    def _failed_to_start(self):
-        """Notebook server exited prematurely"""
-        captured = self.stream_capturer.get_buffer().decode('utf-8', 'replace')
-        print("Notebook failed to start: ", file=sys.stderr)
-        print(self.server_command)
-        print(captured, file=sys.stderr)
-    
-    def _load_server_info(self):
-        """Notebook server started, load connection info from JSON"""
-        with open(self.server_info_file) as f:
-            info = json.load(f)
-        self.server_port = info['port']
-
-    def cleanup(self):
-        if hasattr(self, 'server'):
-            try:
-                self.server.terminate()
-            except OSError:
-                # already dead
-                pass
-            # wait 10s for the server to shutdown
-            try:
-                popen_wait(self.server, NOTEBOOK_SHUTDOWN_TIMEOUT)
-            except TimeoutExpired:
-                # server didn't terminate, kill it
-                try:
-                    print("Failed to terminate notebook server, killing it.",
-                        file=sys.stderr
-                    )
-                    self.server.kill()
-                except OSError:
-                    # already dead
-                    pass
-            # wait another 10s
-            try:
-                popen_wait(self.server, NOTEBOOK_SHUTDOWN_TIMEOUT)
-            except TimeoutExpired:
-                print("Notebook server still running (%s)" % self.server_info_file,
-                    file=sys.stderr
-                )
-              
-            self.stream_capturer.halt()
-        TestController.cleanup(self)
-
-
 def prepare_controllers(options):
     """Returns two lists of TestController instances, those to run, and those
     not to run."""
     testgroups = options.testgroups
-    if testgroups:
-        if 'js' in testgroups:
-            js_testgroups = all_js_groups()
-        else:
-            js_testgroups = [g for g in testgroups if g.startswith(js_prefix)]
-        py_testgroups = [g for g in testgroups if not g.startswith('js')]
-    else:
-        py_testgroups = py_test_group_names
-        if not options.all:
-            js_testgroups = []
-        else:
-            js_testgroups = all_js_groups()
+    if not testgroups:
+        testgroups = py_test_group_names
 
-    engine = 'slimerjs' if options.slimerjs else 'phantomjs'
-    c_js = [JSController(name, xunit=options.xunit, engine=engine, url=options.url) for name in js_testgroups]
-    c_py = [PyTestController(name, options) for name in py_testgroups]
+    controllers = [PyTestController(name, options) for name in testgroups]
 
-    controllers = c_py + c_js
     to_run = [c for c in controllers if c.will_run]
     not_run = [c for c in controllers if not c.will_run]
     return to_run, not_run
@@ -559,9 +356,6 b' def run_iptestall(options):'
     inc_slow : bool
       Include slow tests. By default, these tests aren't run.
 
-    slimerjs : bool
-      Use slimerjs if it's installed instead of phantomjs for casperjs tests.
-
     url : unicode
       Address:port to use when running the JS tests.
 
@@ -696,8 +490,6 b" argparser.add_argument('testgroups', nargs='*',"
                     'all tests.')
 argparser.add_argument('--all', action='store_true',
                     help='Include slow tests not run by default.')
-argparser.add_argument('--slimerjs', action='store_true',
-                    help="Use slimerjs if it's installed instead of phantomjs for casperjs tests.")
 argparser.add_argument('--url', help="URL to use for the JS tests.")
 argparser.add_argument('-j', '--fast', nargs='?', const=None, default=1, type=int,
                     help='Run test sections in parallel. This starts as many '