Skip to content

Commit 07798a0

Browse files
authored
Merge pull request #28 from lgpage/1.0.x
1.0.x
2 parents 767c24b + b358a9b commit 07798a0

File tree

5 files changed

+16
-2
lines changed

5 files changed

+16
-2
lines changed

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ include usage.gif
1515
include appveyor.yml
1616
include environment.yml
1717
include package.json
18+
include readthedocs.yml
1819
include README.rst
1920
include LICENCE.rst
2021

README.rst

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ JavaScript and CSS assets. See more about `developing <#develop>`__ below.
2525
jupyter nbextension install --overwrite --py nbtutor
2626
jupyter nbextension enable --py nbtutor
2727
28+
``conda``
29+
~~~~~~~~~
30+
31+
.. code:: shell
32+
33+
conda install -c conda-forge nbtutor
2834
2935
Usage (Jupyter Notebook)
3036
------------------------

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"pkg:conda": "conda build conda.recipe -c javascript -c mutirri -c cpcloud -c anaconda-nb-extensions -c lgpage",
7171
"pkg:pypi": "python setup.py register -r pypitest && python setup.py sdist && python setup.py bdist_wheel && python setup.py sdist upload -r pypitest && python setup.py bdist_wheel upload -r pypitest",
7272
"pkg:pypi:release": "python setup.py register -r pypi && python setup.py sdist && python setup.py bdist_wheel && python setup.py sdist bdist_wheel upload -r pypi",
73-
"tests": "py.test --cov --cov-report=term-missing -vv tests",
73+
"tests": "py.test --cov --cov-report=term-missing -vv tests nbtutor",
7474
"watch": "watch 'npm run build:dev' src",
7575
"watch:test": "watch 'npm run test' ./nbtutor/static/nbtutor/js"
7676
},

readthedocs.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: nbtutor
2+
conda:
3+
file: environment.yml
4+
python:
5+
version: 3
6+
setup_py_install: true

tests/test_nbtutor.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11

22
def test_main():
3-
pass
3+
import nbtutor
4+
# TODO Proper test suite

0 commit comments

Comments
 (0)