Merge branch 'release/0.1.1'

.travis.yml

@@ -17,14 +17,15 @@ matrix:
     - python: pypy
       env: TOXENV=pypy
 
-    # pypy
+    # pypy3
     - python: pypy3
       env: TOXENV=pypy3
 
+  allow_failures:
+    - python: pypy
+    - python: pypy3
+
 install:
-  - pip install tox
-  - pip install codecov
-  - pip install Django==1.10
   - pip install -r requirements/test.txt
   - pip install -r requirements/docs.txt
 

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Release 0.1.1 - Wednesday 2 November  08:02:07 AEDT 2016
+
+- Fixed travis YAML file parse error
+- Allow travis failures for pypy and pypy3
+- Added pytest-cov
+- Fixed pylint issue with __init__ import
+- Cleaned up test requirements
+
 # Release 0.1.0 - Wed Nov 2 07:55:01 EST 2016
 
 - Initial release

VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

requirements/test.txt

@@ -1,4 +1,8 @@
 -r default.txt
 
 py==1.4.31
-pytest==3.0.3
+pytest>=3,<=4
+pytest-cov>=2.4,<=3
+pylint>=1.6,<=2
+codecov
+coverage

schematics_xml/__init__.py

@@ -10,7 +10,7 @@
     'VersionInfo', ('major', 'minor', 'micro', 'releaselevel', 'serial'),
 )
 
-VERSION = VersionInfo(0, 1, 0, '', '')
+VERSION = VersionInfo(0, 1, 1, '', '')
 __version__ = '{0.major}.{0.minor}.{0.micro}{0.releaselevel}'.format(VERSION)
 __author__ = 'Alex Hayes'
 __contact__ = 'alex@alution.com'
@@ -19,4 +19,4 @@
 
 # -eof meta-
 
-from schematics_xml.models import XMLModel
+from schematics_xml.models import XMLModel  # pylint: disable=wrong-import-position