Commit 97c0ad20 authored by Tyler Thatcher's avatar Tyler Thatcher Committed by GitHub
Browse files

Merge pull request #262 from jlaura/master

Fixes serialization and refactors to properties
parents 83625255 d2f94377
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -81,3 +81,10 @@ target/
*.cnet
*.lis
*.list

# Pytest
lastfailed
nodeids

# VSCode
launch.json
 No newline at end of file
+4 −12
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ branches:
only:
  - dev

env:
  global:
    - BINSTAR_USER: jlaura

os:
  - linux
  - osx
@@ -16,6 +12,7 @@ os:
env:
  - PYTHON_VERSION=3.5
  - PYTHON_VERSION=3.6
  - PYTHON_VERSION=3.7

before_install:
  # We do this conditionally because it saves us some downloading if the
@@ -37,15 +34,10 @@ before_install:
  - source activate test

  # Install dependencies
  - conda config --add channels menpo
  - conda config --add channels usgs-astrogeology
  - conda config --add channels conda-forge
  - conda config --set ssl_verify false
  - conda install -c conda-forge vlfeat scipy networkx numexpr cython matplotlib pillow runipy geopandas opencv numpy libgdal gdal scikit-image
  - conda install -c menpo cyvlfeat
  - conda install -c usgs-astrogeology plio
  
  # Development installation
  - conda install -c conda-forge pytest pytest-cov coverage anaconda-client
  - pip install coveralls
  - conda env update -n test -f environment.yml

script:
  - pytest autocnet tests

HISTORY.rst

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line
.. :changelog:

Changelog
---------

0.1.0 (2015-01-11)


* First release on PyPI.

Makefile

deleted100644 → 0
+0 −84
Original line number Diff line number Diff line
.PHONY: clean-pyc clean-build docs clean
define BROWSER_PYSCRIPT
import os, webbrowser, sys
try:
	from urllib import pathname2url
except:
	from urllib.request import pathname2url

webbrowser.open("file://" + pathname2url(os.path.abspath(sys.argv[1])))
endef
export BROWSER_PYSCRIPT
BROWSER := python -c "$$BROWSER_PYSCRIPT"

help:
	@echo "clean - remove all build, test, coverage and Python artifacts"
	@echo "clean-build - remove build artifacts"
	@echo "clean-pyc - remove Python file artifacts"
	@echo "clean-test - remove test and coverage artifacts"
	@echo "lint - check style with flake8"
	@echo "test - run tests quickly with the default Python"
	@echo "test-all - run tests on every Python version with tox"
	@echo "coverage - check code coverage quickly with the default Python"
	@echo "docs - generate Sphinx HTML documentation, including API docs"
	@echo "release - package and upload a release"
	@echo "dist - package"
	@echo "install - install the package to the active Python's site-packages"

clean: clean-build clean-pyc clean-test

clean-build:
	rm -fr build/
	rm -fr dist/
	rm -fr .eggs/
	find . -name '*.egg-info' -exec rm -fr {} +
	find . -name '*.egg' -exec rm -f {} +

clean-pyc:
	find . -name '*.pyc' -exec rm -f {} +
	find . -name '*.pyo' -exec rm -f {} +
	find . -name '*~' -exec rm -f {} +
	find . -name '__pycache__' -exec rm -fr {} +

clean-test:
	rm -fr .tox/
	rm -f .coverage
	rm -fr htmlcov/

lint:
	flake8 autocnet tests

test:
	python setup.py test

test-all:
	tox

coverage:
	coverage run --source autocnet setup.py test
	coverage report -m
	coverage html
	$(BROWSER) htmlcov/index.html

docs:
	rm -f docs/autocnet.rst
	rm -f docs/modules.rst
	sphinx-apidoc -o docs/ autocnet
	$(MAKE) -C docs clean
	$(MAKE) -C docs html
	$(BROWSER) docs/_build/html/index.html

servedocs: docs
	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .

release: clean
	python setup.py sdist upload
	python setup.py bdist_wheel upload

dist: clean
	python setup.py sdist
	python setup.py bdist_wheel
	ls -l dist

install: clean
	python setup.py install
+2 −1
Original line number Diff line number Diff line
from unittest.mock import MagicMock
"""from unittest.mock import MagicMock
import geopandas as gpd
import pandas as pd
from shapely.geometry import Polygon
@@ -66,3 +66,4 @@ def test_potential_overlap(controlnetwork, candidategraph):
                                 (1,), (1,),
                                 (0,), (0,)],
                                 index=[6,7,8,9,10,11]))
"""
 No newline at end of file
Loading