Skip to content

Commit fbbaa5f

Browse files
committed
Drop 3.7 support
2 parents b5dfdd2 + 6415fbf commit fbbaa5f

File tree

9 files changed

+28
-45
lines changed

9 files changed

+28
-45
lines changed

.github/workflows/unittests.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
strategy:
2020
matrix:
2121
os: ['ubuntu-latest']
22-
environment-file: [ci/37-minimal.yaml, ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/310.yaml, ci/310_shapely_dev.yaml]
22+
environment-file: [
23+
ci/38-minimal.yaml,
24+
ci/38.yaml,
25+
ci/39.yaml,
26+
ci/310.yaml,
27+
ci/310_shapely_dev.yaml
28+
]
2329
include:
2430
- environment-file: ci/310.yaml
2531
os: macos-latest

ci/37.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

ci/37-minimal.yaml renamed to ci/38-minimal.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: test
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.7
5+
- python=3.8
66
- platformdirs
77
- beautifulsoup4
88
- jinja2
@@ -14,4 +14,4 @@ dependencies:
1414
- matplotlib
1515
- pytest
1616
- pytest-cov
17-
- pytest-xdist
17+
- pytest-xdist

libpysal/examples/tests/test_available.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ def test_data_home(self):
2323
head, tail = os.path.split(pth)
2424
self.assertEqual(tail, "pysal")
2525
if os_name == "Linux":
26-
heads = head.split("/")
27-
self.assertEqual(heads[1], "home")
28-
self.assertEqual(heads[-1], "share")
29-
self.assertEqual(heads[-2], ".local")
26+
if "XDG_DATA_HOME" in os.environ:
27+
self.assertEqual(head, os.environ["XDG_DATA_HOME"])
28+
else:
29+
heads = head.split("/")
30+
self.assertEqual(heads[-1], "share")
31+
self.assertEqual(heads[-2], ".local")
3032
elif os_name == "Darwin":
3133
heads = head.split("/")
3234
self.assertEqual(heads[1], "Users")

libpysal/weights/contiguity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Rook(W):
3838
optional arguments for :class:`pysal.weights.W`
3939
4040
See Also
41-
---------
41+
--------
4242
:class:`libpysal.weights.weights.W`
4343
"""
4444

libpysal/weights/distance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ def from_shapefile(cls, filepath, idVariable=None, **kwargs):
580580
Kernel Weights Object
581581
582582
See Also
583-
---------
583+
--------
584584
:class:`libpysal.weights.weights.W`
585585
"""
586586
points = get_points_array_from_shapefile(filepath)
@@ -860,7 +860,7 @@ def from_shapefile(cls, filepath, threshold, idVariable=None, **kwargs):
860860
name of column in shapefile's DBF to use for ids
861861
862862
Returns
863-
--------
863+
-------
864864
Kernel Weights Object
865865
866866
"""

libpysal/weights/gabriel.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class Delaunay(W):
2323
a graph from the input set of points. Will be slower without numba,
2424
and will warn if this is missing.
2525
26-
Arguments
27-
---------
26+
Parameters
27+
----------
2828
coordinates : array of points, (N,2)
2929
numpy array of coordinates containing locations to compute the
3030
delaunay triangulation
@@ -79,8 +79,8 @@ def from_dataframe(cls, df, **kwargs):
7979
Polygons or lines must be converted to points (e.g. using
8080
df.geometry.centroid).
8181
82-
Arguments
83-
---------
82+
Parameters
83+
----------
8484
df : geopandas.GeoDataFrame
8585
GeoDataFrame containing points to construct the Delaunay
8686
Triangulation.
@@ -114,13 +114,14 @@ class Gabriel(Delaunay):
114114
115115
For a link (i,j) connecting node i to j in the Delaunay triangulation
116116
to be retained in the Gabriel graph, it must pass a point set exclusion test:
117+
117118
1. Construct the circle C_ij containing link (i,j) as its diameter
118119
2. If any other node k is contained within C_ij, then remove link (i,j)
119120
from the graph.
120121
3. Once all links are evaluated, the remaining graph is the Gabriel graph.
121122
122-
Arguments
123-
---------
123+
Parameters
124+
----------
124125
coordinates : array of points, (N,2)
125126
numpy array of coordinates containing locations to compute the
126127
delaunay triangulation
@@ -159,8 +160,8 @@ class Relative_Neighborhood(Delaunay):
159160
This means that the points are at least as close to one another
160161
as they are to any other point.
161162
162-
Arguments
163-
---------
163+
Parameters
164+
----------
164165
coordinates : array of points, (N,2)
165166
numpy array of coordinates containing locations to compute the
166167
delaunay triangulation

libpysal/weights/spintW.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def vecW(
211211
212212
213213
Returns
214-
------
214+
-------
215215
W : DistanceBand W object that uses 4-dimenional distances between
216216
vectors origin and destination coordinates.
217217

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ def setup_package():
8383
"Topic :: Scientific/Engineering :: GIS",
8484
"License :: OSI Approved :: BSD License",
8585
"Programming Language :: Python",
86-
"Programming Language :: Python :: 3.7",
8786
"Programming Language :: Python :: 3.8",
8887
"Programming Language :: Python :: 3.9",
8988
"Programming Language :: Python :: 3.10",

0 commit comments

Comments
 (0)