##// END OF EJS Templates
Merge pull request #8288 from minrk/rm-traitlets...
Matthias Bussonnier -
r21203:65eb0919 merge
parent child Browse files
Show More
@@ -0,0 +1,2
1 -e git+https://github.com/ipython/ipython_genutils.git#egg=ipython_genutils
2 -e git+https://github.com/ipython/traitlets.git#egg=traitlets
@@ -21,7 +21,7 before_install:
21 - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
21 - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
22 - 'if [[ $GROUP != js* ]]; then COVERAGE="--coverage xml"; fi'
22 - 'if [[ $GROUP != js* ]]; then COVERAGE="--coverage xml"; fi'
23 install:
23 install:
24 - pip install -f travis-wheels/wheelhouse -e file://$PWD#egg=ipython[all] coveralls
24 - pip install -f travis-wheels/wheelhouse -r requirements.txt -e file://$PWD#egg=ipython[all] coveralls
25 before_script:
25 before_script:
26 - 'if [[ $GROUP == js* ]]; then python -m IPython.external.mathjax mathjax.zip; fi'
26 - 'if [[ $GROUP == js* ]]; then python -m IPython.external.mathjax mathjax.zip; fi'
27 script:
27 script:
@@ -289,6 +289,7 install_requires = [
289 'decorator',
289 'decorator',
290 'pickleshare',
290 'pickleshare',
291 'simplegeneric>0.8',
291 'simplegeneric>0.8',
292 'traitlets',
292 ]
293 ]
293
294
294 # add platform-specific dependencies
295 # add platform-specific dependencies
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (622 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (837 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (1591 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (1825 lines changed) Show them Hide them
General Comments 0
You need to be logged in to leave comments. Login now