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

Update deprecation warnings (shape.py, locators.py) #468

Merged
merged 9 commits into from
Jun 13, 2022
Merged

Update deprecation warnings (shape.py, locators.py) #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
42171af
Bump actions/checkout from 2 to 3
dependabot[bot] Mar 1, 2022
b640746
Merge pull request #23 from jGaboardi/dependabot/github_actions/actio…
jGaboardi Mar 1, 2022
14a9e0d
Merge remote-tracking branch 'origin/master'
jGaboardi Mar 1, 2022
e06a8ab
Merge remote-tracking branch 'upstream/master'
jGaboardi Mar 3, 2022
99ab457
Merge remote-tracking branch 'upstream/master'
jGaboardi Mar 3, 2022
57cea92
Merge remote-tracking branch 'upstream/master'
jGaboardi Apr 5, 2022
e9f8497
change depr to future warning
jGaboardi May 15, 2022
da06b74
add future warning for Geometry-based objects
jGaboardi May 15, 2022
788dd0f
change depr to future warning (segloc)
jGaboardi May 15, 2022
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
10 changes: 5 additions & 5 deletions libpysal/cg/locators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

__all__ = ["Grid", "BruteForcePointLocator", "PointLocator", "PolygonLocator"]

dep_msg = "is deprecated and will be reoved in libpysal 4.4.0"
dep_msg = "is deprecated and will be removed in a future version of libpysal"


class Grid:
Expand All @@ -38,7 +38,7 @@ def __init__(self, bounds, resolution):
TODO: complete this doctest
>>> g = Grid(Rectangle(0, 0, 10, 10), 1)
"""
warnings.warn("Grid " + dep_msg, DeprecationWarning)
warnings.warn("Grid " + dep_msg, FutureWarning)
if resolution == 0:
raise Exception("Cannot create grid with resolution 0")
self.res = resolution
Expand Down Expand Up @@ -294,7 +294,7 @@ def __init__(self, points):
--------
>>> pl = BruteForcePointLocator([Point((0, 0)), Point((5, 0)), Point((0, 10))])
"""
warnings.warn("BruteForcePointLocator " + dep_msg, DeprecationWarning)
warnings.warn("BruteForcePointLocator " + dep_msg, FutureWarning)
self._points = points

def nearest(self, query_point):
Expand Down Expand Up @@ -388,7 +388,7 @@ def __init__(self, points):
>>> points = [Point((0, 0)), Point((1, 6)), Point((5.4, 1.4))]
>>> pl = PointLocator(points)
"""
warnings.warn("PointLocator " + dep_msg, DeprecationWarning)
warnings.warn("PointLocator " + dep_msg, FutureWarning)
self._locator = BruteForcePointLocator(points)

def nearest(self, query_point):
Expand Down Expand Up @@ -486,7 +486,7 @@ def __init__(self, polygons):
>>> isinstance(pl, PolygonLocator)
True
"""
warnings.warn("PolygonLocator " + dep_msg, DeprecationWarning)
warnings.warn("PolygonLocator " + dep_msg, FutureWarning)
self._locator = polygons
# create and rtree
self._rtree = RTree()
Expand Down
10 changes: 4 additions & 6 deletions libpysal/cg/segmentLocator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import warnings


dep_msg = "is deprecated and will be reoved in libpysal 4.4.0."
dep_msg = "is deprecated and will be removed in a future version of libpysal"

__all__ = ["SegmentGrid", "SegmentLocator", "Polyline_Shapefile_SegmentLocator"]
DEBUG = False
Expand All @@ -27,7 +27,7 @@ def nearest(self, pt):

class SegmentLocator(object):
def __init__(self, segments, nbins=500):
warnings.warn("SegmentLocator " + dep_msg, DeprecationWarning)
warnings.warn("SegmentLocator " + dep_msg, FutureWarning)
self.data = segments
if hasattr(segments, "bounding_box"):
bbox = segment.bounding_box
Expand All @@ -51,9 +51,7 @@ def nearest(self, pt):

class Polyline_Shapefile_SegmentLocator(object):
def __init__(self, shpfile, nbins=500):
warnings.warn(
"Polyline_Shapefile_SegmentLocator " + dep_msg, DeprecationWarning
)
warnings.warn("Polyline_Shapefile_SegmentLocator " + dep_msg, FutureWarning)
self.data = shpfile
bbox = Rectangle(*shpfile.bbox)
res = max((bbox.right - bbox.left), (bbox.upper - bbox.lower)) / float(nbins)
Expand Down Expand Up @@ -101,7 +99,7 @@ def __init__(self, bounds, resolution):
TODO: complete this doctest
>>> g = SegmentGrid(Rectangle(0, 0, 10, 10), 1)
"""
warnings.warn("SegmentGrid " + dep_msg, DeprecationWarning)
warnings.warn("SegmentGrid " + dep_msg, FutureWarning)
if resolution == 0:
raise Exception("Cannot create grid with resolution 0")
self.res = resolution
Expand Down
Loading