Skip to content

Commit ae975e2

Browse files
authored
Merge pull request #11 from codeghar/modify-py-support
Modify py support
2 parents 7311699 + 60c4757 commit ae975e2

File tree

5 files changed

+25
-12
lines changed

5 files changed

+25
-12
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ sudo: false
44
language: python
55
python:
66
- "2.7"
7-
- "3.3"
8-
- "3.4"
9-
- "3.5"
107
- "3.6"
118
- "pypy"
9+
- "pypy3"
1210

1311
install:
1412
- pip install tox

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ test:
1414
.PHONY: release
1515
release:
1616
pipenv run twine upload dist/*
17+
18+
.PHONY: clean
19+
clean:
20+
rm -rf .tox/ build/ dist/

README.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ When any test fails pytest displays all captured output (stdout, stderr, log)
1414
as part of its report. For example,
1515

1616
===== test session starts ======
17-
platform darwin -- Python 3.5.1, pytest-2.8.5, py-1.4.31, pluggy-0.3.1
17+
platform darwin -- Python 3.6.5, pytest-3.5.1, py-1.5.3, pluggy-0.6.0
1818
rootdir: /home/example/code, inifile:
1919
collected 1 items
2020

@@ -45,9 +45,9 @@ pytest-hidecaptured removes the captured output so it is not displayed. For
4545
example, with pytest-hidecaputred installed, the report for the same test is,
4646

4747
===== test session starts ======
48-
platform darwin -- Python 3.5.1, pytest-2.8.5, py-1.4.31, pluggy-0.3.1
48+
platform darwin -- Python 3.6.5, pytest-3.5.1, py-1.5.3, pluggy-0.6.0
4949
rootdir: /home/example/code, inifile:
50-
plugins: hidecaptured-0.1.0
50+
plugins: hidecaptured-0.2.2
5151
collected 1 items
5252

5353
test_logging.py F
@@ -76,7 +76,11 @@ template.
7676

7777
# Requirements
7878

79-
* Python 2.7 or 3.3+
79+
* Python
80+
81+
* 2.7 or 3.6+
82+
* pypy2 or pypy3
83+
8084
* pytest 2.8.5+
8185

8286
Note: Older versions of pytest may be compatible but I have not tested them.
@@ -118,6 +122,16 @@ The following targets in *Makefile* help do simple things.
118122

119123
Install required packages for development.
120124

125+
## clean
126+
127+
$ make clean
128+
129+
Removes these directories:
130+
131+
- .tox/
132+
- build/
133+
- dist/
134+
121135
## build
122136

123137
$ make build

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def read(fname):
1313

1414
setup(
1515
name="pytest-hidecaptured",
16-
version="0.2.1",
16+
version="0.2.2",
1717
author="Hamza Sheikh",
1818
author_email="code@codeghar.com",
1919
maintainer="Hamza Sheikh",
@@ -33,9 +33,6 @@ def read(fname):
3333
"Programming Language :: Python :: 2",
3434
"Programming Language :: Python :: 2.7",
3535
"Programming Language :: Python :: 3",
36-
"Programming Language :: Python :: 3.3",
37-
"Programming Language :: Python :: 3.4",
38-
"Programming Language :: Python :: 3.5",
3936
"Programming Language :: Python :: 3.6",
4037
"Programming Language :: Python :: Implementation :: CPython",
4138
"Programming Language :: Python :: Implementation :: PyPy",

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# For more information about tox, see https://tox.readthedocs.org/en/latest/
22
[tox]
3-
envlist = py27,py33,py34,py35,py36,pypy
3+
envlist = py27,py36,pypy,pypy3
44

55
[testenv]
66
deps =

0 commit comments

Comments
 (0)