Skip to content

Commit 5167072

Browse files
committed
Merge branch 'release/0.2.0'
2 parents fdfabe4 + f5d53c9 commit 5167072

File tree

7 files changed

+285
-251
lines changed

7 files changed

+285
-251
lines changed

.travis.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: python
22
sudo: false
33
python:
44
- '2.7'
5+
- '3.5'
56

67
install:
78
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
@@ -14,15 +15,18 @@ install:
1415
- conda update -q conda
1516
- conda info -a
1617
- |
17-
conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pip numpy=1.11 pandas pytest matplotlib scipy statsmodels
18+
conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pip numpy pandas pytest matplotlib scipy statsmodels
1819
- source activate test-environment
1920
- conda list
20-
- pip install .
2121
- pip install https://github.com/UDST/orca/archive/master.zip
22-
- pip install urbansim pandana
23-
- git clone [email protected]:urbansim/urbansim_parcels.git
22+
- pip install https://github.com/pksohn/urbansim/archive/python3.zip
23+
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then pip install pandana; else
24+
pip install https://github.com/UDST/osmnet/archive/python3-support.zip &&
25+
pip install https://github.com/UDST/pandana/archive/python3-support.zip; fi
26+
- pip install .
27+
- cd .. && git clone [email protected]:urbansim/urbansim_parcels.git
2428
- pip install ./urbansim_parcels
2529

2630
script:
27-
- py.test
28-
- cd urbansim_parcels/sf_example; python simulate.py
31+
- cd "$TRAVIS_BUILD_DIR" && py.test
32+
- cd ../urbansim_parcels/sf_example && python simulate.py

developer/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = '0.2.0'

0 commit comments

Comments
 (0)