From 6ccfba31e15c58c7c586d2016888ec9947a2ea3c Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 30 Oct 2020 07:48:12 -0300
Subject: [PATCH] Update CI configuration

Test with more modern Python and pytest versions
---
 .travis.yml | 53 ++++++++++++++++++++++++++++++++++++++++-------------
 CHANGES.rst |  2 ++
 README.rst  |  7 +++++--
 setup.py    |  8 ++++++--
 tox.ini     |  8 ++++----
 5 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 274da80d9..bfb575c01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,48 @@
 language: python
-python:
-- 2.7
-- 3.4
-- 3.5
-- 3.6
-- pypy
-- pypy3
-- nightly
-env:
-- TOXENV=pytest36
-- TOXENV=pytest37
-- TOXENV=pytest38
 matrix:
   include:
+  # On Python 2 we test pytest 3 (minimum supported) and 4 (latest to support Python 2)
   - python: 2.7
-    env: TOXENV=flake8
+    env: TOXENV=py27-pytest3
+  - python: pypy
+    env: TOXENV=pypy-pytest3
+  - python: 2.7
+    env: TOXENV=py27-pytest4
+  - python: pypy
+    env: TOXENV=pypy-pytest4
+
+  # On Python 3.5+ we test pytest 3 (minimum supported) and 6 (latest)
+  - python: 3.5
+    env: TOXENV=py35-pytest3
   - python: 3.5
+    env: TOXENV=py35-pytest6
+
+  - python: 3.6
+    env: TOXENV=py36-pytest3
+  - python: 3.6
+    env: TOXENV=py36-pytest6
+
+  - python: 3.7
+    env: TOXENV=py37-pytest3
+  - python: 3.7
+    env: TOXENV=py37-pytest6
+
+  - python: 3.8
+    env: TOXENV=py38-pytest3
+  - python: 3.8
+    env: TOXENV=py38-pytest6
+
+  - python: 3.9
+    env: TOXENV=py39-pytest3
+  - python: 3.9
+    env: TOXENV=py39-pytest6
+
+  - python: pypy3
+    env: TOXENV=pypy3-pytest3
+  - python: pypy3
+    env: TOXENV=pypy3-pytest6
+
+  - python: 3.9
     env: TOXENV=flake8
 install:
 - pip install tox-travis
diff --git a/CHANGES.rst b/CHANGES.rst
index 67c2a9cc9..b8fa0bf93 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,8 @@ Release Notes
 
 * Using ``@pytest.mark.repeat(1)`` can now be used to disable repeating a test regardless of the ``--count`` parameter given in the command-line.
 
+* Python 3.4 is no longer officially supported.
+
 **0.8.0 (2019-02-26)**
 
 * Fix mark deprecation warnings in new pytest versions.
diff --git a/README.rst b/README.rst
index 38b7763f6..859588d58 100644
--- a/README.rst
+++ b/README.rst
@@ -10,6 +10,9 @@ easy to repeat a single test, or multiple tests, a specific number of times.
 .. image:: https://img.shields.io/pypi/v/pytest-repeat.svg
    :target: https://pypi.python.org/pypi/pytest-repeat/
    :alt: PyPI
+.. image:: https://img.shields.io/pypi/pyversions/pytest-repeat.svg
+   :target: https://pypi.org/project/pytest-repeat/
+   :alt: Python versions
 .. image:: https://img.shields.io/travis/pytest-dev/pytest-repeat.svg
    :target: https://travis-ci.org/pytest-dev/pytest-repeat/
    :alt: Travis
@@ -25,8 +28,8 @@ Requirements
 
 You will need the following prerequisites in order to use pytest-repeat:
 
-- Python 2.7, 3.4+ or PyPy
-- pytest 2.8 or newer
+- Python 2.7, 3.5+ or PyPy
+- pytest 3.6 or newer
 
 Installation
 ------------
diff --git a/setup.py b/setup.py
index b8290ead0..4b3db3765 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@
       install_requires=['pytest>=3.6'],
       license='Mozilla Public License 2.0 (MPL 2.0)',
       keywords='pytest pytest repeat',
+      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
       classifiers=[
           'Development Status :: 5 - Production/Stable',
           'Framework :: Pytest',
@@ -26,6 +27,9 @@
           'Topic :: Utilities',
           'Programming Language :: Python',
           'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6'])
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
+      ])
diff --git a/tox.ini b/tox.ini
index 4dffbe94f..ddb274d69 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,14 +6,14 @@
 [tox]
 minversion = 3.4.0
 isolated_build = true
-envlist = py{27,34,35,36,py,py3}-pytest{36,37,38}, flake8
+envlist = py{27,35,36,37,38,39,py,py3}-pytest{3,4,6}, flake8
 
 [testenv]
 commands = pytest {posargs}
 deps =
-    pytest36: pytest~=3.6
-    pytest37: pytest~=3.7
-    pytest38: pytest~=3.8
+    pytest3: pytest~=3.6
+    pytest4: pytest~=4.6
+    pytest6: pytest>=6,<7
 
 [testenv:flake8]
 basepython = python