Skip to content

Commit

Permalink
Merge pull request #14 from ocefpaf/maintenance
Browse files Browse the repository at this point in the history
maintenance PR
  • Loading branch information
ocefpaf authored Feb 7, 2019
2 parents ed03a81 + 7da8d57 commit 1972e29
Show file tree
Hide file tree
Showing 17 changed files with 2,732 additions and 294 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ciso/_version.py export-subst
43 changes: 29 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
language: python
language: minimal

env:
- CONDA="python=2.7"
- CONDA="python=3.4"
- CONDA="python=3.5"
sudo: false

matrix:
fast_finish: true
include:
- name: "default"
env: PY=3.7
- name: "coding_standards"
env: PY=3.7

before_install:
- wget http://bit.ly/miniconda -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- conda update --yes conda
- travis_retry conda create --yes -n TEST $CONDA --file requirements.txt
- source activate TEST
- travis_retry conda install --yes pytest
- wget http://bit.ly/miniconda -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
- conda update conda --quiet
- conda config --add channels conda-forge --force
- conda create --name TEST python=$PY --file requirements.txt --file requirements-dev.txt
- source activate TEST

install:
- python setup.py sdist && version=$(python setup.py --version) && pushd dist && pip install --no-deps --force-reinstall ciso-${version}.tar.gz && popd

script:
- python setup.py build_ext -i
- python setup.py test
- if [[ $TRAVIS_JOB_NAME == "default" ]]; then
cp -r tests /tmp && cd /tmp ;
pytest -n 2 -rxs --cov=ciso tests ;
fi

- if [[ $TRAVIS_JOB_NAME == 'coding_standards' ]]; then
pytest --flake8 -m flake8 ;
fi
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ include README.rst
include *.txt
include ciso/_ciso.*
recursive-include ciso *.py
include versioneer.py
include ciso/_version.py
13 changes: 13 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,2 +1,15 @@
ciso
----

|PyPI| |Travis|

.. |PyPI| image:: https://img.shields.io/pypi/v/ciso.svg
:target: https://pypi.python.org/pypi/ciso
:alt: PyPI Package

.. |Travis| image:: https://travis-ci.org/ioos/ciso.svg?branch=master
:target: https://travis-ci.org/ioos/ciso
:alt: Travis Build Status


Fast cythonized code for iso-slices of ocean models properties
9 changes: 6 additions & 3 deletions ciso/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
__version__ = '0.0.1'

from .ciso import zslice

__all__ = ['zslice']
__all__ = ["zslice"]

from ._version import get_versions

__version__ = get_versions()["version"]
del get_versions
Loading

0 comments on commit 1972e29

Please sign in to comment.