Skip to content

Commit

Permalink
Merge branch 'master' into soba
Browse files Browse the repository at this point in the history
  • Loading branch information
jhidding committed Nov 13, 2017
2 parents 1b99238 + 95beada commit e4e0d99
Show file tree
Hide file tree
Showing 146 changed files with 3,929 additions and 3,675 deletions.
40 changes: 40 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8

# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,py,java,r,R}]
indent_style = space

# 4 space indentation
[*.py]
indent_size = 4

# Tab indentation (no size specified)
[*.js]
indent_size = 2

# Matches the exact files either package.json or .travis.yml
[*.{json,yml}]
indent_size = 2

[*.{md,Rmd}]
trim_trailing_whitespace = true

[*.{cpp,hpp,cc,hh,c,h,cuh,cu}]
indent_size = 4
indent_style = space

[*.{sls,scm,ss}]
indent_size = 2
indent_style = space

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ cover
.*.swp
doc/build
venv
cache*
19 changes: 19 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
language: python
sudo: false
python:
- "3.5"
install:
- pip install -U codacy-coverage
- pip install -U .[prov,numpy,test]
script:
- pytest test --cov=./noodles
after-script:
- coverage report
- coverage xml
- python-codacy-coverage -r coverage.xml

branches:
only:
- master
- devel

674 changes: 0 additions & 674 deletions COPYING

This file was deleted.

165 changes: 0 additions & 165 deletions COPYING.LESSER

This file was deleted.

Loading

0 comments on commit e4e0d99

Please sign in to comment.