Skip to content

Commit 597401a

Browse files
authored
Merge pull request #49 from nicoddemus/update-ci
2 parents a63e34e + 6ccfba3 commit 597401a

File tree

5 files changed

+57
-21
lines changed

5 files changed

+57
-21
lines changed

.travis.yml

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,48 @@
11
language: python
2-
python:
3-
- 2.7
4-
- 3.4
5-
- 3.5
6-
- 3.6
7-
- pypy
8-
- pypy3
9-
- nightly
10-
env:
11-
- TOXENV=pytest36
12-
- TOXENV=pytest37
13-
- TOXENV=pytest38
142
matrix:
153
include:
4+
# On Python 2 we test pytest 3 (minimum supported) and 4 (latest to support Python 2)
165
- python: 2.7
17-
env: TOXENV=flake8
6+
env: TOXENV=py27-pytest3
7+
- python: pypy
8+
env: TOXENV=pypy-pytest3
9+
- python: 2.7
10+
env: TOXENV=py27-pytest4
11+
- python: pypy
12+
env: TOXENV=pypy-pytest4
13+
14+
# On Python 3.5+ we test pytest 3 (minimum supported) and 6 (latest)
15+
- python: 3.5
16+
env: TOXENV=py35-pytest3
1817
- python: 3.5
18+
env: TOXENV=py35-pytest6
19+
20+
- python: 3.6
21+
env: TOXENV=py36-pytest3
22+
- python: 3.6
23+
env: TOXENV=py36-pytest6
24+
25+
- python: 3.7
26+
env: TOXENV=py37-pytest3
27+
- python: 3.7
28+
env: TOXENV=py37-pytest6
29+
30+
- python: 3.8
31+
env: TOXENV=py38-pytest3
32+
- python: 3.8
33+
env: TOXENV=py38-pytest6
34+
35+
- python: 3.9
36+
env: TOXENV=py39-pytest3
37+
- python: 3.9
38+
env: TOXENV=py39-pytest6
39+
40+
- python: pypy3
41+
env: TOXENV=pypy3-pytest3
42+
- python: pypy3
43+
env: TOXENV=pypy3-pytest6
44+
45+
- python: 3.9
1946
env: TOXENV=flake8
2047
install:
2148
- pip install tox-travis

CHANGES.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Release Notes
55

66
* Using ``@pytest.mark.repeat(1)`` can now be used to disable repeating a test regardless of the ``--count`` parameter given in the command-line.
77

8+
* Python 3.4 is no longer officially supported.
9+
810
**0.8.0 (2019-02-26)**
911

1012
* Fix mark deprecation warnings in new pytest versions.

README.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ easy to repeat a single test, or multiple tests, a specific number of times.
1010
.. image:: https://img.shields.io/pypi/v/pytest-repeat.svg
1111
:target: https://pypi.python.org/pypi/pytest-repeat/
1212
:alt: PyPI
13+
.. image:: https://img.shields.io/pypi/pyversions/pytest-repeat.svg
14+
:target: https://pypi.org/project/pytest-repeat/
15+
:alt: Python versions
1316
.. image:: https://img.shields.io/travis/pytest-dev/pytest-repeat.svg
1417
:target: https://travis-ci.org/pytest-dev/pytest-repeat/
1518
:alt: Travis
@@ -25,8 +28,8 @@ Requirements
2528

2629
You will need the following prerequisites in order to use pytest-repeat:
2730

28-
- Python 2.7, 3.4+ or PyPy
29-
- pytest 2.8 or newer
31+
- Python 2.7, 3.5+ or PyPy
32+
- pytest 3.6 or newer
3033

3134
Installation
3235
------------

setup.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
install_requires=['pytest>=3.6'],
1414
license='Mozilla Public License 2.0 (MPL 2.0)',
1515
keywords='pytest pytest repeat',
16+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
1617
classifiers=[
1718
'Development Status :: 5 - Production/Stable',
1819
'Framework :: Pytest',
@@ -26,6 +27,9 @@
2627
'Topic :: Utilities',
2728
'Programming Language :: Python',
2829
'Programming Language :: Python :: 2.7',
29-
'Programming Language :: Python :: 3.4',
3030
'Programming Language :: Python :: 3.5',
31-
'Programming Language :: Python :: 3.6'])
31+
'Programming Language :: Python :: 3.6',
32+
'Programming Language :: Python :: 3.7',
33+
'Programming Language :: Python :: 3.8',
34+
'Programming Language :: Python :: 3.9',
35+
])

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
[tox]
77
minversion = 3.4.0
88
isolated_build = true
9-
envlist = py{27,34,35,36,py,py3}-pytest{36,37,38}, flake8
9+
envlist = py{27,35,36,37,38,39,py,py3}-pytest{3,4,6}, flake8
1010

1111
[testenv]
1212
commands = pytest {posargs}
1313
deps =
14-
pytest36: pytest~=3.6
15-
pytest37: pytest~=3.7
16-
pytest38: pytest~=3.8
14+
pytest3: pytest~=3.6
15+
pytest4: pytest~=4.6
16+
pytest6: pytest>=6,<7
1717

1818
[testenv:flake8]
1919
basepython = python

0 commit comments

Comments
 (0)