bumped version and added samples with lists

chimpler · Apr 20, 2015 · 1513ff1 · 1513ff1
1 parent dc208c8
commit 1513ff1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -0,0 +1 @@
+["lemon chicken", "general tso chicken", "roast duck", "roast pork"]
diff --git a/samples/food.conf b/samples/food.conf
@@ -0,0 +1 @@
+favorite_food = [include "chinese_food.conf", "lasagna", "ravioli"]
diff --git 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',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		["lemon chicken", "general tso chicken", "roast duck", "roast pork"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		favorite_food = [include "chinese_food.conf", "lasagna", "ravioli"]