Merge pull request #16 from lixun910/master

release 0.0.8

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-  
+
 jobs:
   include:
     # perform a linux build
@@ -21,6 +21,8 @@ install:
 script:
   # build the wheels, put them into './wheelhouse'
   - python3 -m cibuildwheel --output-dir wheelhouse
+  #- python3 -m pip wheel -v -w wheelhouse --no-deps .
+  #- auditwheel repair wheelhouse/pygeoda*whl -w output/
   - python3 setup.py sdist
 
 after_success:

Development.md

@@ -5,6 +5,14 @@
 
 Pygeoda for windows is built using Appveyor (see: appveyor.yml)
 
+NOTE:
+
+python 3.5.0 msc 1900 visual c++ 2015  msvc14.0
+python 3.6.1 msc 1900 visual c++ 2015  (!!as conda-forge, msvc14.1 for py36)
+python 3.7.0 msc 1914 visual c++ 2017  msvc14.1
+python 3.8.1 msc 1916 visual c++ 2017
+python 3.9.1 msc 1928 visual c++ 2019  msvc14.2
+
 Pygeoda for Linux and Mac OSX is built using Travis (see .travis.yml)
 
 For conda-forge, the pygeoda PyPI package is used as the source. So, when 

README.md

@@ -4,7 +4,7 @@
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/pygeoda)
 
 
-pygeoda is a python library for spatial data analysis based on libgeoda and GeoDa. It provides spatial data analysis functionalities including Exploratory Spatial Data Analysis, Spatial Cluster Detection and Clustering Analysis, Regionalization, etc. based on the C++ source code of GeoDa, which is an open-source software tool that serves as an introduction to spatial data analysis. The GeoDa software and its documentation are available at https://geodacenter.github.io.
+pygeoda is a python library for spatial data analysis based on libgeoda and GeoDa. It provides spatial data analysis functionalities including Exploratory Spatial Data Analysis, Spatial Cluster Detection and Clustering Analysis, Regionalization, etc. based on the C++ source code of GeoDa, which is an open-source software tool that serves as an introduction to spatial data analysis. 
 
 ### Installation
 
@@ -14,9 +14,7 @@ pygeoda is a python library for spatial data analysis based on libgeoda and GeoD
 pip install pygeoda
 ```
 
-#### Install from source
-
-You can install pygeoda from source by using the following command in a terminal:
+It will be in conda-forge soon. You can also install pygeoda from source by using the following command in a terminal:
 
 ```
 pip install git+https://github.com/geodacenter/pygeoda    
@@ -120,3 +118,12 @@ lisa = pygeoda.local_moran(w, gda['Crm_prs'])
   * Demean standardize
   * Standardize data (Z)
   * Median absolute deviation
+
+
+## Authors
+
+Xun Li and Luc Anselin
+
+## Contributors
+
+Guanpeng Dong; Yong Liu; Hang Zhang; Yeqing Han;

appveyor.yml

@@ -1,6 +1,16 @@
 image:
   - Visual Studio 2019
   - Visual Studio 2017
+  - Visual Studio 2015
+
+# Start builds on tags only (GitHub and BitBucket)
+skip_non_tags: false
+
+# Do not build feature branch with open Pull Requests
+skip_branch_with_pr: true
+
+# Maximum number of concurrent jobs for the project
+max_jobs: 1
 
 environment:
   global:
@@ -58,22 +68,42 @@ matrix:
       PYTHON: "C:\\Python35"
     - image: Visual Studio 2019
       PYTHON: "C:\\Python35-x64"
+    - image: Visual Studio 2017
+      PYTHON: "C:\\Python35"
+    - image: Visual Studio 2017
+      PYTHON: "C:\\Python35-x64"
     - image: Visual Studio 2019
       PYTHON: "C:\\Python36"
     - image: Visual Studio 2019
       PYTHON: "C:\\Python36-x64"
+    - image: Visual Studio 2015
+      PYTHON: "C:\\Python36"
+    - image: Visual Studio 2015
+      PYTHON: "C:\\Python36-x64"
     - image: Visual Studio 2019
       PYTHON: "C:\\Python37"
     - image: Visual Studio 2019
       PYTHON: "C:\\Python37-x64"
+    - image: Visual Studio 2015
+      PYTHON: "C:\\Python37"
+    - image: Visual Studio 2015
+      PYTHON: "C:\\Python37-x64"
     - image: Visual Studio 2019
       PYTHON: "C:\\Python38"
     - image: Visual Studio 2019
       PYTHON: "C:\\Python38-x64"
