Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add support for numpy arrays (and dicts) to approx. #2492

Merged
merged 13 commits into from
Jul 6, 2017
Merged

Add support for numpy arrays (and dicts) to approx. #2492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9f3122f
Add support for numpy arrays (and dicts) to approx.
kalekundert Jun 12, 2017
8c22aee
Resolve merge conflict due to approx being moved.
kalekundert Jun 12, 2017
89292f0
Add a changelog entry.
kalekundert Jun 12, 2017
8badb47
Implement suggestions from code review.
kalekundert Jun 15, 2017
b41852c
Use `autofunction` to document approx.
kalekundert Jun 15, 2017
5076955
Skip the numpy doctests.
kalekundert Jun 15, 2017
5d24968
Only test numpy with py27 and py35.
kalekundert Jun 16, 2017
4d02863
Remove a dict-comprehension.
kalekundert Jun 16, 2017
d6000e5
Remove py36 from .travis.yml
kalekundert Jun 16, 2017
9597e67
Use sets to compare dictionary keys.
kalekundert Jun 16, 2017
8524a57
Add "approx" to all the repr-strings.
kalekundert Jul 4, 2017
c111e9d
Avoid making multiple ApproxNumpy types.
kalekundert Jul 4, 2017
7a1a439
Use `cls` instead of `ApproxNumpyBase`.
kalekundert Jul 4, 2017
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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ env:
- TOXENV=py27-pexpect
- TOXENV=py27-xdist
- TOXENV=py27-trial
- TOXENV=py27-numpy
- TOXENV=py35-pexpect
- TOXENV=py35-xdist
- TOXENV=py35-trial
- TOXENV=py35-numpy
- TOXENV=py27-nobyte
- TOXENV=doctesting
- TOXENV=freeze
Expand Down
3 changes: 2 additions & 1 deletion _pytest/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ def isclass(object):
if _PY3:
import codecs
imap = map
izip = zip
STRING_TYPES = bytes, str
UNICODE_TYPES = str,

Expand Down Expand Up @@ -160,7 +161,7 @@ def _escape_strings(val):
STRING_TYPES = bytes, str, unicode
UNICODE_TYPES = unicode,

from itertools import imap # NOQA
from itertools import imap, izip # NOQA

def _escape_strings(val):
"""In py2 bytes and str are the same type, so return if it's a bytes
Expand Down
Loading