Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # Changelog
vecnet · Apr 26, 2018 · d324f53 · d324f53
2 parents df27bd7 + 307cac6
commit d324f53
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/.gitattribute b/.gitattribute
@@ -1 +1,2 @@
-om_expand text eol=lf
+om_expand text eol=lf
+test.sh text eol=lf
diff --git a/Changelog b/Changelog
@@ -1,12 +1,10 @@
 =========
 Changelog
 =========
-New
-*
 
-0.9.4 2018-04-24
-* [*] Reverted changes made in 0.9.5
+0.9.5 2018-04-14
 * [*] Added six as a dependency
+* [*] Reverted changes made in 0.9.4. Web interface needs a fix instead
 
 0.9.4 2018-04-08
 * [*] Fixed exception when survey timestamps are float (e.g. 730.0)

diff --git a/test.sh b/test.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+git update
+
+# Python 2
+mkvirtualenv om --python `which python2`
+python setup.py test
+python setup.py install
+deactivate
+rmvirtualenv om
+
+# Python3
+mkvirtualenv om --python `which python3`
+python setup.py test
+python setup.py install
+deactivate
+rmvirtualenv om