Skip to content

Commit 65bd107

Browse files
author
Martin Journois
committed
test_notebooks only for py=3.4
1 parent 773e4b7 commit 65bd107

3 files changed

Lines changed: 30 additions & 29 deletions

File tree

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ before_install:
1616
- conda update --yes --all
1717
- travis_retry conda create --yes -n test python=$PYTHON --file requirements.txt
1818
- source activate test
19-
- if [[ "$PYTHON" != "3.3" ]]; then
20-
conda install --yes --file requirements-dev.txt;
19+
- conda install --yes --file requirements-dev.txt;
20+
- if [[ "$PYTHON" == "3.4" ]]; then
21+
travis_retry conda install --yes nbconvert jupyter_client ipykernel;
2122
conda install --yes -c ioos geopandas;
2223
fi
23-
- conda install --yes pandas numpy
2424
- if [[ "$PYTHON" != "3.5" ]]; then
2525
travis_retry conda install --yes mock ;
2626
fi

requirements-dev.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
flake8
22
pandas
3+
numpy
34
pytest
45
vincent
5-
nbconvert
6-
jupyter_client
7-
ipykernel

tests/test_notebooks.py

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,38 @@
77
"""
88

99
import os
10+
import sys
1011
import folium
11-
import nbconvert
1212

13-
rootpath = os.path.abspath(os.path.dirname(__file__))
13+
if sys.version_info[:2]==(3,4):
14+
import nbconvert
1415

16+
rootpath = os.path.abspath(os.path.dirname(__file__))
1517

16-
class NotebookTester(object):
17-
def __init__(self, filename):
18-
self.filename = filename
1918

20-
def __call__(self, exporter=None, filename=None):
21-
raw_nb = nbconvert.exporters.Exporter().from_filename(self.filename)
22-
raw_nb[0].metadata.setdefault('kernelspec', {})['name'] = 'python'
23-
exec_nb = nbconvert.preprocessors.ExecutePreprocessor().preprocess(*raw_nb)
19+
class NotebookTester(object):
20+
def __init__(self, filename):
21+
self.filename = filename
2422

25-
if exporter is not None:
26-
out_nb = nbconvert.exporters.MarkdownExporter().from_notebook_node(*exec_nb)
27-
if filename is None:
28-
assert self.filename.endswith('.ipynb')
29-
filename = self.filename[:-6] + exporter.file_extension
30-
open(filename, 'w').write(out_nb[0].encode('utf-8'))
23+
def __call__(self, exporter=None, filename=None):
24+
raw_nb = nbconvert.exporters.Exporter().from_filename(self.filename)
25+
raw_nb[0].metadata.setdefault('kernelspec', {})['name'] = 'python'
26+
exec_nb = nbconvert.preprocessors.ExecutePreprocessor().preprocess(*raw_nb)
3127

28+
if exporter is not None:
29+
out_nb = nbconvert.exporters.MarkdownExporter().from_notebook_node(*exec_nb)
30+
if filename is None:
31+
assert self.filename.endswith('.ipynb')
32+
filename = self.filename[:-6] + exporter.file_extension
33+
open(filename, 'w').write(out_nb[0].encode('utf-8'))
3234

33-
class TestNotebooks(object):
34-
_filepath = rootpath.rstrip('/')+'/../examples/'
35-
_nblist = [x for x in os.listdir(_filepath) if x.endswith('.ipynb')]
3635

37-
for fn in TestNotebooks._nblist:
38-
setattr(TestNotebooks,
39-
'test_'+folium.utilities._camelify(fn[:-6]),
40-
NotebookTester(TestNotebooks._filepath+fn).__call__
41-
)
36+
class TestNotebooks(object):
37+
_filepath = rootpath.rstrip('/')+'/../examples/'
38+
_nblist = [x for x in os.listdir(_filepath) if x.endswith('.ipynb')]
39+
40+
for fn in TestNotebooks._nblist:
41+
setattr(TestNotebooks,
42+
'test_'+folium.utilities._camelify(fn[:-6]),
43+
NotebookTester(TestNotebooks._filepath+fn).__call__
44+
)

0 commit comments

Comments
 (0)