merge

by46 · Mar 26, 2016 · b04840a · b04840a
2 parents 605b696 + 59feba5
commit b04840a
Show file tree

Hide file tree

Showing 26 changed files with 1,318 additions and 143 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,24 +1,30 @@
 History
 ======
+0.0.6
+
+0.0.5
+--------------
+1. refactor objson module
+2. support for add attributes dynamically
 
 0.0.4
----------
+--------------
 1. add documents
 2. fix some bug
 
 0.0.3
-------
+--------------
 1. use `type` factory instead of just compile code
 2. add new unittest
 3. fix dump bug
 4. rename project name to simplekit
 5. fix dump list object
 
 0.0.2
-------
+--------------
 1. change dynamic class from dict to object
 2. escape keyword properties, add 'm' prefix.
 
 0.0.1
------
+--------------
 1. init project
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ test:
 	@rm -vf .coverage coverage.xml
 	@$(COVER) run -m unittest discover --start-directory tests --pattern *_test.py
 	@$(COVER) html
-	@python -m webbrowser -t "$(CWD)/htmlcov/index.html"
+	# @python -m webbrowser -t "$(CWD)/htmlcov/index.html"
 
 clean:
 	@rm -vf .coverage

diff --git a/README.md b/README.md
@@ -18,3 +18,4 @@ Document is available at [http://simplekit.readthedocs.org/en/latest/](http://si
 simplekit is a simple and brief utility tools framework, include:
 
 1. Objson - a json serialize and deserialize tool.
+2. Config - a config util package
diff --git a/docs/_static/README.md b/docs/_static/README.md
diff --git a/docs/api.rst b/docs/api.rst
@@ -8,3 +8,8 @@ objson
     :members:
     :undoc-members:
 
+config
+---------
+
+.. automodule:: config
+    :members:
diff --git a/docs/config.rst b/docs/config.rst
@@ -0,0 +1,10 @@
+config
+=========
+
+This package provides some configuration relative functions.
+
+Config
+------------------
+
+SQLiteConfig
+------------------
diff --git a/docs/index.rst b/docs/index.rst
@@ -23,6 +23,7 @@ This part of document is introduce what's is SimpleKit and who to use it.
 
    install
    objson
+   config
    api
 
 

diff --git a/docs/objson.rst b/docs/objson.rst
@@ -60,8 +60,8 @@ the property name is start with digit,
 
 the dolphin libs will escape the property, add prefix string "m".
 
-and also, property contains any other character which is not alpha, digit and ``_``(underscore)
-will replace to ``_``(underscore).
+and also, property contains any other character which is not alpha, digit and ``_`` (underscore)
+will replace to ``_`` (underscore).
 
 For example:
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,7 @@
 coverage==4.0.2
 six==1.10.0
 orderedmultidict==0.7.5
-furl==0.4.8
+furl==0.4.8
+nose==1.3.7
+requests==2.8.1
+python-ntlm==1.1.0
diff --git a/simplekit/__init__.py b/simplekit/__init__.py
@@ -1,2 +1,3 @@
 __author__ = 'benjamin.c.yan'
-__version__ = "0.0.4"
+__version__ = "0.0.6"
+