Unverified Commit 94cc0abd authored by jlaura's avatar jlaura Committed by GitHub
Browse files

Updates to use the newest conda compiler (#34) 

* Adds Cassini-ISS supports and begins refactor to generic.

* Finalizes refactor to generic framer

* Refactors out bad class attribute

* mend

* Adds conftest fixtures and model serialization.

* Adds serialization to Ls

* Updates to use the newest conda compiler

* Updates to gcc7.2
parent a7ec0ba6

.travis.yml

+14 −25
Original line number Diff line number Diff line
@@ -3,21 +3,9 @@ language: generic 
matrix:

  include:

    - os: linux

      addons:

        apt:

          sources:

            - ubuntu-toolchain-r-test

          packages:

            - g++-6

      env:

        - PYTHON_VERSION=3.5

    - os: linux

      addons:

        apt:

          sources:

            - ubuntu-toolchain-r-test

          packages:

            - g++-6

      env:

        - PYTHON_VERSION=3.6

    - os: osx
@@ -41,8 +29,6 @@ branches: 


before_install:

  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then

      export CC=gcc-6;

      export CXX=g++-6;

      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;

    else

      curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh;
@@ -55,28 +41,31 @@ before_install: 
  - conda config --set always_yes yes --set changeps1 no

  - conda update -q conda

  - conda info -a   # Useful for debugging any issues with conda

  

  # Create the env

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

  - source activate test

  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then

      conda install gxx_linux-64;

    else

      conda install clangxx_osx-64;

    fi

  # Neecssary to get the new compilers into the PATH

  - source deactivate

  - source activate test

  # Necessary to avoid hangs due to output length

  - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"



install:

  # Install dependencies

  # Install dependencies

  - conda config --add channels usgs-astrogeology

  - conda config --add channels conda-forge

  - conda install -c conda-forge numpy cython

  - conda install -c conda-forge numpy cython pytest pytest-cov coveralls

  - conda install -c usgs-astrogeology libcsm cycsm



  # Development installation

  - conda install pytest pytest-cov

  - pip install coveralls



script:

  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then

        CC=gcc-6 CXX=gcc-6 python setup.py install;

    else

        python setup.py install;

    fi

  - python setup.py install

  - pytest --cov=usgscam



after_success:
@@ -84,4 +73,4 @@ after_success: 
  - source deactivate

  - conda install conda-build anaconda-client

  - conda config --set anaconda_upload yes

  - conda build --token $CONDA_UPLOAD_TOKEN --python $PYTHON_VERSION .
 
  - conda build -q --token $CONDA_UPLOAD_TOKEN --python $PYTHON_VERSION .
 
 No newline at end of file

recipe/build.sh

+2 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


if [ `uname` == Darwin ]; then

  export MACOSX_DEPLOYMENT_TARGET=10.9;

  $PYTHON setup.py install;

else

  CC=gcc-6 CXX=g++-6 $PYTHON setup.py install;

fi



$PYTHON setup.py install;

recipe/meta.yaml

+6 −7
Original line number Diff line number Diff line 
{% set version = "0.1.0" %}

{% set version = "0.1.1" %}



package:

  name: usgscam
@@ -8,19 +8,21 @@ source: 
    git_url: https://github.com/USGS-Astrogeology/CSM-CameraModel

    git_rev: master

build:

  number: 3

  number: 0



detect_binary_files_with_prefix: true



requirements:

  build: 

    - {{ compiler('cxx') }}

    - vc 14  # [win and py>=35]

  host:

    - python

    - setuptools

    - numpy >=1.10

    - cython >=0.27

    - libcsm

    - cycsm

    - vc 14  # [win and py>=35]

  run:

    - python

    - numpy >=1.10
@@ -29,9 +31,6 @@ requirements: 
    - vc 14  # [win and py>=35]



test:

  requires:

    - pytest



  imports:

    - usgscam