Merge pull request #225 from chinapnr/v1.1.9_develop

V1.1.9 develop
chinapnr · Apr 16, 2019 · 23c5147 · 23c5147
2 parents 480468b + 4427555
commit 23c5147
Show file tree

Hide file tree

Showing 8 changed files with 250 additions and 186 deletions.
diff --git a/docs/change_log.rst b/docs/change_log.rst
@@ -1,18 +1,24 @@
 更新记录
 ===========================
-2019.04.01 v1.1.8
+2019.4.15 v1.1.9
+---------------------------
+* `#222 <https://github.com/chinapnr/fishbase/issues/222>`_, common, edit function :meth:`fish_logger.conf_as_dict`, optimize
+* `#221 <https://github.com/chinapnr/fishbase/issues/221>`_, logger, edit function :meth:`fish_logger.set_log_file`, optimize
+
+
+2019.4.1 v1.1.8
 ---------------------------
 * `#218 <https://github.com/chinapnr/fishbase/issues/218>`_, file, edit function :meth:`fish_file.get_abs_filename_with_sub_path`, :meth:`fish_file.check_sub_path_create`, optimize
 * `#215 <https://github.com/chinapnr/fishbase/issues/215>`_, common, add function :meth:`fish_common.DeserializeInstance, doc and unittest;
 
 
-2019.03.19 v1.1.7
+2019.3.19 v1.1.7
 ---------------------------
 * `#212 <https://github.com/chinapnr/fishbase/issues/212>`_, common, edit function :meth:`fish_common.conf_as_dict`, :meth:`fish_common.find_files`, :meth:`fish_common.yaml_conf_as_dict`, optimize
 * `#215 <https://github.com/chinapnr/fishbase/issues/215>`_, common, edit function :meth:`fish_common.serialize_instance`, optimize doc and add unittest
 
 
-2019.01.22 v1.1.6
+2019.1.22 v1.1.6
 ---------------------------
 * `#192 <https://github.com/chinapnr/fishbase/issues/192>`_, data, add function :meth:`fish_data.IdCard.get_cn_idcard`, :meth:`fish_data.IdCard.get_note_by_province`, doc and unittest;
 * `#190 <https://github.com/chinapnr/fishbase/issues/190>`_, random, edit function :meth:`fish_random.gen_float_by_range`, optimize;

diff --git a/docs/conf.py b/docs/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.8'
+version = '1.1.9'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.8'
+release = '1.1.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/fishbase/__init__.py b/fishbase/__init__.py
@@ -27,4 +27,4 @@
 from .fish_project import *
 from .fish_random import *
 
-__version__ = '1.1.8'  # type: str
+__version__ = '1.1.9'  # type: str