Skip to content

Commit

Permalink
Merge pull request #147 from knaaptime/crs
Browse files Browse the repository at this point in the history
  • Loading branch information
knaaptime authored Jul 1, 2020
2 parents 3c59c8e + fb1e06e commit 791694c
Show file tree
Hide file tree
Showing 591 changed files with 120,759 additions and 775 deletions.
23 changes: 23 additions & 0 deletions .ci/36.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: test
channels:
- conda-forge
dependencies:
- python=3.6
- pandas
- geopandas>=0.7
- matplotlib
- scikit-learn
- seaborn
- numpy
- scipy
- pip
- libpysal
- coveralls
- descartes
- pytest
- pytest-mpl
- pytest-cov
- twine
- tqdm
- pandana
- urbanaccess
23 changes: 23 additions & 0 deletions .ci/37.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: test
channels:
- conda-forge
dependencies:
- python=3.7
- pandas
- geopandas>=0.7
- matplotlib
- scikit-learn
- seaborn
- numpy
- scipy
- pip
- libpysal
- coveralls
- descartes
- pytest
- pytest-mpl
- pytest-cov
- twine
- tqdm
- pandana
- urbanaccess
23 changes: 23 additions & 0 deletions .ci/38.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: test
channels:
- conda-forge
dependencies:
- python=3.8
- pandas
- geopandas>=0.7
- matplotlib
- scikit-learn
- seaborn
- numpy
- scipy
- pip
- libpysal
- descartes
- coveralls
- pytest
- pytest-mpl
- pytest-cov
- twine
- tqdm
- pandana
- urbanaccess
49 changes: 49 additions & 0 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Unit Tests
on:
push:
branches:
- '*'
pull_request:
branches:
- '*'

jobs:
unittests:
name: CI (${{ matrix.os }}-${{ matrix.environment-file }})
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
timeout-minutes: 90
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
environment-file: [.ci/36.yml, .ci/37.yml, .ci/38.yml]
experimental: [false]
steps:
- uses: actions/checkout@v2
- uses: goanpeca/setup-miniconda@v1
with:
miniconda-version: 'latest'
auto-update-conda: true
auto-activate-base: false
environment-file: ${{ matrix.environment-file }}
activate-environment: test
- shell: bash -l {0}
run: conda info --all
- shell: bash -l {0}
run: conda list
- shell: bash -l {0}
run: conda config --show-sources
- shell: bash -l {0}
run: conda config --show
- shell: bash -l {0}
run: pip install -e . --no-deps --force-reinstall
- name: Pytest
shell: bash -l {0}
run: |
pytest -v segregation --cov=segregation --cov-report=xml
- name: codecov (${{ matrix.os }}, ${{ matrix.environment-file }})
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
name: segregation-codecov
63 changes: 63 additions & 0 deletions .github/workflows/upload_package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@

name: Release Package

on:
push:
# Sequence of patterns matched against refs/tags
tags:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine jupyter urllib3 pandas pyyaml
python setup.py sdist bdist_wheel
- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.pypi_password }}
- name: Run Changelog
run: |
jupyter nbconvert --to notebook --execute --inplace --ExecutePreprocessor.timeout=-1 --ExecutePreprocessor.kernel_name=python3 tools/gitcount.ipynb
- name: Cat Changelog
uses: pCYSl5EDgo/cat@master
id: changetxt
with:
path: ./tools/changelog.md
env:
TEXT: ${{ steps.changetxt.outputs.text }}
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
body: ${{ steps.changetxt.outputs.text }}
draft: false
prerelease: false
- name: Get Asset name
run: |
export PKG=$(ls dist/)
set -- $PKG
echo "::set-env name=whl_path::$1"
- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: dist/${{ env.whl_path }}
asset_name: ${{ env.whl_path }}
asset_content_type: application/zip
66 changes: 0 additions & 66 deletions .travis.yml

This file was deleted.

6 changes: 0 additions & 6 deletions doc/generated/segregation.network.calc_access.rst

This file was deleted.

6 changes: 0 additions & 6 deletions doc/generated/segregation.network.get_network.rst

This file was deleted.

16 changes: 0 additions & 16 deletions doc/generated/segregation.spatial.SpatialInformationTheory.rst

This file was deleted.

This file was deleted.

4 changes: 4 additions & 0 deletions docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 1abb69093b22996e21358efdfe7002eb
tags: 645f666f9bcd5a90fca523b33c5a78b7
Loading

0 comments on commit 791694c

Please sign in to comment.