Skip to content

Commit

Permalink
Fix Travis-CI
Browse files Browse the repository at this point in the history
  • Loading branch information
ocefpaf committed Nov 15, 2015
1 parent f6addf0 commit 06730fe
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 29 deletions.
44 changes: 17 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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

17 changes: 15 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
from __future__ import with_statement
import os
import sys

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:
Expand All @@ -24,7 +37,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',
Expand Down

0 comments on commit 06730fe

Please sign in to comment.