From 8426044df4093c556374e27c7bca9e3f5d35244e Mon Sep 17 00:00:00 2001
From: ocefpaf <ocefpaf@gmail.com>
Date: Sun, 15 Nov 2015 12:04:38 -0300
Subject: [PATCH] Fix Travis-CI

---
 .travis.yml | 44 +++++++++++++++++---------------------------
 setup.py    | 16 ++++++++++++++--
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 217cd75..4e7a7aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,23 @@
+sudo: false
 language: python
-python:
-  - "2.7"
+
+env:
+    - CONDA="python=2.7"
+    - CONDA="python=3.4"
+    - CONDA="python=3.5"
+
 before_install:
-  # Install miniconda
-  # -----------------
-  - export CONDA_BASE=http://repo.continuum.io/miniconda/Miniconda
-  - if [[ "$TRAVIS_PYTHON_VERSION" == 2* ]]; then
-      wget ${CONDA_BASE}-3.7.0-Linux-x86_64.sh -O miniconda.sh;
-    else
-      wget ${CONDA_BASE}3-3.7.0-Linux-x86_64.sh -O miniconda.sh;
-    fi
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
+    - wget http://bit.ly/miniconda -O miniconda.sh
+    - bash miniconda.sh -b -p $HOME/miniconda
+    - export PATH="$HOME/miniconda/bin:$PATH"
+    - conda update --all --yes
+    - conda config --add channels ioos -f
+    - travis_retry conda create --yes -n test $CONDA --file requirements.txt
+    - source activate test
+    - travis_retry conda install --yes pytest
 
-  # Create the basic testing environment
-  # ------------------------------------
-  - conda config --set always_yes yes --set changeps1 no
-  - conda config --set show_channel_urls True
-  - conda update --quiet conda
-  - ENV_NAME='test-environment'
-  - conda create --quiet -n $ENV_NAME python=$TRAVIS_PYTHON_VERSION
-  - source activate $ENV_NAME
+script:
+    - py.test -vv
 
-install:
-  # Customise the testing environment
-  # ---------------------------------
-  - conda install --channel https://conda.binstar.org/rsignell --file requirements.txt
-  - conda install pytest
-script: py.test -vv
 notifications:
     flowdock: 2dd835dfbdbc64986ba043fffa654836,1d5af475ae38ec1d874c752c23558d2d
-
diff --git a/setup.py b/setup.py
index cedc030..966894c 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,19 @@
 from setuptools import setup, find_packages
 from setuptools.command.test import test as TestCommand
 
-from pyoos import __version__
+def extract_version(module='pyoos'):
+    version = None
+    fdir = os.path.dirname(__file__)
+    fnme = os.path.join(fdir, module, '__init__.py')
+    with open(fnme) as fd:
+        for line in fd:
+            if (line.startswith('__version__')):
+                _, version = line.split('=')
+                # Remove quotation characters.
+                version = version.strip()[1:-1]
+                break
+    return version
+
 
 def readme():
     with open('README.md') as f:
@@ -24,7 +36,7 @@ def run_tests(self):
 
 setup(
     name                = "pyoos",
-    version             = __version__,
+    version             = extract_version(),
     description         = "A Python library for collecting Met/Ocean observations",
     long_description    = readme(),
     license             = 'GPLv3',