Skip to content

Commit 63bbeb3

Browse files
committed
Merge remote-tracking branch 'rflamary/master'
merge pot
2 parents f70aabf + f66ab58 commit 63bbeb3

File tree

108 files changed

+6782
-1151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+6782
-1151
lines changed

.coveragerc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[run]
2+
3+
omit=
4+
ot/externals/*
5+
ot/externals/funcsigs.py
6+
ot/gpu/*
Lines changed: 36 additions & 0 deletions

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ before_script: # configure a headless display to test plot generation
2626
# command to install dependencies
2727
install:
2828
- pip install -r requirements.txt
29-
- pip install flake8 pytest
29+
- pip install flake8 pytest "pytest-cov<2.6"
3030
- pip install .
3131
# command to run tests + check syntax style
3232
script:
3333
- python setup.py develop
3434
- flake8 examples/ ot/ test/
35-
- python -m pytest -v test/
35+
- python -m pytest -v test/ --cov=ot
3636
# - py.test ot test

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions

Makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22

33
PYTHON=python3
4+
branch := $(shell git symbolic-ref --short -q HEAD)
45

56
help :
67
@echo "The following make targets are available:"
@@ -57,6 +58,16 @@ rdoc :
5758
notebook :
5859
ipython notebook --matplotlib=inline --notebook-dir=notebooks/
5960

61+
bench :
62+
@git stash >/dev/null 2>&1
63+
@echo 'Branch master'
64+
@git checkout master >/dev/null 2>&1
65+
python3 $(script)
66+
@echo 'Branch $(branch)'
67+
@git checkout $(branch) >/dev/null 2>&1
68+
python3 $(script)
69+
@git stash apply >/dev/null 2>&1
70+
6071
autopep8 :
6172
autopep8 -ir test ot examples --jobs -1
6273

README.md

Lines changed: 0 additions & 15 deletions

RELEASES.md

Lines changed: 59 additions & 0 deletions

data/duck.png

4.99 KB

data/heart.png

5.1 KB

data/redcross.png

1.64 KB

0 commit comments

Comments
 (0)