Merge branch 'release/v1.1.5'

tsroten · May 23, 2016 · 5eb0ec4 · 5eb0ec4
2 parents f2c149a + 5179a05
commit 5eb0ec4
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,5 +6,8 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
+
+install: pip install -r requirements.txt
 
 script: python setup.py test
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -81,3 +81,8 @@ v.1.1.4 (2015-01-25)
 * Fixes flake8 warnings.
 * Adds distutil fallback import statment to setup.py.
 * Adds missing hanzi punctuation. Fixes #19.
+
+v.1.1.5 (2016-05-23)
+--------------------
+
+* Add missing Zhuyin characters. Fixes #23.
diff --git a/docs/conf.py b/docs/conf.py
@@ -46,7 +46,7 @@
 
 # General information about the project.
 project = 'Zhon'
-copyright = '2014, Thomas Roten'
+copyright = '2016, Thomas Roten'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -55,7 +55,7 @@
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.4'
+release = '1.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,5 @@
+setuptools (19.4)
+Sphinx (1.3.5)
+tox (2.3.1)
+virtualenv (14.0.6)
+wheel (0.26.0)
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
 
 setup(
     name='zhon',
-    version='1.1.4',
+    version='1.1.5',
     author='Thomas Roten',
     author_email='thomas@roten.us',
     url='https://github.com/tsroten/zhon',
@@ -45,6 +45,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Text Processing :: Linguistic',
     ],

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,docs
+envlist = py27,py33,py34,py35,docs
 [testenv]
 commands=python setup.py test
 [testenv:docs]

diff --git a/zhon/__init__.py b/zhon/__init__.py
@@ -1,3 +1,3 @@
 """Provides constants used in Chinese text processing."""
 
-__version__ = '1.1.4'
+__version__ = '1.1.5'
diff --git a/zhon/zhuyin.py b/zhon/zhuyin.py
@@ -7,7 +7,7 @@
 #: A string containing all Zhuyin characters.
 characters = (
     'ㄅㄆㄇㄈㄉㄊㄋㄌㄍㄎㄏㄐㄑㄒㄓㄔㄕㄖㄗㄘㄙ'
-    'ㄚㄛㄝㄜㄞㄟㄠㄡㄢㄣㄤㄥㄦㄧ'
+    'ㄚㄛㄝㄜㄞㄟㄠㄡㄢㄣㄤㄥㄦㄧㄨㄩㄭ'
 )
 
 #: A string containing all Zhuyin tone marks.