Skip to content

Commit

Permalink
Merge pull request #17 from lixun910/master
Browse files Browse the repository at this point in the history
patch 0.0.8-1
  • Loading branch information
lixun910 authored Aug 6, 2021
2 parents 55fdca5 + 8aab00a commit df1d162
Show file tree
Hide file tree
Showing 17 changed files with 1,808 additions and 577 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/build-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Ubuntu and Mac builds

on: push

jobs:

build_and_publish:
strategy:
matrix:
os:
- ubuntu-latest
- macos-latest

runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Install pacakges
run: python3 -m pip install --upgrade --upgrade-strategy eager twine cibuildwheel

#- name: Build and Test
# run: |
# python3 setup.py build_ext --inplace
# python3 -m unittest discover -v -s tests -p "test_*.py"

- name: Build Wheels
run: |
python3 -m cibuildwheel --output-dir wheelhouse
python3 setup.py sdist
ls -lrt wheelhouse/*
- uses: actions/upload-artifact@v2
with:
name: pygeoda-${{ matrix.os }}
path: wheelhouse/

- name: Publish to Pypi
if: github.event_name == 'release' && github.event.action == 'created'
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python3 -m twine upload wheelhouse/*.whl
- name: Publish Source to Pypi
if: matrix.os == 'macos-latest' && github.event_name == 'release' && github.event.action == 'created'
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python3 -m twine upload dist/*.tar.gz
95 changes: 95 additions & 0 deletions .github/workflows/win-build-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# This is a basic workflow to help you get started with Actions

name: Windows builds

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
pull_request:
branches: [ master ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
windows_build:
runs-on: windows-latest
#if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"

strategy:
matrix:
msvc_arch:
- amd64
- win32

python_ver:
- 3.6
- 3.7
- 3.8
- 3.9

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Setup for Python 3.9
if: "contains(matrix.python_ver, '3.9')"
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{ matrix.msvc_arch }}
toolset: 14.2

- name: Setup for Python 3.6, 3.7, 3.8
if: "!contains(matrix.python_ver, '3.9')"
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{ matrix.msvc_arch }}
toolset: 14.1

- name: Setup Python Architecture x64
if: "contains(matrix.msvc_arch, 'amd64')"
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python_ver }}
architecture: 'x64'

- name: Setup Python Architecture x86
if: "!contains(matrix.msvc_arch, 'amd64')"
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python_ver }}
architecture: 'x86'

- name: Build and Test
shell: pwsh
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools wheel virtualenv twine
python -m virtualenv venv
venv\\Scripts\\activate
python setup.py build_ext --inplace
python -m unittest
- name: Build Wheels
shell: pwsh
run: |
venv\\Scripts\\activate
pip wheel -v -w wheelhouse --no-deps .
dir wheelhouse/*
- uses: actions/upload-artifact@v2
with:
name: pygeoda-${{ matrix.python_ver }}-${{ matrix.msvc_arch }}-win
path: wheelhouse/

- name: Publish to Pypi
if: github.event_name == 'release' && github.event.action == 'created'
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python -m twine upload wheelhouse/*.whl
35 changes: 0 additions & 35 deletions .travis.yml

This file was deleted.

15 changes: 10 additions & 5 deletions Development.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@ 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
python 3.5.0 msc 1900 visual c++ 2015 msvc14.0 (vs2015)
(NOTE: python3.5 will not be supported on PyPi after 0.0.8-1)

python 3.6.1 msc 1900 visual c++ 2015 (!!as conda-forge, msvc14.1 for py36) (vs2017)
python 3.7.0 msc 1914 visual c++ 2017 msvc14.1 (vs2017)
python 3.8.1 msc 1916 visual c++ 2017 msvc14.1 (vs2017)
python 3.9.1 msc 1928 visual c++ 2019 msvc14.2 (vs2019)

Pygeoda for Linux and Mac OSX is built using Travis (see .travis.yml)


## conda-forge

For conda-forge, the pygeoda PyPI package is used as the source. So, when
updating pygeoda PyPI package, the conda-forge package should be
automatically updated.
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# pygeoda

[![PyPI version](https://badge.fury.io/py/pygeoda.svg)](https://badge.fury.io/py/pygeoda)
[![Conda Version](https://img.shields.io/conda/vn/conda-forge/pygeoda.svg)](https://anaconda.org/conda-forge/pygeoda)
![PyPI - Downloads](https://img.shields.io/pypi/dm/pygeoda)
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/pygeoda/badges/version.svg)](https://anaconda.org/conda-forge/pygeoda)
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/pygeoda/badges/downloads.svg)](https://anaconda.org/conda-forge/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.
Expand Down
166 changes: 0 additions & 166 deletions appveyor.yml

This file was deleted.

Loading

0 comments on commit df1d162

Please sign in to comment.