[plotting_tests] failed, because of same name?

This commit is contained in:
mzwiessele 2015-11-07 10:59:06 +00:00
parent 0c11ba0bf8
commit 9fb42cbe2a
3 changed files with 15 additions and 10 deletions

View file

@ -27,13 +27,15 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================== #===============================================================================
import matplotlib
matplotlib.use('agg')
import numpy as np import numpy as np
import GPy, os import GPy, os
from nose import SkipTest from nose import SkipTest
from ..util.config import config from ..util.config import config
from ..plotting import change_plotting_library from ..plotting import change_plotting_library
import unittest
change_plotting_library('matplotlib') change_plotting_library('matplotlib')
if config.get('plotting', 'library') != 'matplotlib': if config.get('plotting', 'library') != 'matplotlib':
@ -73,7 +75,7 @@ def _sequenceEqual(a, b):
def _notFound(path): def _notFound(path):
raise IOError('File {} not in baseline') raise IOError('File {} not in baseline')
def _image_comparison(baseline_images, extensions=['pdf','svg','ong'], tol=11): def _image_comparison(baseline_images, extensions=['pdf','svg','png'], tol=11):
baseline_dir, result_dir = _image_directories() baseline_dir, result_dir = _image_directories()
for num, base in zip(plt.get_fignums(), baseline_images): for num, base in zip(plt.get_fignums(), baseline_images):
for ext in extensions: for ext in extensions:

View file

@ -126,14 +126,14 @@ setup(name = 'GPy',
"GPy.plotting.plotly_dep", "GPy.plotting.plotly_dep",
], ],
package_dir={'GPy': 'GPy'}, package_dir={'GPy': 'GPy'},
package_data = {'GPy': ['defaults.cfg', 'installation.cfg', #package_data = {'GPy': ['defaults.cfg', 'installation.cfg',
'util/data_resources.json', # 'util/data_resources.json',
'util/football_teams.json', # 'util/football_teams.json',
'testing/plotting_tests/baseline/*.png' # 'testing/plotting_tests/baseline/*.png'
]}, # ]},
data_files=[('GPy/testing/plotting_tests/baseline', 'testing/plotting_tests/baseline/*.png'), #data_files=[('GPy/testing/plotting_tests/baseline', 'testing/plotting_tests/baseline/*.png'),
('GPy/testing/', 'GPy/testing/pickle_test.pickle'), # ('GPy/testing/', 'GPy/testing/pickle_test.pickle'),
], # ],
include_package_data = True, include_package_data = True,
py_modules = ['GPy.__init__'], py_modules = ['GPy.__init__'],
test_suite = 'GPy.testing', test_suite = 'GPy.testing',

View file

@ -30,6 +30,9 @@
#=============================================================================== #===============================================================================
#!/usr/bin/env python #!/usr/bin/env python
import matplotlib
matplotlib.use('agg')
import nose import nose
nose.main('GPy', defaultTest='GPy/testing/') nose.main('GPy', defaultTest='GPy/testing/')