Skip to content

Commit d0c7eae

Browse files
committed
enable keyword streaming to get_data and use pyexcel-io 0.1.0
1 parent ae20c51 commit d0c7eae

File tree

7 files changed

+25
-9
lines changed

7 files changed

+25
-9
lines changed

MANIFEST.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include README.rst
2+
include requirements.txt
3+
include VERSION

VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.1.0-dev

docs/source/conf.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
import sys
1616
import os
1717

18+
try:
19+
with open(os.path.join("..", "..", "VERSION"), "r") as version:
20+
version_txt = version.read().rstrip()
21+
except:
22+
version_txt = "not_in_sphinx"
23+
1824
# If extensions (or modules to document with autodoc) are in another directory,
1925
# add these directories to sys.path here. If the directory is relative to the
2026
# documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -53,9 +59,9 @@
5359
# built documents.
5460
#
5561
# The short X.Y version.
56-
version = '0.0.8'
62+
version = version_txt
5763
# The full version, including alpha/beta/rc tags.
58-
release = '0.0.8'
64+
release = version_txt
5965

6066
# The language for content autogenerated by Sphinx. Refer to documentation
6167
# for a list of supported languages.

pyexcel_xls/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
READERS,
2020
WRITERS,
2121
isstream,
22-
load_data as read_data,
22+
get_data as read_data,
2323
store_data as write_data
2424
)
2525
PY2 = sys.version_info[0] == 2

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
pyexcel-io>=0.1.0
12
xlrd
23
xlwt-future

setup.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,21 @@
99
with open("README.rst", 'r') as readme:
1010
README_txt = readme.read()
1111

12-
dependencies = [
13-
'xlrd',
14-
'xlwt-future',
15-
'pyexcel-io>=0.0.4'
16-
]
12+
with open("requirements.txt", 'r') as requirements_txt:
13+
lines = requirements_txt.readlines()
14+
lines = map(lambda x: x.rstrip(), lines)
15+
dependencies = lines
16+
17+
with open("VERSION", "r") as version:
18+
version_txt = version.read().rstrip()
19+
1720
if sys.version_info[0] == 2 and sys.version_info[1] < 7:
1821
dependencies.append('ordereddict')
1922

2023
setup(
2124
name='pyexcel-xls',
2225
author="C. W.",
23-
version='0.0.8',
26+
version=version_txt,
2427
author_email="[email protected]",
2528
url="https://github.com/chfw/pyexcel-xls",
2629
description='A wrapper library to read, manipulate and write data in xls format. It reads xlsx and xlsm format',

tests/test_writer.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ def test_write_book(self):
1616
writer.close()
1717
reader = xls.XLBook(self.testfile)
1818
content = reader.sheets()
19+
for key in content.keys():
20+
content[key] = list(content[key])
1921
assert content == self.content
2022

2123
def tearDown(self):

0 commit comments

Comments
 (0)