Merge pull request #41 from Scony/pytest5

Add tests for pytest 5

Author: Scony

.travis.yml

@@ -1,20 +1,54 @@
-sudo: false
-dist: trusty
 language: python
-python:
-  - '3.6'
-cache: pip
+dist: xenial
+stages:
+- name: test
+  if: repo = Scony/pytest-timeouts AND tag IS NOT present
+- name: deploy
+  if: repo = Scony/pytest-timeouts AND tag IS present
+python: '3.7'
+cache: false
+os: linux
+
 install:
-  - pip install tox codecov
-script:
-  - tox
-deploy:
-  provider: pypi
-  user: Scony
-  password:
-    secure: zesc8Ly0VeisTE1gT50Wq8oesX/5h3qXz/G5Zqv35sy9Hwj1AKcyAEBJOZGk7l16jlGgJc/SLaAHrmDmY+9kU9KCKstWnqA0z8Ap7sTVRpxEdNHt7XayK5rmoAPpb137F8GX6+wJoRLmpc8/8gaq985vqVKcxya6aUlrscdHp6VXPgMki+78BDGpXJw58QI7E0f0sGcN94YYxOP+tFV/MAqfYDZM+Vxfol/Vv3H20ZiesKAgNIRXAsK/cXNj4PYbxC6Ck+RCMc4+J223kKw0VAbuqJVc1lUBq2zgUdyIk57/GMHPbxM6eETU/BPFH8Ca/yJA6oz+dm+nmmHgszmevxEHY7K0LJEQnTmNfvlQM2EjgEh/YYiRPsS+QrUYUIWqbIme8jQT0l+xkMtLPFUg3eYQ9w9sjmR6fz+yO3yGHapdcbHfUxp3uGN6Z7y2/54pTL8LrmoXD24e7k6kHDKazw4TZrDpGGL38XAoX00NzRA0MAYsPbyGkr/oPk0M6O0P+MA0i1TC0jdVQerZM7eKcLOwbsEViDhEtobH7pIbz07lWusDsVC/KUEvc46+ZJOLLcYvQtN1V2FeBvfqI/8Oa11SIaDwpi2aMXlCVPH/aCqfDiJQR6LeNDNtSyyiHTxH4wMlDy4kS5W0ZvtXuwQrJ9ecSdgqf1RC1mp/dhOc4NE=
-  on:
-    tags: true
-    branch: master
-after_script:
-  - codecov
+  - python -m pip install --upgrade --pre tox
+
+jobs:
+  include:
+    - env: TOXENV=py3-codestyle
+    - env: TOXENV=py3-coverage PYTEST_COVERAGE=1
+      install:
+      - python -m pip install --upgrade --pre tox codecov
+
+    - env: TOXENV=py35
+      python: '3.5'
+
+    - env: TOXENV=py36
+      python: '3.6'
+
+    - env: TOXENV=py37
+      python: '3.7'
+
+    - env: TOXENV=py38
+      python: '3.8'
+      
+    - stage: deploy
+      python: '3.6'
+      install: pip install -U setuptools setuptools_scm tox
+      script: skip
+      deploy:
+        provider: pypi
+        username: Scony
+        password:
+          secure: zesc8Ly0VeisTE1gT50Wq8oesX/5h3qXz/G5Zqv35sy9Hwj1AKcyAEBJOZGk7l16jlGgJc/SLaAHrmDmY+9kU9KCKstWnqA0z8Ap7sTVRpxEdNHt7XayK5rmoAPpb137F8GX6+wJoRLmpc8/8gaq985vqVKcxya6aUlrscdHp6VXPgMki+78BDGpXJw58QI7E0f0sGcN94YYxOP+tFV/MAqfYDZM+Vxfol/Vv3H20ZiesKAgNIRXAsK/cXNj4PYbxC6Ck+RCMc4+J223kKw0VAbuqJVc1lUBq2zgUdyIk57/GMHPbxM6eETU/BPFH8Ca/yJA6oz+dm+nmmHgszmevxEHY7K0LJEQnTmNfvlQM2EjgEh/YYiRPsS+QrUYUIWqbIme8jQT0l+xkMtLPFUg3eYQ9w9sjmR6fz+yO3yGHapdcbHfUxp3uGN6Z7y2/54pTL8LrmoXD24e7k6kHDKazw4TZrDpGGL38XAoX00NzRA0MAYsPbyGkr/oPk0M6O0P+MA0i1TC0jdVQerZM7eKcLOwbsEViDhEtobH7pIbz07lWusDsVC/KUEvc46+ZJOLLcYvQtN1V2FeBvfqI/8Oa11SIaDwpi2aMXlCVPH/aCqfDiJQR6LeNDNtSyyiHTxH4wMlDy4kS5W0ZvtXuwQrJ9ecSdgqf1RC1mp/dhOc4NE=
+        on:
+          tags: true
+          branch: master
+          repo: Scony/pytest-timeouts
+
+script: tox
+
+after_success:
+  - |
+    if [[ "$PYTEST_COVERAGE" = 1 ]]; then
+      codecov
+    fi

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+### Changed
+- Add tests for pytest 5 https://github.com/Scony/pytest-timeouts/issues/39
+- Add tests for python 3.5 3.6 3.7 3.8 https://github.com/Scony/pytest-timeouts/issues/40
 ## [1.2.1] 2019-09-21
 ### Fixed
 - PyTest get_marker warning fix https://github.com/Scony/pytest-timeouts/pull/36

tox.ini

@@ -2,25 +2,16 @@
 addopts = -vv -ra
 
 [tox]
-envlist = py{27,3}-pytest{3,31,4},
-          py{27,3}-codestyle
+envlist = py{35, 36, 37, 38},
+          py3-codestyle,
           py3-coverage
 
 [testenv]
 deps =
-    pytest4: pytest>=4
-    pytest31: pytest>=3.1,<3.2
-    pytest3: pytest>=3
+    pytest5: pytest>=5,<6
 
 commands = pytest test_pytest_timeouts.py {posargs}
 
-[testenv:py27-codestyle]
-deps = multilint
-       flake8
-       isort
-       modernize
-commands = multilint
-
 [testenv:py3-codestyle]
 deps = multilint
        flake8