Skip to content

Commit 6c24e1b

Browse files
committed
Version 0.6.0
1 parent 9a811c4 commit 6c24e1b

File tree

7 files changed

+30
-17
lines changed

7 files changed

+30
-17
lines changed

CHANGELOG.md

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,49 @@
1-
# 0.5.0 - February 7, 2014 - "YOLO"
1+
0.6.0 - May 10, 2014
2+
* Support for setting row/column widths
3+
* Fix issue #22 - Decimal data type (thanks rhyek)
4+
5+
0.5.0 - February 7, 2014 - "YOLO"
26
* Implement new "YOLO" mode for increased PyExceleration
37
* Fix tests/benchmark.py and update benchmark data
48

5-
# 0.4.1 - December 4, 2013
9+
0.4.1 - December 4, 2013
610
* Fix import errors caused by missing templates
711
* Remove bundled six.py and use system-wide six.py instead
812

9-
# 0.4.0 - November 15 , 2013
13+
0.4.0 - November 15 , 2013
1014
* Add basic style support (see README.md for usage and examples)
1115
* Merge and intersection logic bugfixes (thanks morty)
1216
* Fixed float precision bug (thanks jmcnamara)
1317

14-
# 0.3.0 - July 29, 2013
15-
* Fixed bug in __coordinate_to_string function
18+
0.3.0 - July 29, 2013
19+
* Fixed bug in \_\_coordinate\_to\_string function
1620
* Compatibility fixes for Python 3 and numpy datatypes
1721
* Updated test suite to work with Python 3
1822

19-
# 0.2.6 - July 10, 2013
23+
0.2.6 - July 10, 2013
2024
* Better PyInstaller compatibility (sys.executable in addition to sys.\_MEIPASS)
2125

22-
# 0.2.5 - May 14, 2013
26+
0.2.5 - May 14, 2013
2327
* Fixed int/float bug (thanks Redoubts)
2428

25-
# 0.2.4 - May 2, 2013
29+
0.2.4 - May 2, 2013
2630
* Increased exceleration (in response to issue #1)
2731

28-
# 0.2.3 - April 23, 2013
32+
0.2.3 - April 23, 2013
2933
* #3 - fix numpy and other subclasses support (thanks Redoubts)
3034
* #4 - fix issue with range writer (thanks Redoubts)
3135

32-
# 0.2.2 - April 22, 2013
36+
0.2.2 - April 22, 2013
3337
* #2 - template path detection fix for PyInstaller (thanks sh0375)
3438

35-
# 0.2.1 - April 21, 2013
39+
0.2.1 - April 21, 2013
3640
* datetime bugfixes
3741
* optimization for type-checking
3842
* UTF-8 encoding fix (thanks Genmutant from Reddit)
3943

40-
# 0.2.0 - April 20, 2013
44+
0.2.0 - April 20, 2013
4145
* Add datetime support
4246
* Add Workbook.cell() call
4347

44-
# 0.1.0 - April 20, 2013
48+
0.1.0 - April 20, 2013
4549
* Initial release

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Accelerated Excel XLSX writing library for Python 2/3
55
[![Build Status](https://travis-ci.org/kz26/PyExcelerate.png?branch=master)](https://travis-ci.org/kz26/PyExcelerate)
66
[![Coverage Status](https://coveralls.io/repos/kz26/PyExcelerate/badge.png)](https://coveralls.io/r/kz26/PyExcelerate)
77

8-
* Current version: 0.5.0
8+
* Current version: 0.6.0
99
* Authors: [Kevin Wang](https://github.com/kevmo314) and [Kevin Zhang](https://github.com/kz26)
1010
* License: Simplified BSD License
1111
* [Source repository](https://github.com/kz26/PyExcelerate)

pyexcelerate/DataTypes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from datetime import datetime, date, time
2+
import decimal
23
import six
34
try:
45
import numpy as np
@@ -17,7 +18,7 @@ class DataTypes(object):
1718
FORMULA = 7
1819
EXCEL_BASE_DATE = datetime(1900, 1, 1, 0, 0, 0)
1920

20-
_numberTypes = six.integer_types + (float, complex)
21+
_numberTypes = six.integer_types + (float, complex, decimal.Decimal)
2122

2223
@staticmethod
2324
def get_type(value):

pyexcelerate/__init__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@
55
from .Format import Format
66
from .Alignment import Alignment
77

8-
__version__ = '0.5.0'
8+
try:
9+
import pkg_resources
10+
__version__ = pkg_resources.require('PyExcelerate')[0].version
11+
except:
12+
__version__ = 'unknown'

pyexcelerate/_version.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = '0.6.0'

pyexcelerate/tests/test_DataTypes.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
from datetime import datetime, date, time
44
from ..Workbook import Workbook
55
from .utils import get_output_path
6+
from decimal import Decimal
67
import numpy
78

89
def test__get_type():
910
eq_(DataTypes.get_type(15), DataTypes.NUMBER)
1011
eq_(DataTypes.get_type(15.0), DataTypes.NUMBER)
12+
eq_(DataTypes.get_type(Decimal('15.0')), DataTypes.NUMBER)
1113
eq_(DataTypes.get_type("test"), DataTypes.INLINE_STRING)
1214
eq_(DataTypes.get_type(datetime.now()), DataTypes.DATE)
1315
eq_(DataTypes.get_type(True), DataTypes.BOOLEAN)

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/usr/bin/python
22

33
from setuptools import setup
4+
execfile('pyexcelerate/_version.py')
45

56
setup(
67
name="PyExcelerate",
7-
version='0.5.0',
8+
version=__version__,
89
author="Kevin Wang and Kevin Zhang",
910
author_email="kevin@kevinzhang.me",
1011
maintainer="Kevin Zhang",

0 commit comments

Comments
 (0)