Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Travis-CI #49

Merged
merged 4 commits into from
Nov 17, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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'):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i've seen this pattern used somewhere else - can you explain what it's accomplishing and why it's better than the simpler import version?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pattern avoids importing the module before installing it. It does add some complexity, but it helps some packaging tools. For example: if this is not there we need to install all the dependencies at build time, which is not always desirable.

However, that is not essential and not the main point of this PR. I can remove that if you wish.

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