Skip to content

Commit

Permalink
Merge pull request #145 from jGaboardi/element_as_gdf
Browse files Browse the repository at this point in the history
ENH: element_to_gdf()
  • Loading branch information
jGaboardi committed Nov 22, 2018
2 parents 9c8c138 + bcdd2ec commit 02aa04a
Show file tree
Hide file tree
Showing 8 changed files with 382 additions and 52 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ before_install:

install:
- conda install --yes pip
- conda install --yes geopandas
- if "$PYSAL_PYPI"; then
echo 'testing pypi libpysal' && pip install libpysal;
else echo 'testing git libpysal';
Expand Down
3 changes: 1 addition & 2 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ nose-exclude
coverage
sphinx>=1.4.3
sphinxcontrib-napoleon
coveralls
geopandas>=0.2
coveralls
1 change: 1 addition & 0 deletions spaghetti/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"""
from .network import Network, PointPattern, SimulatedPointPattern, SortedEdges
from .network import element_as_gdf
from .analysis import NetworkBase, NetworkG, NetworkK, NetworkF
from .analysis import gfunction, kfunction, ffunction
from .util import compute_length, get_neighbor_distances, generatetree
Expand Down

0 comments on commit 02aa04a

Please sign in to comment.