Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TICK-344 Added badges, fixed Travis badge #4

Merged
merged 1 commit into from
Mar 31, 2017
Merged

TICK-344 Added badges, fixed Travis badge #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: required

branches:
only:
- dev
- master

cache:
directories:
Expand Down Expand Up @@ -30,10 +30,10 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source .travis_install_linux.sh; fi

install:
- python3 -m pip install --quiet -U pip
- python3 -m pip install --quiet numpy pandas
- python3 -m pip install -r requirements.txt
- python3 -m pip install cpplint
- python -m pip install --quiet -U pip
- python -m pip install --quiet numpy pandas
- python -m pip install -r requirements.txt
- python -m pip install cpplint

script:
- ./build_test.sh
Expand Down
2 changes: 1 addition & 1 deletion .travis_install_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fi
if [ ! -d swig-3.0.10 ] || [ ! -f swig-3.0.10/configure ]
then
wget http://prdownloads.sourceforge.net/swig/swig-3.0.10.tar.gz && tar -xf swig-3.0.10.tar.gz
(cd swig-3.0.10 && /configure && make -s)
(cd swig-3.0.10 && ./configure && make -s)
fi

(cd googletest && cd build && sudo make -s install)
Expand Down
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@

[![Build Status](https://travis-ci.com/X-DataInitiative/tick.svg?token=sQJ9HAvgQkqM6Z5CF631&branch=dev)](https://travis-ci.com/X-DataInitiative/tick)
[![PyPI version](https://badge.fury.io/py/tick.svg)](https://badge.fury.io/py/tick)
[![Build Status](https://travis-ci.org/X-DataInitiative/tick.svg?branch=master)](https://travis-ci.org/X-DataInitiative/tick)
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)

# tick

Expand Down