Skip to content

Commit

Permalink
Merge branch 'master' of github.com:uc-cdis/indexd into chore/python3
Browse files Browse the repository at this point in the history
  • Loading branch information
paulineribeyre committed Jul 9, 2019
2 parents 58a2f68 + 02d6ed8 commit a0c8d40
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 2 deletions.
21 changes: 21 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
Dockerfile export-ignore
Jenkinsfile export-ignore
Jenkinsfile.security export-ignore
LICENSE export-ignore
NOTICE export-ignore
README.md export-ignore
TestDockerfile export-ignore
# bin
deployment export-ignore
# indexd
openapis export-ignore
pull_request_template.md export-ignore
requirements.txt export-ignore
setup.cfg export-ignore
# setup.py
test-requirements.txt export-ignore
tests export-ignore
# wsgi.py
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,11 @@ install:
- "python setup.py install --force"
- "pip install -r test-requirements.txt"

script: "py.test -vv tests"
script: "py.test -vv --cov=indexd --cov-report xml tests"

after_script:
- COVERALLS_REPO_TOKEN=$COVERALLS_TOKEN coveralls

env:
global:
secure: h7ZQM1IMz67u8V+g/EqOXGH7SngyTZkaTRHDnnxlwql5vJ+gF8dlPgAzSN9xBn9SpSS0o5jqcZZ+6tN7FZEnPlZjCU15hN0G450r75zsKMFpWKl/8Xz3SwBJHx529ZOe9R9nrwOVmnedHxqbiQqgCxWwTDWsvmce6dF3GwigOfKNuW2UD2wdRX3quaMDAILZ0WyO6vGx6SVnr2sdhN4sJqCugXxjN72o/JLHnRBg5Cx2U4BdPguqaaEV6KjloxgTTtZEp0IZkrnv0WrxCgNuDoPYkfPEAD2hzrAgUkj0c+6WQg/aOV/k0MAKNLX4et+3haRAFeDlzAJBGPgUJN3zvPXGkPixTBiD5zDyplzjvF24qCSmXeH5SMKu//6lGeOuNgqJria3VD8xt+lAdGg4Fgzp+zDLQ17CSmJx5KRyQroZsp/YqD0ezT0mQZMRLuTNuw+UWQquk1ufotOD4o5KGssvcu03XD7SVc5CnsWrmlkN8MH5g19ddwNOSKKYu7Ran4//XOWOfSfzLCgYPgQbYebZXdpbxNNWK57V9sPHKRzrQCo26HNXWgWebbzYI1z5aoq6bY5dB7Un1YFUxQlBdNzZnx/soErPL+omH8nw9Usfv20uhB4lQo1plkoctpqLITuVDe8ZtSbUEZB7cZGcrfb/c5E9TLC9EqZu/e60qN8=
6 changes: 6 additions & 0 deletions Jenkinsfile.security
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!groovy

@Library('cdis-jenkins-lib@master') _

securityPipeline {
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Indexd
===
![version](https://img.shields.io/github/release/uc-cdis/indexd.svg) [![Apache license](http://img.shields.io/badge/license-Apache-blue.svg?style=flat)](LICENSE) [![Travis](https://travis-ci.org/uc-cdis/indexd.svg?branch=master)](https://travis-ci.org/uc-cdis/indexd)
![version](https://img.shields.io/github/release/uc-cdis/indexd.svg) [![Apache license](http://img.shields.io/badge/license-Apache-blue.svg?style=flat)](LICENSE) [![Travis](https://travis-ci.org/uc-cdis/indexd.svg?branch=master)](https://travis-ci.org/uc-cdis/indexd) [![Coverage Status](https://coveralls.io/repos/github/uc-cdis/indexd/badge.svg?branch=master)](https://coveralls.io/github/uc-cdis/indexd?branch=master)

Indexd is a data indexing and tracking service. It is intended to be
distributed, hash-based indexing service, designed to be accessed via a
Expand Down
2 changes: 2 additions & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
-r requirements.txt
coveralls
mock
pytest==3.0.6
pytest-cov==2.5.1
pytest-flask==0.8.1
PyYAML==5.1
swagger_spec_validator
Expand Down

0 comments on commit a0c8d40

Please sign in to comment.