Commit 4548c7e2 authored by jlaura's avatar jlaura Committed by GitHub
Browse files

Merge pull request #11 from jlaura/master 

MBR Computation
parents 1945670b 8658c606

.travis.yml

+3 −4
Original line number Diff line number Diff line
@@ -45,12 +45,11 @@ install: 
  - conda config --add channels jlaura

  - conda install python=$PYTHON_VERSION

  - conda install -c conda-forge gdal h5py

  - conda install pandas sqlalchemy pyyaml networkx

  - conda install pandas sqlalchemy pyyaml networkx affine

  - conda install -c jlaura pvl protobuf



  # Development installation

  - conda install nose coverage sh anaconda-client

  - pip install coveralls

  - conda install pytest  pytest-cov sh anaconda-client



  # Straight from the menpo team

  - if [["$TRAVIS_OS_NAME" == "osx"]]; then
@@ -62,7 +61,7 @@ install: 




script:

  - nosetests --with-coverage --cover-package=plio

  - pytest --cov=plio 

  # After test success, package and upload to Anaconda

  - ~/miniconda/bin/python condaci.py build ./conda

appveyor.yml

+4 −4
Original line number Diff line number Diff line
@@ -54,18 +54,18 @@ install: 
    - cmd: conda config --add channels conda-forge

    - cmd: conda config --add channels jlaura

    - cmd: conda install --yes -c conda-forge gdal h5py

    - cmd: conda install --yes pandas sqlalchemy pyyaml networkx

    - cmd: conda install --yes pandas sqlalchemy pyyaml networkx affine

    - cmd: conda install --yes -c jlaura protobuf pvl



    # Development installation

    - cmd: conda install --yes nose coverage

    - cmd: conda install --yes pytest pytest-cov

    - cmd: pip install coveralls



# Skip .NET project specific build phase.

build: off



test_script:

    - cmd: nosetests --with-coverage --cover-package=plio

    - cmd: pytest --cov=plio --ignore=plio/examples

    - "%CMD_IN_ENV% conda build conda --quiet"



deploy_script:

conda/meta.yaml

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ requirements: 
    - pandas

    - sqlalchemy

    - pyyaml

    - affine

    - networkx

  run:

    - python

    - setuptools
@@ -35,6 +37,8 @@ requirements: 
    - pandas

    - sqlalchemy

    - pyyaml

    - affine

    - networkx



test:

  imports:

plio/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ from . import io 
from . import date

from . import data

from . import examples

from . import geofuncs

from . import utils

plio/date/__init__.py

+2 −0
Original line number Diff line number Diff line 
from . import julian2ls

from . import julian2season