Commit 5b063013 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

Merge branch 'master' of https://github.com/USGS-Astrogeology/plio

parents 4ddd8e2c eb46fd9e

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ install: 
  - conda config --add channels conda-forge

  - conda config --add channels jlaura

  - conda install -c conda-forge gdal h5py

  - conda install pandas sqlalchemy pyyaml

  - conda install pandas sqlalchemy pyyaml networkx

  - conda install -c jlaura pvl protobuf



  # Development installation

README.rst

+5 −4
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ Planetary Input / Output 
.. image:: https://travis-ci.org/USGS-Astrogeology/plio.svg?branch=master

   :target: https://travis-ci.org/USGS-Astrogeology/plio



.. image:: https://coveralls.io/repos/github/USGS-Astrogeology/plio/badge.svg?branch=master :target: https://coveralls.io/github/USGS-Astrogeology/plio?branch=master

.. image:: https://coveralls.io/repos/github/USGS-Astrogeology/plio/badge.svg?branch=master 

   :target: https://coveralls.io/github/USGS-Astrogeology/plio?branch=master



.. image:: https://readthedocs.org/projects/plio/badge/?version=latest

   :target: http://plio.readthedocs.io/en/latest/?badge=latest

appveyor.yml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 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

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

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



    # Development installation

conda/build.sh

deleted100755 → 0
+0 −2
Original line number Diff line number Diff line 
#!/bin/bash

$PYTHON setup.py install

conda/meta.yaml

+19 −6
Original line number Diff line number Diff line
@@ -3,15 +3,21 @@ package: 
  version: 0.1.0



source:

  git_url: https://github.com/USGS-Astrogeology/plio.git

  path: ../



build:

  number: 0

  skip: true  #[win]

  script: python setup.py install --single-version-externally-managed --record=record.txt



requirements:

  build:

    - python

    - setuptools

    - numpy

    - pvl

    - protobuf 3.0.0b2

    - gdal >=2

    - gdal

    - icu

    - h5py

    - pandas
@@ -19,14 +25,21 @@ requirements: 
    - pyyaml

  run:

    - python

    - setuptools

    - numpy

    - pvl

    - protobuf 3.0.0b2

    - gdal >=2

    - gdal

    - icu

    - h5py

    - pandas

    - sqlalchemy

    - pyyaml



test:

  imports:

    - plio



about:

  home: http://github.com/USGS-Astrogeology/plio

  license: Public Domain