From 1513ff1ae9860cfa45af198f471b2722d81c1a96 Mon Sep 17 00:00:00 2001 From: Francois Dang Ngoc Date: Sun, 19 Apr 2015 23:06:20 -0400 Subject: [PATCH] bumped version and added samples with lists --- CHANGELOG.md | 6 +++++- samples/chinese_food.conf | 1 + samples/food.conf | 1 + setup.py | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 samples/chinese_food.conf create mode 100644 samples/food.conf diff --git a/CHANGELOG.md b/CHANGELOG.md index dee03f26..674a1690 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog +## Version 0.3.0 + +* fixed list of dict merge and includes in list. PR [#16] + ## Version 0.2.9 -* fixed expression assignment (only dictionaries with no concat can omit the : or = sign) PR [#15] +* fixed expression assignment (only dictionaries with no concat can omit the : or = sign). PR [#15] ## Version 0.2.8 diff --git a/samples/chinese_food.conf b/samples/chinese_food.conf new file mode 100644 index 00000000..51e34a3b --- /dev/null +++ b/samples/chinese_food.conf @@ -0,0 +1 @@ +["lemon chicken", "general tso chicken", "roast duck", "roast pork"] diff --git a/samples/food.conf b/samples/food.conf new file mode 100644 index 00000000..2401305b --- /dev/null +++ b/samples/food.conf @@ -0,0 +1 @@ +favorite_food = [include "chinese_food.conf", "lasagna", "ravioli"] diff --git a/setup.py b/setup.py index 701ed7e6..3f7833a5 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def run_tests(self): setup( name='pyhocon', - version='0.2.9', + version='0.3.0', description='HOCON parser for Python', long_description='pyhocon is a HOCON parser for Python. Additionally we provide a tool (pyhocon) to convert any HOCON content into json, yaml and properties format.', keywords='hocon parser',