Skip to content

Commit f6c36fb

Browse files
authored
Merge pull request #26 from alingse/support-py3-4
change log & readme
2 parents 85e1dfa + ec60461 commit f6c36fb

File tree

3 files changed

+14
-20
lines changed

3 files changed

+14
-20
lines changed

Diff for: ChangeLog

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1+
2018.05.26
2+
3+
- 2.0.9 support python3
4+
15
2018.05.04
26

3-
2.0.8 support unicode
7+
- 2.0.8 support unicode
48

59
2018.05.03
610

7-
2.0.8b fix setup on windows(maybe)
11+
- 2.0.8b fix setup on windows(maybe)
812

913
2018.04.09
1014

11-
2.0.8a clean code & add travis
15+
- 2.0.8a clean code & add travis
1216

1317
2018.03.30
1418

15-
2.0.7 support sort headers on dump csv
19+
- 2.0.7 support sort headers on dump csv
1620

1721
2017.05.10
1822

19-
2.0.6 clean the mkexcel
23+
- 2.0.6 clean the mkexcel
2024

21-
....... the earlier version is jsut... debug
25+
....... the earlier version is jsut... fun

Diff for: README.rst

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
jsoncsv : convert json to csv or xlsx
3-
=================================================
3+
==========================================
44

55
.. image:: https://img.shields.io/pypi/v/jsoncsv.svg
66
:target: https://pypi.python.org/pypi/jsoncsv
@@ -16,7 +16,7 @@ jsoncsv && mkexcel is a command tool to convert json file to csv/xlsx file.
1616
It's simple, and no need user to specify the keys. :)
1717

1818
Quick Start :
19-
>>>>>>>>>>>>>>
19+
=================
2020

2121
cat the raw.json to csv/xls on command line
2222

@@ -139,7 +139,7 @@ NOTE/TODO
139139
>>>>>>>>>
140140

141141
1. dict keys can't be just array indexes
142-
-----------------------------------
142+
--------------------------------------------
143143

144144
example:
145145

@@ -149,17 +149,7 @@ example:
149149
[1, [1, 2]]
150150
151151
152-
2. mkexcel enable sort keys
153-
-----------------------------------------
154-
155-
wait next version
156-
157152
2. mkexcel enable hooks
158153
-----------------------------------------
159154
160155
wait next version
161-
162-
3. csv separator and clean mkexcel args
163-
-----------------------------------------
164-
165-
wait next version

Diff for: setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
name='jsoncsv',
1515
version='2.0.9',
1616
url='https://github.com/alingse/jsoncsv',
17-
description='a command tool easily convert json file to csv or xlsx',
17+
description='A command tool easily convert json file to csv or xlsx.',
1818
long_description=readme,
1919
author='alingse',
2020
author_email='[email protected]',

0 commit comments

Comments
 (0)