Merge pull request #124 from nicoddemus/py37-and-modern-pytest-versions

Test py37, update classifiers and test with more modern pytest versions

Author: nicoddemus

.travis.yml

@@ -1,21 +1,34 @@
 language: python
-python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
-  - "3.6"
 
 install:
-  - pip install tox-travis coveralls
+  - pip install -U pip
+  - pip install tox coveralls
 
 script:
   - tox
 
 after_success:
   - coveralls
 
+stages:
+- test
+- name: deploy
+  if: repo = pytest-dev/pytest-mock AND tag IS present
+
 jobs:
   include:
+    - python: '2.7'
+      env: TOXENV=py27
+    - python: '3.4'
+      env: TOXENV=py34
+    - python: '3.5'
+      env: TOXENV=py35
+    - python: '3.6'
+      env: TOXENV=py36
+    - python: '3.7'
+      env: TOXENV=py37
+      sudo: required
+      dist: xenial
     - python: '3.6'
       env: TOXENV=linting
     - python: '3.6'

appveyor.yml

@@ -1,7 +1,10 @@
 install:
-  - C:\Python36\python -m pip install tox
+  - C:\Python37\python -m pip install -U pip
+  - C:\Python37\python -m pip install tox
 
 build: false  # Not a C# project
 
 test_script:
-  - C:\Python36\scripts\tox
+  - C:\Python37\scripts\tox
+
+skip_tags: true

setup.py

@@ -35,6 +35,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Testing',
     ]
 )

tox.ini

@@ -1,12 +1,10 @@
 [tox]
-envlist = py{27,34,35,36}-pytest{34,35},linting,norewrite
+envlist = py{27,34,35,36,37}, linting, norewrite
 
 [testenv]
 passenv = USER USERNAME
 deps =
     coverage
-    pytest34: pytest~=3.4
-    pytest35: pytest~=3.5
 commands =
     coverage run --append --source=pytest_mock.py -m pytest test_pytest_mock.py
 
@@ -15,11 +13,12 @@ commands =
     pytest test_pytest_mock.py --assert=plain -ra
 
 [testenv:linting]
-skip_install=True
+skipsdist = True
+usedevelop = True
 deps =
     pytest-flakes
     restructuredtext_lint
     pygments
 commands =
-    py.test --flakes pytest_mock.py test_pytest_mock.py -m flakes
+    pytest --flakes pytest_mock.py test_pytest_mock.py -m flakes
     rst-lint CHANGELOG.rst README.rst