[plotting_tests] failed, because of same name?

tangoed2whiskey · Nov 7, 2015 · 0c11ba0 · 0c11ba0
1 parent 8f19465
commit 0c11ba0
Show file tree

Hide file tree

Showing 43 changed files with 8 additions and 4 deletions.
diff --git a/...ests/baseline/bayesian_gplvm_gradient.png → ...ting/baseline/bayesian_gplvm_gradient.png b/...ests/baseline/bayesian_gplvm_gradient.png → ...ting/baseline/bayesian_gplvm_gradient.png
diff --git a/...ests/baseline/bayesian_gplvm_inducing.png → ...ting/baseline/bayesian_gplvm_inducing.png b/...ests/baseline/bayesian_gplvm_inducing.png → ...ting/baseline/bayesian_gplvm_inducing.png
diff --git a/...s/baseline/bayesian_gplvm_inducing_3d.png → ...g/baseline/bayesian_gplvm_inducing_3d.png b/...s/baseline/bayesian_gplvm_inducing_3d.png → ...g/baseline/bayesian_gplvm_inducing_3d.png
diff --git a/...sts/baseline/bayesian_gplvm_latent_3d.png → ...ing/baseline/bayesian_gplvm_latent_3d.png b/...sts/baseline/bayesian_gplvm_latent_3d.png → ...ing/baseline/bayesian_gplvm_latent_3d.png
diff --git a/...baseline/bayesian_gplvm_magnification.png → ...baseline/bayesian_gplvm_magnification.png b/...baseline/bayesian_gplvm_magnification.png → ...baseline/bayesian_gplvm_magnification.png
diff --git a/...tting_tests/baseline/coverage_3d_plot.png → GPy/testing/baseline/coverage_3d_plot.png b/...tting_tests/baseline/coverage_3d_plot.png → GPy/testing/baseline/coverage_3d_plot.png
diff --git a/...baseline/coverage_annotation_interact.png → ...baseline/coverage_annotation_interact.png b/...baseline/coverage_annotation_interact.png → ...baseline/coverage_annotation_interact.png
diff --git a/...ting_tests/baseline/coverage_gradient.png → GPy/testing/baseline/coverage_gradient.png b/...ting_tests/baseline/coverage_gradient.png → GPy/testing/baseline/coverage_gradient.png
diff --git a/...sts/baseline/coverage_imshow_interact.png → ...ing/baseline/coverage_imshow_interact.png b/...sts/baseline/coverage_imshow_interact.png → ...ing/baseline/coverage_imshow_interact.png
diff --git a/...ng/plotting_tests/baseline/gp_2d_data.png → GPy/testing/baseline/gp_2d_data.png b/...ng/plotting_tests/baseline/gp_2d_data.png → GPy/testing/baseline/gp_2d_data.png
diff --git a/...lotting_tests/baseline/gp_2d_in_error.png → GPy/testing/baseline/gp_2d_in_error.png b/...lotting_tests/baseline/gp_2d_in_error.png → GPy/testing/baseline/gp_2d_in_error.png
diff --git a/...lotting_tests/baseline/gp_2d_inducing.png → GPy/testing/baseline/gp_2d_inducing.png b/...lotting_tests/baseline/gp_2d_inducing.png → GPy/testing/baseline/gp_2d_inducing.png
diff --git a/...ng/plotting_tests/baseline/gp_2d_mean.png → GPy/testing/baseline/gp_2d_mean.png b/...ng/plotting_tests/baseline/gp_2d_mean.png → GPy/testing/baseline/gp_2d_mean.png
diff --git a/...ng/plotting_tests/baseline/gp_3d_data.png → GPy/testing/baseline/gp_3d_data.png b/...ng/plotting_tests/baseline/gp_3d_data.png → GPy/testing/baseline/gp_3d_data.png
diff --git a/...lotting_tests/baseline/gp_3d_inducing.png → GPy/testing/baseline/gp_3d_inducing.png b/...lotting_tests/baseline/gp_3d_inducing.png → GPy/testing/baseline/gp_3d_inducing.png
diff --git a/...ng/plotting_tests/baseline/gp_3d_mean.png → GPy/testing/baseline/gp_3d_mean.png b/...ng/plotting_tests/baseline/gp_3d_mean.png → GPy/testing/baseline/gp_3d_mean.png
diff --git a/...ng_tests/baseline/gp_class_likelihood.png → GPy/testing/baseline/gp_class_likelihood.png b/...ng_tests/baseline/gp_class_likelihood.png → GPy/testing/baseline/gp_class_likelihood.png
diff --git a/.../plotting_tests/baseline/gp_class_raw.png → GPy/testing/baseline/gp_class_raw.png b/.../plotting_tests/baseline/gp_class_raw.png → GPy/testing/baseline/gp_class_raw.png
diff --git a/...ting_tests/baseline/gp_class_raw_link.png → GPy/testing/baseline/gp_class_raw_link.png b/...ting_tests/baseline/gp_class_raw_link.png → GPy/testing/baseline/gp_class_raw_link.png
diff --git a/...sting/plotting_tests/baseline/gp_conf.png → GPy/testing/baseline/gp_conf.png b/...sting/plotting_tests/baseline/gp_conf.png → GPy/testing/baseline/gp_conf.png
diff --git a/...sting/plotting_tests/baseline/gp_data.png → GPy/testing/baseline/gp_data.png b/...sting/plotting_tests/baseline/gp_data.png → GPy/testing/baseline/gp_data.png
diff --git a/...ng/plotting_tests/baseline/gp_density.png → GPy/testing/baseline/gp_density.png b/...ng/plotting_tests/baseline/gp_density.png → GPy/testing/baseline/gp_density.png
diff --git a/...ting/plotting_tests/baseline/gp_error.png → GPy/testing/baseline/gp_error.png b/...ting/plotting_tests/baseline/gp_error.png → GPy/testing/baseline/gp_error.png
diff --git a/...g/plotting_tests/baseline/gp_in_error.png → GPy/testing/baseline/gp_in_error.png b/...g/plotting_tests/baseline/gp_in_error.png → GPy/testing/baseline/gp_in_error.png
diff --git a/...sting/plotting_tests/baseline/gp_mean.png → GPy/testing/baseline/gp_mean.png b/...sting/plotting_tests/baseline/gp_mean.png → GPy/testing/baseline/gp_mean.png
diff --git a/.../plotting_tests/baseline/gp_out_error.png → GPy/testing/baseline/gp_out_error.png b/.../plotting_tests/baseline/gp_out_error.png → GPy/testing/baseline/gp_out_error.png
diff --git a/...ng/plotting_tests/baseline/gp_samples.png → GPy/testing/baseline/gp_samples.png b/...ng/plotting_tests/baseline/gp_samples.png → GPy/testing/baseline/gp_samples.png
diff --git a/...lotting_tests/baseline/gplvm_gradient.png → GPy/testing/baseline/gplvm_gradient.png b/...lotting_tests/baseline/gplvm_gradient.png → GPy/testing/baseline/gplvm_gradient.png
diff --git a/.../plotting_tests/baseline/gplvm_latent.png → GPy/testing/baseline/gplvm_latent.png b/.../plotting_tests/baseline/gplvm_latent.png → GPy/testing/baseline/gplvm_latent.png
diff --git a/...otting_tests/baseline/gplvm_latent_3d.png → GPy/testing/baseline/gplvm_latent_3d.png b/...otting_tests/baseline/gplvm_latent_3d.png → GPy/testing/baseline/gplvm_latent_3d.png
diff --git a/...ng_tests/baseline/gplvm_magnification.png → GPy/testing/baseline/gplvm_magnification.png b/...ng_tests/baseline/gplvm_magnification.png → GPy/testing/baseline/gplvm_magnification.png
diff --git a/...ting/plotting_tests/baseline/kern_ARD.png → GPy/testing/baseline/kern_ARD.png b/...ting/plotting_tests/baseline/kern_ARD.png → GPy/testing/baseline/kern_ARD.png
diff --git a/...g/plotting_tests/baseline/kern_cov_1d.png → GPy/testing/baseline/kern_cov_1d.png b/...g/plotting_tests/baseline/kern_cov_1d.png → GPy/testing/baseline/kern_cov_1d.png
diff --git a/...g/plotting_tests/baseline/kern_cov_2d.png → GPy/testing/baseline/kern_cov_2d.png b/...g/plotting_tests/baseline/kern_cov_2d.png → GPy/testing/baseline/kern_cov_2d.png
diff --git a/...g/plotting_tests/baseline/kern_cov_3d.png → GPy/testing/baseline/kern_cov_3d.png b/...g/plotting_tests/baseline/kern_cov_3d.png → GPy/testing/baseline/kern_cov_3d.png
diff --git a/...otting_tests/baseline/kern_cov_no_lim.png → GPy/testing/baseline/kern_cov_no_lim.png b/...otting_tests/baseline/kern_cov_no_lim.png → GPy/testing/baseline/kern_cov_no_lim.png
diff --git a/...s/baseline/sparse_gp_class_likelihood.png → ...g/baseline/sparse_gp_class_likelihood.png b/...s/baseline/sparse_gp_class_likelihood.png → ...g/baseline/sparse_gp_class_likelihood.png
diff --git a/...ng_tests/baseline/sparse_gp_class_raw.png → GPy/testing/baseline/sparse_gp_class_raw.png b/...ng_tests/baseline/sparse_gp_class_raw.png → GPy/testing/baseline/sparse_gp_class_raw.png
diff --git a/...sts/baseline/sparse_gp_class_raw_link.png → ...ing/baseline/sparse_gp_class_raw_link.png b/...sts/baseline/sparse_gp_class_raw_link.png → ...ing/baseline/sparse_gp_class_raw_link.png
diff --git a/...g_tests/baseline/sparse_gp_data_error.png → ...testing/baseline/sparse_gp_data_error.png b/...g_tests/baseline/sparse_gp_data_error.png → ...testing/baseline/sparse_gp_data_error.png
diff --git 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
@@ -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
@@ -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)