diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2011-05-12 02:53:15 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2011-05-12 02:53:15 -0400 |
| commit | 0ebc8f5e1b4fff9822128314b48911b95b9a0e28 (patch) | |
| tree | 9e3a4d6639ce43e1f4a438545181b80eed6264a3 | |
| parent | 4be341be4fb889a09391a9fd6657e86e779acdce (diff) | |
| parent | 3b961c59e7d3e65ce0dc14df1ae24545cbe66655 (diff) | |
| download | tablib-0ebc8f5e1b4fff9822128314b48911b95b9a0e28.tar.gz | |
Merge branch 'release/0.9.6' into develop
| -rw-r--r-- | HISTORY.rst | 6 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | setup.py | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index 1724339..f545a4a 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,10 +1,10 @@ History ------- -0.9.6 -+++++ +0.9.6 (2011-05-12) +++++++++++++++++++ -* `seperators` renamed to `separators` +* ``seperators`` renamed to ``separators`` * Full unicode CSV support diff --git a/docs/conf.py b/docs/conf.py index a1bdbd6..01f4933 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,7 +48,7 @@ copyright = u'2011, Kenneth Reitz. Styles (modified) © Armin Ronacher' # built documents. # # The short X.Y version. -version = '0.9.5' +version = '0.9.6' # The full version, including alpha/beta/rc tags. release = version @@ -22,7 +22,7 @@ if sys.version_info[:2] < (2,6): setup( name='tablib', - version='0.9.5', + version='0.9.6', description='Format agnostic tabular data library (XLS, JSON, YAML, CSV)', long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(), @@ -33,7 +33,8 @@ setup( 'tablib', 'tablib.formats', 'tablib.packages', 'tablib.packages.xlwt', - 'tablib.packages.yaml', + 'tablib.packages.yaml', + 'tablib.packages.unicodecsv' ], install_requires=required, license='MIT', |