Merge branch 'release/0.1.3'

miyakogi · May 17, 2016 · 43413a2 · 43413a2
2 parents d2a5ffe + 6432c6a
commit 43413a2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,6 +3,11 @@ Version 0.2
 
 (next version)
 
+Version 0.1.3 (2016-05-17)
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* (bug fix) Add dependency of mypy-lang for python < 3.5
+
 Version 0.1.2 (2016-05-15)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/README.rst b/README.rst
@@ -13,6 +13,8 @@ WDOM
 .. image:: https://codecov.io/github/miyakogi/wdom/coverage.svg?branch=dev
    :target: https://codecov.io/github/miyakogi/wdom?branch=dev
 
+--------------------------------------------------------------------------------
+
 WDOM is a python GUI library for browser-based desktop applications. WDOM
 controls HTML elements (DOM) on browser from python, as if it is a GUI element.
 APIs are same as browser DOM, but of course, you can write logic codes in

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

diff --git a/setup.py b/setup.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import sys
 from os import path
 
 try:
@@ -15,9 +16,13 @@
 install_requires = ['tornado']
 test_requites = ['nose_parameterized', 'selenium', 'syncer']
 
+if sys.version_info < (3, 5):
+    install_requires.append('mypy-lang')
+
+
 setup(
     name='wdom',
-    version='0.1.2',
+    version='0.1.3',
     description='GUI library for browser-based desktop applications',
     long_description=readme,
     author='Hiroyuki Takagi',

diff --git a/tox.ini b/tox.ini
@@ -8,7 +8,6 @@ basepython =
   py34: python3.4
   py35: python3.5
 deps =
-  py34-{tornado,aiohttp}: mypy-lang
   {py34,py35}-{tornado,aiohttp}: selenium
   {py34,py35}-{tornado,aiohttp}: nose_parameterized
   {py34,py35}-{tornado,aiohttp}: syncer

diff --git a/tox_travis.ini b/tox_travis.ini
@@ -5,7 +5,6 @@ envlist = py-{tornado,aiohttp}
 passenv = *
 changedir = {toxworkdir}
 deps=
-  mypy-lang
   selenium
   nose_parameterized
   syncer