Merge pull request #9 from mplanchard/development

Dev -> Master (0.3.0)

.gitlab-ci.yml

@@ -0,0 +1,60 @@
+image: python:3
+
+stages:
+  - test
+
+test-2.7:
+  image: python:2.7
+  stage: test
+  script:
+    - pip install tox
+    - tox -e py27
+
+test-3.4:
+  image: python:3.4
+  stage: test
+  script:
+    - pip install tox
+    - tox -e py34
+
+test-3.5-marshmallow-2:
+  image: python:3.5
+  stage: test
+  script:
+    - pip install tox
+    - tox -e py35-marshmallow2
+
+test-3.5-marshmallow-3:
+  image: python:3.5
+  stage: test
+  script:
+    - pip install tox
+    - tox -e py35-marshmallow3
+
+test-3.6-marshmallow-2:
+  image: python:3.6
+  stage: test
+  script:
+    - pip install tox
+    - tox -e py36-marshmallow2
+
+test-3.6-marshmallow-2:
+  image: python:3.6
+  stage: test
+  script:
+    - pip install tox
+    - tox -e py36-marshmallow3
+
+test-3.7-marshmallow-2:
+  image: python:3.7
+  stage: test
+  script:
+    - pip install tox
+    - tox -e py37-marshmallow2
+
+test-3.7-marshmallow-3:
+  image: python:3.7
+  stage: test
+  script:
+    - pip install tox
+    - tox -e py37-marshmallow3

falcon_marshmallow/_version.py

@@ -9,8 +9,11 @@
 ``setup.py egg_info`` command when creating distributions.
 """
 from __future__ import (
-    absolute_import, division, print_function, unicode_literals
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
 )
 
-__version_info__ = (0, 2, 0)
-__version__ = '.'.join([str(ver) for ver in __version_info__])
+__version_info__ = (0, 3, 0)
+__version__ = ".".join([str(ver) for ver in __version_info__])