Merge pull request #48 from UDST/dev

v0.2.0

.travis.yml

@@ -2,11 +2,15 @@ language: python
 sudo: false
 python:
 - '2.7'
+- '3.6'
+
+matrix:
+  allow_failures:
+  - python: '3.6'
+  fast_finish: true
 
 install:
-- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
-  -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-  -O miniconda.sh; fi
+- wget http://bit.ly/miniconda -O miniconda.sh
 - bash miniconda.sh -b -p $HOME/miniconda
 - export PATH="$HOME/miniconda/bin:$PATH"
 - hash -r
@@ -15,11 +19,9 @@ install:
 - conda info -a
 - conda config --add channels udst
 - conda config --add channels conda-forge
-- |
-  conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pip numpy=1.11 pandas pytest ipython-notebook pycodestyle matplotlib scikit-learn pyyaml basemap basemap-data-hires
-- source activate test-environment
+- conda create -q -n test-env python=$TRAVIS_PYTHON_VERSION pip numpy pandas pytest jupyter pycodestyle matplotlib scikit-learn pyyaml basemap basemap-data-hires pandana geopy osmnet
+- source activate test-env
 - conda list
-- pip install pandana==0.3.0 geopy osmnet
 - pip install .
 
 after_success:
@@ -32,9 +34,8 @@ script:
 - cd ../urbanaccess/tests/integration; python remove_nb_magic.py -in simple_example.py -out simple_example_clean.py
 - cd ../../../demo; python simple_example_clean.py
 - cd ../urbanaccess/tests/integration; python integration_madison.py
-- python integration_sandiego.py
-- python integration_gb.py && cd $TRAVIS_BUILD_DIR
+- python integration_sandiego.py && cd $TRAVIS_BUILD_DIR
 
 env:
   global:
-    secure: SW6dfeQen1oZUYa2pr/qMdJGDK5c3tIbJsF1POLSMtgpbYaRQvogCkCd7sFXiTkxTCaNnz/eQyT2nDyUZJyDmYpntZmRthuN1zDgNk8ziDpmy/PF1bD4eshDr3MeoI4HgNYryl5qD8brEP0up0P/rvaAMoi26w4eyk0r+sO3PDVF6Jy4MwTufY4a4B4qYpi7V8yhExExytshHOEjD8C2IqEQDkwyR9oto2Gx8EpoCJEvxETG+aqLw1xj2UnXnbWND10Ni6pkeRpjAHFv4qM0i35griG2RKu9075Dubz/6UPMvpIEy581Zx5cqaSuOSUzde1L172vLTgOH31lnFXe1flHau1wI2gxOiamSdlVTAnVtL5P1aEtm1L5FjBcPlIs9rHmNGnydByX1Qe16HRLUopgAVm+jLZqWxrlesC5ax3uJ6Q3g0ZyKfmTJ5uWDeRusMVZswBT3NJc0BhkHDq7tE+3fokBfFApJcQwoXIplvRwXPkGFtKnL2IgCMTrKbDzGEYfdm/v7eV2xYe5hrEUIC9cUhkC1Ns2azAERXSgWcyM7ciFH3r1Jz9ixT+fuw9bTXibqcMjAmxdcQAW9y/rIPRJ3GMSdT7WEzYX19naGr+oyKqVMgsHFQ+wL7U5iblAGIy8VLNpE7Aa67dyG6SVAPTGzp0RouYLY9LYiRIybrI=
+    secure: SW6dfeQen1oZUYa2pr/qMdJGDK5c3tIbJsF1POLSMtgpbYaRQvogCkCd7sFXiTkxTCaNnz/eQyT2nDyUZJyDmYpntZmRthuN1zDgNk8ziDpmy/PF1bD4eshDr3MeoI4HgNYryl5qD8brEP0up0P/rvaAMoi26w4eyk0r+sO3PDVF6Jy4MwTufY4a4B4qYpi7V8yhExExytshHOEjD8C2IqEQDkwyR9oto2Gx8EpoCJEvxETG+aqLw1xj2UnXnbWND10Ni6pkeRpjAHFv4qM0i35griG2RKu9075Dubz/6UPMvpIEy581Zx5cqaSuOSUzde1L172vLTgOH31lnFXe1flHau1wI2gxOiamSdlVTAnVtL5P1aEtm1L5FjBcPlIs9rHmNGnydByX1Qe16HRLUopgAVm+jLZqWxrlesC5ax3uJ6Q3g0ZyKfmTJ5uWDeRusMVZswBT3NJc0BhkHDq7tE+3fokBfFApJcQwoXIplvRwXPkGFtKnL2IgCMTrKbDzGEYfdm/v7eV2xYe5hrEUIC9cUhkC1Ns2azAERXSgWcyM7ciFH3r1Jz9ixT+fuw9bTXibqcMjAmxdcQAW9y/rIPRJ3GMSdT7WEzYX19naGr+oyKqVMgsHFQ+wL7U5iblAGIy8VLNpE7Aa67dyG6SVAPTGzp0RouYLY9LYiRIybrI=

