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

Moving function quantity_allclose #7235 #7252

Merged
merged 12 commits into from
Apr 16, 2018
Merged

Moving function quantity_allclose #7235 #7252

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6b26606
Moved function quantity_allclose to astropy.units.quantity
rohanrajpal Mar 2, 2018
77d278d
respond to comments
Cadair Apr 13, 2018
f69fb8c
add isclose as well, because I want it
Cadair Apr 13, 2018
82a8d21
just import quantity_allclose into helper
Cadair Apr 13, 2018
5882cb4
Remilestone to 3.0.2
drdavella Apr 13, 2018
ba9774e
various fixes and improvements
Cadair Apr 13, 2018
a573d23
DOC: Fix Sphinx warnings [docs only]
pllim Apr 14, 2018
2e0f6d3
Added doc, tests, change log text.
pllim Apr 14, 2018
ac6ead4
DOC: Skip doctest on bool array
pllim Apr 14, 2018
e377e93
Restore API compatibility since this is a bugfix
drdavella Apr 16, 2018
26d5224
Workaround to preserve API compatibility and sphinx build for bugfix
drdavella Apr 16, 2018
e7f38f6
Address review comment for assert_quantity_allclose
pllim Apr 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions astropy/tests/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
except ImportError:
pass

from ..units import allclose as _quantity_allclose # noqa
from ..units import allclose as _quantity_allclose
from ..utils.exceptions import (AstropyDeprecationWarning,
AstropyPendingDeprecationWarning)

Expand Down Expand Up @@ -459,12 +459,7 @@ def assert_quantity_allclose(actual, desired, rtol=1.e-7, atol=None,
This is a :class:`~astropy.units.Quantity`-aware version of
:func:`numpy.testing.assert_allclose`.
"""
import numpy as np
from astropy.units.quantity import _unquantify_allclose_arguments

np.testing.assert_allclose(*_unquantify_allclose_arguments(actual, desired,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems this line, which was reinstated because of a comment by @mhvk got deleted again in the sphinx fixes. @pllim can we put this back in your second PR, to fix @cdeil's problem?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ops. I only saw Tom's comment. Sorry. I'll fix this shortly.

rtol, atol),
**kwargs)
assert _quantity_allclose(actual, desired, rtol=rtol, atol=atol, **kwargs)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@astrofrog , like this, correct?


# TODO: This is a workaround to preserve API compatibility for the bugfix
def quantity_allclose(*args, **kwargs):
Expand Down