Skip to content

Commit

Permalink
Merge pull request #33 from sjsrey/setup
Browse files Browse the repository at this point in the history
Changing esda setup to handle version programatically
  • Loading branch information
weikang9009 authored Aug 16, 2018
2 parents e1a146d + 725d4ab commit 7e435a4
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ Exploratory Spatial Data Analysis in PySAL

Methods for testing for global and local autocorrelation in areal unit data.

Examples
--------

* [Join Counts](notebooks/directional.ipynb)
* [Global Spatial Autocorrelation](notebooks/Markov%20Based%20Methods.ipynb)
* [Local Spatial Autocorrelation](notebooks/Rank%20based%20Methods.ipynb)

Installation
------------

Expand Down
1 change: 1 addition & 0 deletions esda/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
__version__ = "2.0.0"
"""
:mod:`esda` --- Exploratory Spatial Data Analysis
=================================================
Expand Down
2 changes: 1 addition & 1 deletion esda/smoothing.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
__author__ = "Myunghwa Hwang <[email protected]>, David Folch <[email protected]>, Luc Anselin <[email protected]>, Serge Rey <[email protected]"

from libpysal.weights.weights import W
from libpysal.weights.Distance import Kernel
from libpysal.weights.distance import Kernel
from libpysal.weights.util import get_points_array, comb
from libpysal.cg import Point, Ray, LineSegment
from libpysal.cg import get_angle_between, get_points_dist, get_segment_point_dist,\
Expand Down
2 changes: 1 addition & 1 deletion esda/tests/test_getisord.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy as np

from .. import getisord
from libpysal.weights.Distance import DistanceBand
from libpysal.weights.distance import DistanceBand
from libpysal.common import pandas

POINTS = [(10, 10), (20, 10), (40, 10), (15, 20), (30, 20), (30, 30)]
Expand Down
2 changes: 1 addition & 1 deletion esda/tests/test_smoothing.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import unittest
import libpysal
from libpysal.weights.Distance import KNN, Kernel
from libpysal.weights.distance import KNN, Kernel
from .. import smoothing as sm
import numpy as np
from libpysal.common import RTOL, ATOL, pandas
Expand Down
8 changes: 7 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

from distutils.command.build_py import build_py

# Get __version__ from giddy/__init__.py without importing the package
# __version__ has to be defined in the first line
with open('esda/__init__.py', 'r') as f:
exec(f.readline())


setup(name='esda', # name of package
version='1.0.1dev',
version=__version__,
description='Package with statistics for exploratory spatial data analysis',
url='https://github.com/pysal/esda',
maintainer='Sergio Rey',
Expand Down

0 comments on commit 7e435a4

Please sign in to comment.