HISTORY.rst

@@ -1,3 +1,15 @@
+v0.2.0
+======
+
+2018/11/02
+
+* Python 3 compatibility (preserving compatibility with Python 2)
+  * Updated demo for cross compatibility
+  * Added Python 3 to travis
+* Support latest version of Pandana v0.4.1 (preserving compatibility with prior versions)
+* Removed integration test using Great Britain dataset as data no longer available for download
+* Updated readme and docs
+
 v0.1.0
 ======
 

README.rst

@@ -46,16 +46,21 @@ Let us know what you are working on or if you think you have a great use
 case by tweeting us at ``@urbansim`` or post on the UrbanSim
 `forum <http://discussion.urbansim.com/>`__.
 
+Citation and academic literature
+--------------------------------
+
+To cite this tool and for a complete description of the UrbanAccess methodology see the paper below:
+
+`Samuel D. Blanchard and Paul Waddell. 2017. "UrbanAccess: Generalized Methodology for Measuring Regional Accessibility with an Integrated Pedestrian and Transit Network." Transportation Research Record: Journal of the Transportation Research Board. No. 2653. pp. 35–44. <http://trrjournalonline.trb.org/doi/pdf/10.3141/2653-05>`__
+
+For other related literature see `here <https://udst.github.io/urbanaccess/introduction.html#citation-and-academic-literature>`__.
+
 Current status
 --------------
 
-UrbanAccess is currently in a alpha release and only compatible with
-Python 2.x. Further code refinements are expected.
-
 *Forthcoming improvements:*
 
 - Unit tests
-- Python 3
 
 Reporting bugs
 --------------
@@ -77,7 +82,9 @@ Install the latest release
 
 conda
 ~~~~~~
-conda installation is forthcoming.
+UrbanAccess is available on conda and can be installed with::
+
+    conda install -c udst urbanaccess
 
 pip
 ~~~~~~
@@ -88,7 +95,7 @@ UrbanAccess is available on PyPI and can be installed with::
 Development Installation
 ------------------------
 
-UrbanAccess is currently in a alpha release and further code refinements are expected. As such, it is suggested to install using the ``develop`` command rather than ``install``. Make sure you are using the latest version of the code base by using git's ``git pull`` inside the cloned repository.
+Developers contributing code can install using the ``develop`` command rather than ``install``. Make sure you are using the latest version of the codebase by using git's ``git pull`` inside the cloned repository.
 
 To install UrbanAccess follow these steps:
 
@@ -117,15 +124,6 @@ UrbanAccess are: ``stop_times``, ``stops``, ``routes``, ``calendar``,
 and ``trips`` however if there is no ``calendar``, ``calendar_dates``
 can be used as a replacement.
 
-Citation and academic literature
---------------------------------
-
-To cite this tool and for a complete description of the UrbanAccess methodology see the paper below:
-
-`Samuel D. Blanchard and Paul Waddell. 2017. "UrbanAccess: Generalized Methodology for Measuring Regional Accessibility with an Integrated Pedestrian and Transit Network." Transportation Research Record: Journal of the Transportation Research Board. No. 2653. pp. 35–44. <http://trrjournalonline.trb.org/doi/pdf/10.3141/2653-05>`__
-
-For other related literature see `here <https://udst.github.io/urbanaccess/introduction.html#citation-and-academic-literature>`__.
-
 Related UDST libraries
 ----------------------