Skip to content

Modify py support #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ sudo: false
language: python
python:
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
- "pypy"
- "pypy3"

install:
- pip install tox
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ test:
.PHONY: release
release:
pipenv run twine upload dist/*

.PHONY: clean
clean:
rm -rf .tox/ build/ dist/
22 changes: 18 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ When any test fails pytest displays all captured output (stdout, stderr, log)
as part of its report. For example,

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

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

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

test_logging.py F
Expand Down Expand Up @@ -76,7 +76,11 @@ template.

# Requirements

* Python 2.7 or 3.3+
* Python

* 2.7 or 3.6+
* pypy2 or pypy3

* pytest 2.8.5+

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

Install required packages for development.

## clean

$ make clean

Removes these directories:

- .tox/
- build/
- dist/

## build

$ make build
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def read(fname):

setup(
name="pytest-hidecaptured",
version="0.2.1",
version="0.2.2",
author="Hamza Sheikh",
author_email="code@codeghar.com",
maintainer="Hamza Sheikh",
Expand All @@ -33,9 +33,6 @@ def read(fname):
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# For more information about tox, see https://tox.readthedocs.org/en/latest/
[tox]
envlist = py27,py33,py34,py35,py36,pypy
envlist = py27,py36,pypy,pypy3

[testenv]
deps =
Expand Down