Merge branch 'master' into single-shortest-path

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,33 @@
+If you encounter a bug in Pandana please: 1) first search the previously opened issues to see if the problem has already been reported; 2) If not, fill in the template below and tag with the appropriate `Type` label. You can delete any sections that do not apply.
+
+#### Description of the bug
+
+
+
+
+#### Network data (optional) 
+If the issue is related to specific network data please provide a link to download the data or the function used to download the data.
+
+
+#### Environment 
+
+- Operating system:
+
+- Python version:
+
+- Pandana version:
+
+- Pandana required packages versions (optional):
+
+
+#### Paste the code that reproduces the issue here:
+
+```python
+# place code here
+```
+
+
+#### Paste the error message (if applicable):
+```python
+# place error message here
+```

.gitignore

@@ -55,3 +55,9 @@ coverage.xml
 
 # Sphinx documentation
 docs/_build/
+
+# OSMnet logs
+logs
+
+# Example data
+examples/data

.travis.yml

@@ -2,6 +2,7 @@ language: python
 sudo: false
 python:
 - '2.7'
+- '3.5'
 install:
 - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
     wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
@@ -17,10 +18,10 @@ install:
 - |
   conda create -q -c synthicity -n test-environment python=$TRAVIS_PYTHON_VERSION basemap matplotlib numpy pandas pip pytables requests
 - source activate test-environment
-- pip install pytest-cov coveralls pep8
+- pip install pytest-cov coveralls pycodestyle osmnet
 - python setup.py install
 script:
-- pep8 pandana
+- pycodestyle pandana
 - python setup.py test --pytest-args "--cov pandana --cov-report term-missing"
 after_success:
 - coveralls

LICENSE

@@ -1,7 +1,8 @@
 GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) Autodesk
+ Copyright (C) UrbanSim Inc.
+
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

README.rst

@@ -9,8 +9,6 @@ Pandana
    :alt: Coverage Status
    :target: https://coveralls.io/r/UDST/pandana
 
-A nice slideshow showing example code is available
-`here <http://bit.ly/1tivyjw>`__.
 
 In this case, a picture is worth a thousand words. The image below shows
 the distance to the *2nd* nearest restaurant (rendered by matplotlib)
@@ -40,8 +38,8 @@ queries are a more accurate representation of how people interact with
 their environment.
 
 We look forward to creative uses of a general library like this - please
-let us know when you think you have a great use case with the hashtag
-``#udst``.
+let us know if you think you have a great use case by tweeting us at
+``@urbansim`` or post on the UrbanSim `forum`_.
 
 Docs
 ----
@@ -56,17 +54,26 @@ Pandana is also available.
 Acknowledgments
 ---------------
 
-None of this would be possible without the help of Dennis Luxen (now at
-MapBox) and his OSRM (https://github.com/DennisOSRM/Project-OSRM). Thank
-you Dennis!
+None of this would be possible without the help of Dennis Luxen and
+his OSRM (https://github.com/DennisOSRM/Project-OSRM). Thank you Dennis!
 
 Nearest neighbor queries are performed with the fastest k-d tree around,
 i.e. ANN (http://www.cs.umd.edu/~mount/ANN/).
 
 Academic Literature
 -------------------
 
-I'm currently working on getting a `complete description of the
-methodology <https://github.com/fscottfoti/dissertation/blob/master/networks/Foti%20and%20Waddell%20-%20Accessibility%20Framework.pdf?raw=true>`__
-published in an academic journal. Please cite this paper when referring
+A `complete description of the
+methodology <http://onlinepubs.trb.org/onlinepubs/conferences/2012/4thITM/Papers-A/0117-000062.pdf>`__
+was presented at the Transportation Research Board Annual Conference in 2012. Please cite this paper when referring
 to the methodology implemented by this library.
+
+Related UDST libraries
+----------------------
+
+-  `OSMnet`_
+-  `UrbanAccess`_
+
+.. _forum: http://discussion.urbansim.com/
+.. _OSMnet: https://github.com/udst/osmnet
+.. _UrbanAccess: https://github.com/UDST/urbanaccess

conftest.py

@@ -25,6 +25,6 @@
 if os.environ.get('TRAVIS') == 'true':
     num_networks_tested = 1
 else:
-    num_networks_tested = 5
+    num_networks_tested = 6
 
 pdna.reserve_num_graphs(num_networks_tested)