Commit 4a0e85fc authored by Jay's avatar Jay
Browse files

Updates for successful local conda build

parent b9468a8e

.travis.yml

+5 −2
Original line number Diff line number Diff line
@@ -26,11 +26,14 @@ os: 
    - conda info -a

    # Create the env

    - conda create -q -n test python=$PYTHON_VERSION

    - source activate test

    - conda env update -n test -f environment.yml



script:

  - pytest knoten



after_success:

  - coveralls

  - conda deactivate

  - conda install conda-build anaconda-client

  - conda build --token $CONDA_UPLOAD_TOKEN --python $PYTHON_VERSION -c conda-forge -c menpo -c usgs-astrogeology conda
 
  - conda build --token $CONDA_UPLOAD_TOKEN --python $PYTHON_VERSION -c conda-forge recipe

knoten/__init__.py

+2 −1
Original line number Diff line number Diff line 
import ctypes

from ctypes.util import find_library

from distutils import sysconfig

import os

import warnings
@@ -7,6 +8,6 @@ from csmapi import csmapi 


# Register the usgscam plugin with the csmapi



lib = ctypes.CDLL(ctypes.util.find_library('usgscsm.so'))

lib = ctypes.CDLL(find_library('usgscsm.so'))

if not lib:

    warnings.warn('Unable to load usgscsm shared library')

recipe/meta.yaml

+2 −2
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ package: 
  version: {{ data.get('version') }}



source:

  git_url: https://github.com/USGS-Astrogeology/knoten

  path: ../



build:

  number : 0 # {{ GIT_DESCRIBE_NUMBER }}

  number : 0 

  string: dev

  script: "{{ PYTHON }} -m pip install . --no-deps -vv"

recipe/meta.yml

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
{% set data = load_setup_py_data() %}



package:

  name: knoten

  version: {{ data.get('version') }}



source:

  git_url: https://github.com/USGS-Astrogeology/knoten



build:

  number : {{ GIT_DESCRIBE_NUMBER }}

  string: dev

  script: "{{ PYTHON }} -m pip install . --no-deps -vv"



extra:

  channels:

    - conda-forge



requirements:

  host:

    - pip

    - python

    - setuptools

  run:

    - python

    - csmapi

    - gdal

    - jinja

    - numpy

    - requests

    - scipy



test:

  imports:

    - knoten