+    - image: Visual Studio 2015
+      PYTHON: "C:\\Python38"
+    - image: Visual Studio 2015
+      PYTHON: "C:\\Python38-x64"
     - image: Visual Studio 2017
       PYTHON: "C:\\Python39"
     - image: Visual Studio 2017
       PYTHON: "C:\\Python39-x64"
+    - image: Visual Studio 2015
+      PYTHON: "C:\\Python39"
+    - image: Visual Studio 2015
+      PYTHON: "C:\\Python39-x64"
 
 install:
   # note: VS 2010 has stdint.h bundled so simply copy it. Cython should not

pygeoda/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.4"
+__version__ = "0.0.8"
 # __version__ has to be define in the first line
 
 __author__ = "Xun Li <lixun910@gmail.com>, "

setup.py

@@ -75,14 +75,10 @@
 else:
     EXTRA_COMPILE_ARGS = [
         '-w',
+        '-std=c++14',
         '-fvisibility=hidden',
         '-D__USE_PTHREAD__' # use pthread!!! on *nix
     ]
-    if OS_NAME == 'osx':
-        EXTRA_COMPILE_ARGS += [
-        ]
-
-
 
 ###########################################################
 #  Link args
@@ -109,13 +105,13 @@
     BOOST_ARC = 'x32' if OS_NAME == 'win32' else 'x64'
     pyversion = sys.version[:3]
     MSVC_VER = ''
-    BOOST_VER = '1_69'
-    if pyversion in ['2.6', '2.7', '3.0', '3.1', '3.2']:
-        MSVC_VER = 'vc90'
-    elif pyversion in ['3.3', '3.4']:
-        MSVC_VER = 'vc100'
-    elif pyversion in ['3.5', '3.6', '3.7', '3.8', '3.9']:
+    BOOST_VER = '1_75'
+    if pyversion in ['3.5']:
+        MSVC_VER = 'vc140'
+    elif pyversion in ['3.6', '3.7', '3.8']:
         MSVC_VER = 'vc141'
+    elif pyversion in ['3.9']:
+        MSVC_VER = 'vc142'
 
 
     EXTRA_OBJECTS = [
@@ -141,11 +137,11 @@
     './' + LIBGEODA_SRC + '/GenGeomAlgs.cpp',
     './' + LIBGEODA_SRC + '/GenUtils.cpp',
     './' + LIBGEODA_SRC + '/SpatialIndAlgs.cpp',
-    './' + LIBGEODA_SRC + '/pg/geoms.c',
-    './' + LIBGEODA_SRC + '/pg/utils.c',
-    './' + LIBGEODA_SRC + '/shapelib/shpopen.c',
-    './' + LIBGEODA_SRC + '/shapelib/dbfopen.c',
-    './' + LIBGEODA_SRC + '/shapelib/safileio.c',
+    './' + LIBGEODA_SRC + '/pg/geoms.cpp',
+    './' + LIBGEODA_SRC + '/pg/utils.cpp',
+    './' + LIBGEODA_SRC + '/shapelib/shpopen.cpp',
+    './' + LIBGEODA_SRC + '/shapelib/dbfopen.cpp',
+    './' + LIBGEODA_SRC + '/shapelib/safileio.cpp',
     './' + LIBGEODA_SRC + '/weights/PointsToContigWeights.cpp',
     './' + LIBGEODA_SRC + '/weights/PolysToContigWeights.cpp',
     './' + LIBGEODA_SRC + '/weights/GalWeight.cpp',
@@ -206,14 +202,13 @@
                         extra_objects=EXTRA_OBJECTS),]
 
 setup (name = 'pygeoda',
-       version = '0.0.7.1',
+       version = '0.0.8',
        author = "Xun Li",
        author_email = "lixun910@gmail.com",
        url = "https://github.com/geodacenter/pygeoda",
        description = """pygeoda is a python library for spatial data analysis based on GeoDa and libgeoda.""",
        ext_modules = extensions,
        package_data = package_data,
-       #cmdclass = {"develop": update_submodules},
        include_package_data = include_package_data,
        packages=['pygeoda','pygeoda.weights','pygeoda.sa','pygeoda.clustering', 'pygeoda.classify', 'pygeoda.data']
       )