From 6b6938bd1132a93e3bc7e21587b5702b3711a736 Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Fri, 16 Oct 2015 15:46:13 +0100 Subject: [PATCH] [pickling] have the pickling test against a model, which is now being shipped with the distro --- GPy/testing/pickle_test.pickle | Bin 0 -> 8639 bytes MANIFEST.in | 8 ++------ setup.py | 31 +++++++++++++++++-------------- 3 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 GPy/testing/pickle_test.pickle diff --git a/GPy/testing/pickle_test.pickle b/GPy/testing/pickle_test.pickle new file mode 100644 index 0000000000000000000000000000000000000000..568e7a604b770be8789e427a43991329562da205 GIT binary patch literal 8639 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 literal 0 HcmV?d00001 diff --git a/MANIFEST.in b/MANIFEST.in index 1800fa52..91f053cd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,11 +1,7 @@ -include *.txt -recursive-include doc *.txt -include *.md -recursive-include doc *.md -include *.cfg recursive-include doc *.cfg include *.json -recursive-include doc *.json recursive-include GPy *.c recursive-include GPy *.so recursive-include GPy *.pyx +include GPy/testing/plotting_tests/baseline/*.png +include GPy/testing/pickle_test.pickle diff --git a/setup.py b/setup.py index 1d4e7321..82190c12 100644 --- a/setup.py +++ b/setup.py @@ -7,21 +7,21 @@ # Copyright (c) 2015, Max Zwiessele # # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of GPy nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -44,7 +44,7 @@ import codecs def read(fname): with codecs.open(fname, 'r', 'latin') as f: return f.read() - + def read_to_rst(fname): try: import pypandoc @@ -102,32 +102,35 @@ setup(name = 'GPy', ext_modules = ext_mods, packages = ["GPy", "GPy.core", - "GPy.core.parameterization", + "GPy.core.parameterization", "GPy.kern", "GPy.kern.src", - "GPy.kern.src.psi_comp", + "GPy.kern.src.psi_comp", "GPy.models", "GPy.inference", "GPy.inference.optimization", "GPy.inference.mcmc", "GPy.inference.latent_function_inference", - "GPy.likelihoods", + "GPy.likelihoods", "GPy.mappings", "GPy.examples", "GPy.testing", - "GPy.util", + "GPy.util", "GPy.plotting", "GPy.plotting.gpy_plot", - "GPy.plotting.matplot_dep", + "GPy.plotting.matplot_dep", "GPy.plotting.matplot_dep.controllers", - "GPy.plotting.plotly_dep", + "GPy.plotting.plotly_dep", ], package_dir={'GPy': 'GPy'}, package_data = {'GPy': ['defaults.cfg', 'installation.cfg', 'util/data_resources.json', 'util/football_teams.json', - 'plotting/plotting_tests/baseline/*.png' + 'testing/plotting_tests/baseline/*.png' ]}, + data_files=[('GPy/testing/plotting_tests/baseline', 'testing/plotting_tests/baseline/*.png'), + ('GPy/testing/', 'GPy/testing/pickle_test.pickle'), + ], include_package_data = True, py_modules = ['GPy.__init__'], test_suite = 'GPy.testing', @@ -159,7 +162,7 @@ if not os.path.exists(user_file): if os.path.exists(old_user_file): # Move it to new location: print("GPy: Found old config file, moving to new location {}".format(user_file)) - os.rename(old_user_file, user_file) + os.rename(old_user_file, user_file) else: # No config file exists, save informative stub to user config folder: print("GPy: Saving user configuration file to {}".format(user_file))