Skip to content

Commit

Permalink
Merge pull request #14 from TaylorOshan/submodule
Browse files Browse the repository at this point in the history
Submodule
  • Loading branch information
TaylorOshan committed Nov 1, 2018
2 parents f538a30 + 73f0ea5 commit 5acea8a
Show file tree
Hide file tree
Showing 40 changed files with 2,437 additions and 1,005 deletions.
28 changes: 26 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
*.py[cod]
__pycache__
.pytest_cache
*.swp
*.pyc
.rope*
.idea/
notebooks/.ipynb_checkpoints/
.DS_Store
.ipynb_checkpoints/
*.bak
.eggs/
*.egg-info/

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
lib
lib64
_build
27 changes: 20 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ env:
- PYSAL_PLUS=false
- PYSAL_PLUS=true

matrix:
allow_failures:
- python: 3.5
env: PYSAL_PYPI=false
- python: 3.6
env: PYSAL_PYPI=false

before_install:
- wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
- chmod +x miniconda.sh
Expand All @@ -24,21 +31,27 @@ before_install:
install:
- conda install --yes pip
- conda install --yes --file requirements.txt;
- conda install --yes nose
- pip install libpysal
- pip install spreg
- pip install spglm
- pip install -r requirements_dev.txt
- pip install https://github.com/pysal/splot/archive/master.zip
- pip install -r requirements_tests.txt
- if "$PYSAL_PYPI"; then
echo 'testing pypi libpysal spreg spglm' && pip install libpysal spreg spglm;
else
echo 'testing git libpysal spreg';
git clone https://github.com/pysal/libpysal.git; cd libpysal; pip install .; cd ../;
git clone https://github.com/pysal/spreg.git; cd spreg; pip install .; cd ../;
git clone https://github.com/pysal/spglm.git; cd spglm; pip install .; cd ../;
fi;

script:
- python setup.py sdist >/dev/null
- nosetests --with-coverage --cover-package=spint;
- python setup.py install
- nosetests --verbose --with-coverage --cover-package=spint;

notifications:
email:
recipients:
- tayoshan@gmail.com
on_change: always
on_change: change
on_failure: always

after_success:
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include LICENSE.txt MANIFEST.in requirements_docs.txt requirements_tests.txt requirements.txt
24 changes: 24 additions & 0 deletions doc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
SPHINXPROJ = spint
SOURCEDIR = .
BUILDDIR = _build

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

clean:
rm -rf $(BUILDDIR)/*
rm -rf auto_examples/
Binary file added doc/_static/images/pysal_favicon.ico
Binary file not shown.
73 changes: 73 additions & 0 deletions doc/_static/pysal-styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/* Make thumbnails with equal heights */
@media only screen and (min-width : 481px) {
.row.equal-height {
display: flex;
flex-wrap: wrap;
}
.row.equal-height > [class*='col-'] {
display: flex;
flex-direction: column;
}
.row.equal-height.row:after,
.row.equal-height.row:before {
display: flex;
}

.row.equal-height > [class*='col-'] > .thumbnail,
.row.equal-height > [class*='col-'] > .thumbnail > .caption {
display: flex;
flex: 1 0 auto;
flex-direction: column;
}
.row.equal-height > [class*='col-'] > .thumbnail > .caption > .flex-text {
flex-grow: 1;
}
.row.equal-height > [class*='col-'] > .thumbnail > img {
width: 100%;
height: 200px; /* force image's height */

/* force image fit inside it's "box" */
-webkit-object-fit: cover;
-moz-object-fit: cover;
-ms-object-fit: cover;
-o-object-fit: cover;
object-fit: cover;
}
}

.row.extra-bottom-padding{
margin-bottom: 20px;
}


.topnavicons {
margin-left: 10% !important;
}

.topnavicons li {
margin-left: 0px !important;
min-width: 100px;
text-align: center;
}

.topnavicons .thumbnail {
margin-right: 10px;
border: none;
box-shadow: none;
text-align: center;
font-size: 85%;
font-weight: bold;
line-height: 10px;
height: 100px;
}

.topnavicons .thumbnail img {
display: block;
margin-left: auto;
margin-right: auto;
}


/* Table with a scrollbar */
.bodycontainer { max-height: 600px; width: 100%; margin: 0; overflow-y: auto; }
.table-scrollable { margin: 0; padding: 0; }
20 changes: 20 additions & 0 deletions doc/_static/references.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%% This BibTeX bibliography file was created using BibDesk.
%% http://bibdesk.sourceforge.net/
%% Created for Wei Kang at 2018-08-05 16:12:26 -0700
%% Saved with string encoding Unicode (UTF-8)
@book{Press2007,
Address = {Cambridge},
Author = {Press, William H and Teukolsky, Saul A and Vetterling, William T and Flannery, Brian P},
Date-Added = {2018-06-12 22:53:57 +0000},
Date-Modified = {2018-06-12 22:54:05 +0000},
Edition = {3rd},
Keywords = {rank.py},
Publisher = {Cambridge Univ Pr},
Title = {Numerical recipes: the art of scientific computing},
Year = {2007}}
30 changes: 30 additions & 0 deletions doc/api.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.. _api_ref:

.. currentmodule:: spint

API reference
=============

.. _spint_api:

Gravity-type spatial interaction models
----------------------------------------

.. autosummary::
:toctree: generated/

spint.gravity.BaseGravity
spint.gravity.Gravity
spint.gravity.Production
spint.gravity.Attraction
spint.gravity.Doubly

Tests for overdispersion
-------------------------

.. autosummary::
:toctree: generated/

spint.dispersion.alpha_disp
spint.dispersion.phi_disp

0 comments on commit 5acea8a

Please sign in to comment.