Skip to content

Commit cce6415

Browse files
committed
Merge branch 'release/0.5'
2 parents c4b8ec3 + 73ecb05 commit cce6415

21 files changed

+1265
-459
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.4
1+
0.5

conftest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
collect_ignore = ['setup.py']
22

3+
pytest_plugins = ("pytest_cov", "subtests")
4+
35

46
def pytest_configure(config):
57
import sys

dcor/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@
2020
u_distance_stats_sqr,
2121
distance_correlation_af_inv_sqr,
2222
distance_correlation_af_inv,
23-
DistanceCovarianceMethod)
23+
DistanceCovarianceMethod, CompileMode)
2424
from ._dcor_internals import (double_centered, u_centered, # noqa
2525
mean_product, u_product,
2626
u_projection,
2727
u_complementary_projection)
2828
from ._energy import energy_distance # noqa
29-
from ._pairwise import pairwise
3029
from ._partial_dcor import (partial_distance_covariance, # noqa
3130
partial_distance_correlation)
31+
from ._rowwise import rowwise, RowwiseMode
32+
3233

3334
try:
3435
with open(_os.path.join(_os.path.dirname(__file__),

0 commit comments

Comments
 (0)