Loading .travis.yml +16 −23 Changes for .travis.yml: 16 added lines, 23 removed lines. Original line number Diff line number Diff line sudo: false language: python python: - "3.5" branches: only: - master Loading @@ -7,8 +11,6 @@ only: env: global: - BINSTAR_USER: jlaura matrix: - PYTHON_VERSION: 3.5 os: - linux Loading @@ -20,13 +22,13 @@ install: # We do this conditionally because it saves us some downloading if the # version is the same. - if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$PYTHON_VERSION" == 2.7 ]; then if [ "$TRAVIS_PYTHON_VERSION" == 2.7 ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; else wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi else if ["$PYTHON_VERSION" == 2.7]; then if ["$TRAVIS_PYTHON_VERSION" == 2.7]; then curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh; else curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh; Loading @@ -40,39 +42,30 @@ install: # Useful for debugging any issues with conda - conda info -a - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION - source activate test-environment # Install dependencies - conda config --add channels conda-forge - conda config --add channels menpo - conda config --add channels jlaura - conda install -c conda-forge numpy # The plio install is pulling in pandas as well. - conda install -c jlaura plio opencv3=3.0.0 - conda install -c conda-forge vlfeat - conda install -c menpo cyvlfeat - pip install pillow pysal - conda install scipy networkx numexpr dill cython pyyaml matplotlib runipy - conda install -c jlaura plio - conda install -c conda-forge vlfeat opencv3 - pip install pillow cyvlfeat - conda install scipy networkx numexpr cython pyyaml matplotlib # Development installation - conda install pytest sh anaconda-client - pip install pytest-cov # - python runipynbs.py # Straight from the menpo team - if [["$TRAVIS_OS_NAME" == "osx"]]; then curl -o condaci.py https://raw.githubusercontent.com/menpo/condaci/v0.4.8/condaci.py; else wget https://raw.githubusercontent.com/menpo/condaci/v0.4.8/condaci.py -O condaci.py; fi # Build autocnet and push to anaconda cloud - python condaci.py setup script: - py.test --cov-report term-missing --cov=autocnet . - conda config --set anaconda_upload True - conda build conda --user $BINSTAR_USER --token $BINSTAR_KEY after_success: # Upload to anaconda and push to coveralls - ~/miniconda/bin/python condaci.py build ./conda - coveralls notifications: Loading conda/meta.yaml +0 −5 Changes for conda/meta.yaml: 0 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -14,11 +14,9 @@ requirements: - cyvlfeat - pillow - matplotlib - pysal - scipy - networkx - numexpr - dill - cython - pyyaml - pysal Loading @@ -31,15 +29,12 @@ requirements: - cyvlfeat - pillow - matplotlib - pysal - scipy - networkx - numexpr - dill - cython - pyyaml - jupyter - pysal test: imports: Loading docs/requirements_docs.txt +0 −2 Changes for docs/requirements_docs.txt: 0 added lines, 2 removed lines. Original line number Diff line number Diff line pvl pysal pandas dill networkx sqlalchemy matplotlib Loading Loading
.travis.yml +16 −23 Changes for .travis.yml: 16 added lines, 23 removed lines. Original line number Diff line number Diff line sudo: false language: python python: - "3.5" branches: only: - master Loading @@ -7,8 +11,6 @@ only: env: global: - BINSTAR_USER: jlaura matrix: - PYTHON_VERSION: 3.5 os: - linux Loading @@ -20,13 +22,13 @@ install: # We do this conditionally because it saves us some downloading if the # version is the same. - if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$PYTHON_VERSION" == 2.7 ]; then if [ "$TRAVIS_PYTHON_VERSION" == 2.7 ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; else wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi else if ["$PYTHON_VERSION" == 2.7]; then if ["$TRAVIS_PYTHON_VERSION" == 2.7]; then curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh; else curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh; Loading @@ -40,39 +42,30 @@ install: # Useful for debugging any issues with conda - conda info -a - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION - source activate test-environment # Install dependencies - conda config --add channels conda-forge - conda config --add channels menpo - conda config --add channels jlaura - conda install -c conda-forge numpy # The plio install is pulling in pandas as well. - conda install -c jlaura plio opencv3=3.0.0 - conda install -c conda-forge vlfeat - conda install -c menpo cyvlfeat - pip install pillow pysal - conda install scipy networkx numexpr dill cython pyyaml matplotlib runipy - conda install -c jlaura plio - conda install -c conda-forge vlfeat opencv3 - pip install pillow cyvlfeat - conda install scipy networkx numexpr cython pyyaml matplotlib # Development installation - conda install pytest sh anaconda-client - pip install pytest-cov # - python runipynbs.py # Straight from the menpo team - if [["$TRAVIS_OS_NAME" == "osx"]]; then curl -o condaci.py https://raw.githubusercontent.com/menpo/condaci/v0.4.8/condaci.py; else wget https://raw.githubusercontent.com/menpo/condaci/v0.4.8/condaci.py -O condaci.py; fi # Build autocnet and push to anaconda cloud - python condaci.py setup script: - py.test --cov-report term-missing --cov=autocnet . - conda config --set anaconda_upload True - conda build conda --user $BINSTAR_USER --token $BINSTAR_KEY after_success: # Upload to anaconda and push to coveralls - ~/miniconda/bin/python condaci.py build ./conda - coveralls notifications: Loading
conda/meta.yaml +0 −5 Changes for conda/meta.yaml: 0 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -14,11 +14,9 @@ requirements: - cyvlfeat - pillow - matplotlib - pysal - scipy - networkx - numexpr - dill - cython - pyyaml - pysal Loading @@ -31,15 +29,12 @@ requirements: - cyvlfeat - pillow - matplotlib - pysal - scipy - networkx - numexpr - dill - cython - pyyaml - jupyter - pysal test: imports: Loading
docs/requirements_docs.txt +0 −2 Changes for docs/requirements_docs.txt: 0 added lines, 2 removed lines. Original line number Diff line number Diff line pvl pysal pandas dill networkx sqlalchemy matplotlib Loading