Merge branch 'master' into master

xxx-convert · Mar 23, 2018 · e3e4f6b · e3e4f6b
2 parents 7cbb186 + 2c45ffc
commit e3e4f6b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.0.4
+current_version = 2.0.5
 
 [bumpversion:file:setup.py]
 
diff --git a/CodeConvert.py b/CodeConvert.py
@@ -1,6 +1,8 @@
-import six
 # -*- coding: utf-8 -*-
 
+import six
+
+
 # Note:
 #   See http://docs.python.org/2/library/codecs.html#standard-encodings
 

diff --git a/pep8.sh b/pep8.sh
@@ -7,4 +7,4 @@
 #  -- E501 line too long
 #  -- E701  multiple statements on one line
 
-pep8 --exclude=migrations --ignore=E128,E501,E701 .
+pycodestyle --exclude=migrations --ignore=E128,E501,E701 .
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 
 
-version = '2.0.4'
+version = '2.0.5'
 
 
 setup(

diff --git a/test_CodeConvert.py b/test_CodeConvert.py
@@ -133,5 +133,6 @@ def main():
     _Convert2Utf8()
     _Convert2Unicode()
 
+
 if __name__ == '__main__':
     main()
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     from setuptools import setup
-    version = '2.0.4'
+    version = '2.0.5'
     setup(
@@ Expand Down @@