merged

.travis.yml

@@ -10,6 +10,7 @@ branches:
   only:
     - master
     - develop
+    - experimental
 
 -before_install:
   - sudo apt-get -qq -y update

Makefile

@@ -110,8 +110,10 @@ qgis2test: clean pep8 pylint dependency_test unwanted_strings run_data_audit tes
 
 quicktest: pep8 pylint dependency_test unwanted_strings run_data_audit test-translations test_suite_quick
 
+# you can pass an argument called PACKAGE to run only tests in that package
+# usage: make test_suite_quick PACKAGE=common
 test_suite_quick:
-	@-export PYTHONPATH=`pwd`:$(PYTHONPATH); nosetests -A 'not slow' -v safe --with-id
+	@-export PYTHONPATH=`pwd`:$(PYTHONPATH); nosetests -A 'not slow' -v safe/${PACKAGE} --with-id
 
 # Run pep8 style checking
 #http://pypi.python.org/pypi/pep8
@@ -173,7 +175,7 @@ testdata:
 	@echo "Updating inasafe_data - public test and demo data repository"
 	@echo "Update the hash to check out a specific data version        "
 	@echo "------------------------------------------------------------"
-	@scripts/update-test-data.sh b42e2449fc91dbd1b10a3dbb72c5ab424354f16b 2>&1 | tee tmp_warnings.txt; [ $${PIPESTATUS[0]} -eq 0 ] && rm -f tmp_warnings.txt || echo "Stored update warnings in tmp_warnings.txt";
+	@scripts/update-test-data.sh f29505f728ff31dcefa58c048138ea298bb9f332 2>&1 | tee tmp_warnings.txt; [ $${PIPESTATUS[0]} -eq 0 ] && rm -f tmp_warnings.txt || echo "Stored update warnings in tmp_warnings.txt";
 
 #check and show if there was an error retrieving the test data
 testdata_errorcheck:

README.md

@@ -1,6 +1,8 @@
 InaSAFE
 =======
 
+[![Join the chat at https://gitter.im/AIFDR/inasafe](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AIFDR/inasafe?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 [![Build Status](https://travis-ci.org/AIFDR/inasafe.svg?branch=develop)](https://travis-ci.org/AIFDR/inasafe)
 
 InaSAFE is free software that allows disaster managers to study realistic

bin/__init__.py

@@ -0,0 +1 @@
+__author__ = 'jannes'