Merge 48e50c5 into a8fab8d

.travis.yml

@@ -1,30 +1,27 @@
 language: python
+dist: xenial
+cache: pip
+install: travis_retry pip install -U tox coveralls
+script: tox
+after_success: coveralls --verbose
 
-python:
-  - '3.5'
-  - '3.6'
-
-env:
-  matrix:
-    - MARSHMALLOW_VERSION=2
-    - MARSHMALLOW_VERSION=3
-
-install:
-  - pip install tox
-  - pip install coveralls
+jobs:
 
-script: tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d .)-ma$MARSHMALLOW_VERSION
+  include:
 
-after_success:
-  - coveralls --verbose
+    - { python: '3.6', env: TOXENV=lint }
+    - { python: '3.5', env: TOXENV=py35-ma2 }
+    - { python: '3.5', env: TOXENV=py35-ma3 }
+    - { python: '3.6', env: TOXENV=py36-ma2 }
+    - { python: '3.6', env: TOXENV=py36-ma3 }
+    - { python: '3.7', env: TOXENV=py37-ma2 }
+    - { python: '3.7', env: TOXENV=py37-ma3 }
 
-jobs:
-  include:
     - stage: PyPI Release
       if: tag IS present
       python: '3.6'
-      env: MARSHMALLOW_VERSION=3
-      install: true
+      env: TOXENV=py36-ma3
+      install: skip
       script: echo "Releasing to PyPI..."
       deploy:
         provider: pypi

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Changelog
 ---------
 
+0.14.1 (unreleased)
++++++++++++++++++++
+
+Features:
+
+- Official Python 3.7 support (:pr:`45`).
+
 0.14.0 (2019-03-08)
 +++++++++++++++++++
 

setup.py

@@ -25,6 +25,7 @@
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
     keywords=[
         'REST',

tox.ini

@@ -1,13 +1,18 @@
 [tox]
-envlist = {py35,py36}-{ma2,ma3}
+envlist = lint,{py35,py36,py37}-{ma2,ma3}
 
 [testenv]
 deps =
-    flake8>=3.2.0
-    pytest>=2.8
-    pytest-cov>=2.4.0
+    pytest>=4.0.0
+    pytest-cov>=2.6.0
     ma2: marshmallow>=2.15.0,<3.0.0
-    ma3: marshmallow>=3.0.0b13
+    ma3: marshmallow>=3.0.0rc4
+commands =
+    pytest --cov=flask_rest_api tests --cov-report term-missing
+
+[testenv:lint]
+deps =
+    flake8>=3.7.0
+skip_install = true
 commands =
     flake8 .
-    py.test --cov=flask_rest_api tests --cov-report term-missing