Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pksohn committed Mar 29, 2017
2 parents fdfabe4 + f5d53c9 commit 5167072
Show file tree
Hide file tree
Showing 7 changed files with 285 additions and 251 deletions.
16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,15 +15,18 @@ install:
- conda update -q conda
- conda info -a
- |
conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pip numpy=1.11 pandas pytest matplotlib scipy statsmodels
conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pip numpy pandas pytest matplotlib scipy statsmodels
- source activate test-environment
- conda list
- pip install .
- pip install https://github.com/UDST/orca/archive/master.zip
- pip install urbansim pandana
- git clone [email protected]:urbansim/urbansim_parcels.git
- pip install https://github.com/pksohn/urbansim/archive/python3.zip
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then pip install pandana; else
pip install https://github.com/UDST/osmnet/archive/python3-support.zip &&
pip install https://github.com/UDST/pandana/archive/python3-support.zip; fi
- pip install .
- cd .. && git clone [email protected]:urbansim/urbansim_parcels.git
- pip install ./urbansim_parcels

script:
- py.test
- cd urbansim_parcels/sf_example; python simulate.py
- cd "$TRAVIS_BUILD_DIR" && py.test
- cd ../urbansim_parcels/sf_example && python simulate.py
1 change: 1 addition & 0 deletions developer/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = '0.2.0'
Loading

0 comments on commit 5167072

Please sign in to comment.