Merge branch 'master' into sptiwari/model_fix_test

bindings/python/cntk/losses/tests/fmeasure_test.py

@@ -12,7 +12,9 @@ import numpy as np
 import cntk as C
 from _cntk_py import set_fixed_random_seed
 
-
+import pytest
+from os import environ
+@pytest.mark.skipif(environ.get('TEST_TAG') is not None and environ['TEST_TAG'] in {'weekly', 'nightly'}, reason="Temporarily disabled this test in the Nightly/Weekly builds due to random failures.")
 def test_fmeasure():
     a = np.array([[[[1., 1., 1., 0., 0.],
                     [1., 1., 1., 0., 0.],

bindings/python/cntk/pytest.ini

@@ -2,4 +2,5 @@
 python_files = *.py
 python_classes = *Test
 #addopts = --doctest-modules
+addopts = --verbose --full-trace
 doctest_optionflags= NORMALIZE_WHITESPACE

bindings/python/doc/pytest.ini

@@ -1,2 +1,2 @@
 [pytest]
-addopts = --doctest-modules --doctest-glob=*.rst
+addopts = --verbose --full-trace --doctest-modules --doctest-glob=*.rst