Skip to content

Commit 5f0a13f

Browse files
committed
Update coding style and test coverage configuration
1 parent f0059a4 commit 5f0a13f

File tree

5 files changed

+34
-15
lines changed

5 files changed

+34
-15
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ install:
1515
- pip install git+https://github.com/chfw/pyexcel.git
1616
- pip install -r tests/requirements.txt --use-mirrors
1717
script:
18-
nosetests --rednose --with-cov --with-doctest --doctest-extension=.rst
18+
make test
1919
after_success:
2020
coveralls

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
all: test
2+
3+
test:
4+
bash test.sh

pyexcel_text/__init__.py

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
from functools import partial
1414

1515

16-
TABLEFMT="simple"
16+
TABLEFMT = "simple"
17+
_SHARED_MESSAGE = """
18+
Deprecated since v0.0.3! Please use pyexcel's save_as, save_book_as
19+
"""
1720

1821

1922
def class_name(name):
@@ -29,12 +32,14 @@ def present_matrix(matrix_instance):
2932
import tabulate
3033
return tabulate.tabulate(matrix_instance.to_array(), tablefmt=TABLEFMT)
3134

32-
35+
3336
def present_nominable_sheet(nmsheet_instance):
3437
"""Textualize a NominableSheet"""
3538
if TABLEFMT == "json":
3639
import json
37-
return json.dumps({nmsheet_instance.name:nmsheet_instance.to_array()})
40+
return json.dumps({
41+
nmsheet_instance.name: nmsheet_instance.to_array()
42+
})
3843
else:
3944
import tabulate
4045
ret = "Sheet Name: %s\n" % nmsheet_instance.name
@@ -45,7 +50,7 @@ def present_nominable_sheet(nmsheet_instance):
4550
else:
4651
return ret+present_matrix(nmsheet_instance)
4752

48-
53+
4954
def present_book(book_instance):
5055
"""Textualize a pyexcel Book"""
5156
if TABLEFMT == "json":
@@ -57,10 +62,12 @@ def present_book(book_instance):
5762
ret += present_nominable_sheet(book_instance.sheets[sheet])
5863
ret += "\n"
5964
return ret.strip('\n')
60-
65+
66+
6167
@partial(
6268
deprecated,
63-
message="Deprecated since v0.0.3! Please use pyexcel's save_as, save_book_as or instance method Sheet.save_as or Book.save_as")
69+
message=(_SHARED_MESSAGE +
70+
" or instance method Sheet.save_as or Book.save_as"))
6471
def save_as(instance, filename):
6572
"""Save a pyexcel instance as text to a file"""
6673
f = open(filename, "w")
@@ -70,18 +77,24 @@ def save_as(instance, filename):
7077

7178
@partial(
7279
deprecated,
73-
message="Deprecated since v0.0.3! Please use pyexcel's save_as, save_book_as or instance method Sheet.save_to_memory or Book.save_to_memory")
80+
message=(
81+
_SHARED_MESSAGE +
82+
" or instance method Sheet.save_to_memory or Book.save_to_memory"
83+
)
84+
)
7485
def save_to_memory(instance, stream):
7586
"""Save a pyexcel instance as text to a stream"""
7687
stream.write(str(instance))
7788

78-
79-
STRINGIFICATION[class_name("pyexcel.sheets.matrix.Matrix")] = present_matrix
80-
STRINGIFICATION[class_name("pyexcel.sheets.matrix.FormattableSheet")] = present_matrix
81-
STRINGIFICATION[class_name("pyexcel.sheets.matrix.FilterableSheet")] = present_matrix
82-
STRINGIFICATION[class_name("pyexcel.sheets.sheet.NominableSheet")] = present_nominable_sheet
83-
STRINGIFICATION[class_name("pyexcel.sheets.sheet.Sheet")] = present_nominable_sheet
84-
STRINGIFICATION[class_name("pyexcel.book.Book")] = present_book
89+
90+
STRINGIFICATION.update({
91+
class_name("pyexcel.sheets.matrix.Matrix"): present_matrix,
92+
class_name("pyexcel.sheets.matrix.FormattableSheet"): present_matrix,
93+
class_name("pyexcel.sheets.matrix.FilterableSheet"): present_matrix,
94+
class_name("pyexcel.sheets.sheet.NominableSheet"): present_nominable_sheet,
95+
class_name("pyexcel.sheets.sheet.Sheet"): present_nominable_sheet,
96+
class_name("pyexcel.book.Book"): present_book
97+
})
8598

8699

87100
class TextSheetWriter(SheetWriterBase):

test.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nosetests --with-cov --cov pyexcel_text --cov tests --with-doctest --doctest-extension=.rst

test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nosetests --with-cov --cov pyexcel_text --cov tests --with-doctest --doctest-extension=.rst

0 commit comments

Comments
 (0)