From 61cec4a1dd2fa224f39b39c56e6ff19e438809e8 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 19 Mar 2019 20:43:21 -0600 Subject: [PATCH] Fix path to data_files This should not include sys.prefix because that will be the environment the conda package was created in, not the one you want to install into. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index aa24941b3..2abf6dd7e 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ def get_all_files_in_dir(directory, pattern): rgb_files = get_all_files_in_dir('acme_diags/plot/colormaps', '*.rgb') control_runs_files = get_all_files_in_dir('acme_diags/driver/control_runs', '*.csv') -INSTALL_PATH = os.path.join(sys.prefix, 'share/e3sm_diags/') +INSTALL_PATH = 'share/e3sm_diags/' data_files = [ (os.path.join(INSTALL_PATH, 'zonal_mean_xy'), @@ -65,7 +65,7 @@ def get_all_files_in_dir(directory, pattern): setup( name="e3sm_diags", - version="1.6.0", + version="1.6.1", author="Chengzhu (Jill) Zhang, Zeshawn Shaheen", author_email="zhang40@llnl.gov, shaheen2@llnl.gov", description="E3SM Diagnostics",