##// END OF EJS Templates
remove jsonschema and jsonpointer from external...
MinRK -
Show More
@@ -14,7 +14,7 b' before_install:'
14 14 - time sudo add-apt-repository -y ppa:pcarrier/ppa
15 15 - time sudo apt-get update
16 16 - time sudo apt-get install pandoc casperjs nodejs libzmq3-dev
17 - time pip install -f https://nipy.bic.berkeley.edu/wheelhouse/travis jinja2 sphinx pygments tornado requests mock pyzmq
17 - time pip install -f https://nipy.bic.berkeley.edu/wheelhouse/travis jinja2 sphinx pygments tornado requests mock pyzmq jsonschema jsonpointer
18 18 install:
19 19 - time python setup.py install -q
20 20 script:
@@ -2,8 +2,8 b' from __future__ import print_function'
2 2 import json
3 3 import os
4 4
5 from IPython.external.jsonschema import Draft3Validator, SchemaError
6 import IPython.external.jsonpointer as jsonpointer
5 from jsonschema import Draft4Validator, SchemaError
6 import jsonpointer as jsonpointer
7 7 from IPython.utils.py3compat import iteritems
8 8
9 9
@@ -272,12 +272,17 b' extras_require = dict('
272 272 doc = ['Sphinx>=1.1', 'numpydoc'],
273 273 test = ['nose>=0.10.1'],
274 274 terminal = [],
275 nbformat = ['jsonschema>=2.0', 'jsonpointer>=1.3'],
275 276 notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2'],
276 277 nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3']
277 278 )
279
278 280 if sys.version_info < (3, 3):
279 281 extras_require['test'].append('mock')
280 282
283 extras_require['notebook'].extend(extras_require['nbformat'])
284 extras_require['nbconvert'].extend(extras_require['nbformat'])
285
281 286 everything = set()
282 287 for deps in extras_require.values():
283 288 everything.update(deps)
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (734 lines changed) Show them Hide them
General Comments 0
You need to be logged in to leave comments. Login now