diff --git a/GPy/testing/plotting_tests/baseline/bayesian_gplvm_gradient.png b/GPy/testing/baseline/bayesian_gplvm_gradient.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/bayesian_gplvm_gradient.png rename to GPy/testing/baseline/bayesian_gplvm_gradient.png diff --git a/GPy/testing/plotting_tests/baseline/bayesian_gplvm_inducing.png b/GPy/testing/baseline/bayesian_gplvm_inducing.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/bayesian_gplvm_inducing.png rename to GPy/testing/baseline/bayesian_gplvm_inducing.png diff --git a/GPy/testing/plotting_tests/baseline/bayesian_gplvm_inducing_3d.png b/GPy/testing/baseline/bayesian_gplvm_inducing_3d.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/bayesian_gplvm_inducing_3d.png rename to GPy/testing/baseline/bayesian_gplvm_inducing_3d.png diff --git a/GPy/testing/plotting_tests/baseline/bayesian_gplvm_latent_3d.png b/GPy/testing/baseline/bayesian_gplvm_latent_3d.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/bayesian_gplvm_latent_3d.png rename to GPy/testing/baseline/bayesian_gplvm_latent_3d.png diff --git a/GPy/testing/plotting_tests/baseline/bayesian_gplvm_magnification.png b/GPy/testing/baseline/bayesian_gplvm_magnification.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/bayesian_gplvm_magnification.png rename to GPy/testing/baseline/bayesian_gplvm_magnification.png diff --git a/GPy/testing/plotting_tests/baseline/coverage_3d_plot.png b/GPy/testing/baseline/coverage_3d_plot.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/coverage_3d_plot.png rename to GPy/testing/baseline/coverage_3d_plot.png diff --git a/GPy/testing/plotting_tests/baseline/coverage_annotation_interact.png b/GPy/testing/baseline/coverage_annotation_interact.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/coverage_annotation_interact.png rename to GPy/testing/baseline/coverage_annotation_interact.png diff --git a/GPy/testing/plotting_tests/baseline/coverage_gradient.png b/GPy/testing/baseline/coverage_gradient.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/coverage_gradient.png rename to GPy/testing/baseline/coverage_gradient.png diff --git a/GPy/testing/plotting_tests/baseline/coverage_imshow_interact.png b/GPy/testing/baseline/coverage_imshow_interact.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/coverage_imshow_interact.png rename to GPy/testing/baseline/coverage_imshow_interact.png diff --git a/GPy/testing/plotting_tests/baseline/gp_2d_data.png b/GPy/testing/baseline/gp_2d_data.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_2d_data.png rename to GPy/testing/baseline/gp_2d_data.png diff --git a/GPy/testing/plotting_tests/baseline/gp_2d_in_error.png b/GPy/testing/baseline/gp_2d_in_error.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_2d_in_error.png rename to GPy/testing/baseline/gp_2d_in_error.png diff --git a/GPy/testing/plotting_tests/baseline/gp_2d_inducing.png b/GPy/testing/baseline/gp_2d_inducing.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_2d_inducing.png rename to GPy/testing/baseline/gp_2d_inducing.png diff --git a/GPy/testing/plotting_tests/baseline/gp_2d_mean.png b/GPy/testing/baseline/gp_2d_mean.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_2d_mean.png rename to GPy/testing/baseline/gp_2d_mean.png diff --git a/GPy/testing/plotting_tests/baseline/gp_3d_data.png b/GPy/testing/baseline/gp_3d_data.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_3d_data.png rename to GPy/testing/baseline/gp_3d_data.png diff --git a/GPy/testing/plotting_tests/baseline/gp_3d_inducing.png b/GPy/testing/baseline/gp_3d_inducing.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_3d_inducing.png rename to GPy/testing/baseline/gp_3d_inducing.png diff --git a/GPy/testing/plotting_tests/baseline/gp_3d_mean.png b/GPy/testing/baseline/gp_3d_mean.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_3d_mean.png rename to GPy/testing/baseline/gp_3d_mean.png diff --git a/GPy/testing/plotting_tests/baseline/gp_class_likelihood.png b/GPy/testing/baseline/gp_class_likelihood.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_class_likelihood.png rename to GPy/testing/baseline/gp_class_likelihood.png diff --git a/GPy/testing/plotting_tests/baseline/gp_class_raw.png b/GPy/testing/baseline/gp_class_raw.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_class_raw.png rename to GPy/testing/baseline/gp_class_raw.png diff --git a/GPy/testing/plotting_tests/baseline/gp_class_raw_link.png b/GPy/testing/baseline/gp_class_raw_link.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_class_raw_link.png rename to GPy/testing/baseline/gp_class_raw_link.png diff --git a/GPy/testing/plotting_tests/baseline/gp_conf.png b/GPy/testing/baseline/gp_conf.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_conf.png rename to GPy/testing/baseline/gp_conf.png diff --git a/GPy/testing/plotting_tests/baseline/gp_data.png b/GPy/testing/baseline/gp_data.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_data.png rename to GPy/testing/baseline/gp_data.png diff --git a/GPy/testing/plotting_tests/baseline/gp_density.png b/GPy/testing/baseline/gp_density.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_density.png rename to GPy/testing/baseline/gp_density.png diff --git a/GPy/testing/plotting_tests/baseline/gp_error.png b/GPy/testing/baseline/gp_error.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_error.png rename to GPy/testing/baseline/gp_error.png diff --git a/GPy/testing/plotting_tests/baseline/gp_in_error.png b/GPy/testing/baseline/gp_in_error.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_in_error.png rename to GPy/testing/baseline/gp_in_error.png diff --git a/GPy/testing/plotting_tests/baseline/gp_mean.png b/GPy/testing/baseline/gp_mean.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_mean.png rename to GPy/testing/baseline/gp_mean.png diff --git a/GPy/testing/plotting_tests/baseline/gp_out_error.png b/GPy/testing/baseline/gp_out_error.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_out_error.png rename to GPy/testing/baseline/gp_out_error.png diff --git a/GPy/testing/plotting_tests/baseline/gp_samples.png b/GPy/testing/baseline/gp_samples.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gp_samples.png rename to GPy/testing/baseline/gp_samples.png diff --git a/GPy/testing/plotting_tests/baseline/gplvm_gradient.png b/GPy/testing/baseline/gplvm_gradient.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gplvm_gradient.png rename to GPy/testing/baseline/gplvm_gradient.png diff --git a/GPy/testing/plotting_tests/baseline/gplvm_latent.png b/GPy/testing/baseline/gplvm_latent.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gplvm_latent.png rename to GPy/testing/baseline/gplvm_latent.png diff --git a/GPy/testing/plotting_tests/baseline/gplvm_latent_3d.png b/GPy/testing/baseline/gplvm_latent_3d.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gplvm_latent_3d.png rename to GPy/testing/baseline/gplvm_latent_3d.png diff --git a/GPy/testing/plotting_tests/baseline/gplvm_magnification.png b/GPy/testing/baseline/gplvm_magnification.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/gplvm_magnification.png rename to GPy/testing/baseline/gplvm_magnification.png diff --git a/GPy/testing/plotting_tests/baseline/kern_ARD.png b/GPy/testing/baseline/kern_ARD.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/kern_ARD.png rename to GPy/testing/baseline/kern_ARD.png diff --git a/GPy/testing/plotting_tests/baseline/kern_cov_1d.png b/GPy/testing/baseline/kern_cov_1d.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/kern_cov_1d.png rename to GPy/testing/baseline/kern_cov_1d.png diff --git a/GPy/testing/plotting_tests/baseline/kern_cov_2d.png b/GPy/testing/baseline/kern_cov_2d.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/kern_cov_2d.png rename to GPy/testing/baseline/kern_cov_2d.png diff --git a/GPy/testing/plotting_tests/baseline/kern_cov_3d.png b/GPy/testing/baseline/kern_cov_3d.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/kern_cov_3d.png rename to GPy/testing/baseline/kern_cov_3d.png diff --git a/GPy/testing/plotting_tests/baseline/kern_cov_no_lim.png b/GPy/testing/baseline/kern_cov_no_lim.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/kern_cov_no_lim.png rename to GPy/testing/baseline/kern_cov_no_lim.png diff --git a/GPy/testing/plotting_tests/baseline/sparse_gp_class_likelihood.png b/GPy/testing/baseline/sparse_gp_class_likelihood.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/sparse_gp_class_likelihood.png rename to GPy/testing/baseline/sparse_gp_class_likelihood.png diff --git a/GPy/testing/plotting_tests/baseline/sparse_gp_class_raw.png b/GPy/testing/baseline/sparse_gp_class_raw.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/sparse_gp_class_raw.png rename to GPy/testing/baseline/sparse_gp_class_raw.png diff --git a/GPy/testing/plotting_tests/baseline/sparse_gp_class_raw_link.png b/GPy/testing/baseline/sparse_gp_class_raw_link.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/sparse_gp_class_raw_link.png rename to GPy/testing/baseline/sparse_gp_class_raw_link.png diff --git a/GPy/testing/plotting_tests/baseline/sparse_gp_data_error.png b/GPy/testing/baseline/sparse_gp_data_error.png similarity index 100% rename from GPy/testing/plotting_tests/baseline/sparse_gp_data_error.png rename to GPy/testing/baseline/sparse_gp_data_error.png diff --git a/GPy/testing/plotting_tests.py b/GPy/testing/plotting_tests.py index 179bf2e0..ec58625a 100644 --- a/GPy/testing/plotting_tests.py +++ b/GPy/testing/plotting_tests.py @@ -54,7 +54,7 @@ def _image_directories(): Compute the baseline and result image directories for testing *func*. Create the result directory if it doesn't exist. """ - basedir = os.path.splitext(os.path.relpath(os.path.abspath(__file__)))[0] + basedir = os.path.dirname(os.path.relpath(os.path.abspath(__file__))) #module_name = __init__.__module__ #mods = module_name.split('.') #basedir = os.path.join(*mods) diff --git a/MANIFEST.in b/MANIFEST.in index f215cb4f..157c9fba 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,6 +3,7 @@ include doc/source/conf.py include doc/source/index.rst include doc/source/tuto*.rst include README.md +include README.rst # Data and config #include *.json @@ -15,5 +16,5 @@ recursive-include GPy *.so recursive-include GPy *.pyx # Testing -include GPy/testing/plotting_tests/baseline/*.png -include GPy/testing/pickle_test.pickle +include GPy/testing/plotting_tests/baseline/.*.png +#include GPy/testing/pickle_test.pickle diff --git a/setup.py b/setup.py index 1ad5e2fd..f4dcfcda 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,10 @@ def read_to_rst(fname): try: import pypandoc rstname = "{}.{}".format(os.path.splitext(fname)[0], 'rst') - return pypandoc.convert(read(fname), 'rst', format='md') + rststr = pypandoc.convert(read(fname), 'rst', format='md') + with open(rstname, 'w') as f: + f.write(rststr) + return rststr #return read(rstname) except ImportError: return read(fname)