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.

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

Remove bundled pvextractor and updated extraction tool to work properly with changes to .coords #2252

Merged
merged 5 commits into from
Jan 27, 2022
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
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Full changelog
==============

v1.3.0 (unreleased)
-------------------

* Remove bundled version of pvextractor and include it as a proper
dependency. [#2252]

v1.2.4 (2022-01-27)
-------------------

Expand Down
3 changes: 1 addition & 2 deletions glue/core/tests/test_state_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

from echo import CallbackProperty, ListCallbackProperty
from glue.core import Data, DataCollection
from glue.utils import nanmedian

from .test_state import clone
from ..state_objects import (State, StateAttributeLimitsHelper,
Expand Down Expand Up @@ -202,7 +201,7 @@ class SimpleState(State):
self.state = SimpleState()

self.helper = StateAttributeSingleValueHelper(self.state, attribute='comp',
function=nanmedian, value='val')
function=np.nanmedian, value='val')

self.state.data = self.data

Expand Down
8 changes: 3 additions & 5 deletions glue/core/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
from matplotlib.projections.polar import ThetaFormatter, ThetaLocator
import matplotlib.ticker as mticker

from glue.utils import nanmin, nanmax

__all__ = ["ThetaRadianFormatter", "relim", "split_component_view", "join_component_view",
"facet_subsets", "colorize_subsets", "disambiguate",
'small_view', 'small_view_array', 'visible_limits',
Expand Down Expand Up @@ -205,9 +203,9 @@ def facet_subsets(data_collection, cid, lo=None, hi=None, steps=5,
raise ValueError("Cannot infer data limits for ComponentID %s"
% cid)
if lo is None:
lo = nanmin(vals)
lo = np.nanmin(vals)
if hi is None:
hi = nanmax(vals)
hi = np.nanmax(vals)

reverse = lo > hi
if log:
Expand Down Expand Up @@ -362,7 +360,7 @@ def visible_limits(artists, axis):
if data.size == 0:
return

lo, hi = nanmin(data), nanmax(data)
lo, hi = np.nanmin(data), np.nanmax(data)
if not np.isfinite(lo):
return

Expand Down
29 changes: 0 additions & 29 deletions glue/external/pvextractor/LICENSE

This file was deleted.

7 changes: 0 additions & 7 deletions glue/external/pvextractor/__init__.py

This file was deleted.

3 changes: 0 additions & 3 deletions glue/external/pvextractor/geometry/__init__.py

This file was deleted.

97 changes: 0 additions & 97 deletions glue/external/pvextractor/geometry/helpers.py

This file was deleted.

75 changes: 0 additions & 75 deletions glue/external/pvextractor/geometry/line_slices.py

This file was deleted.

Loading