From 195477d5d333da6755581b39944ee6ab3bba2db6 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Thu, 29 Feb 2024 20:14:06 +0000 Subject: [PATCH] validphys.datafiles imports --> nnpdf_data --- buildmaster/old_new_check.py | 2 +- buildmaster/oldcommondata_porter.py | 2 +- nnpdf_datafiles | 1 - validphys2/src/validphys/loader.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 120000 nnpdf_datafiles diff --git a/buildmaster/old_new_check.py b/buildmaster/old_new_check.py index c81efa8b2b..bd943592b7 100644 --- a/buildmaster/old_new_check.py +++ b/buildmaster/old_new_check.py @@ -25,7 +25,7 @@ from validphys.api import API from validphys.convolution import central_predictions -from validphys.datafiles import path_commondata as old_cd_root +from nnpdf_data import path_commondata as old_cd_root from validphys.loader import Loader dataset_names_path = old_cd_root.with_name("new_commondata") / "dataset_names.yml" diff --git a/buildmaster/oldcommondata_porter.py b/buildmaster/oldcommondata_porter.py index c89916601d..4603e4467b 100644 --- a/buildmaster/oldcommondata_porter.py +++ b/buildmaster/oldcommondata_porter.py @@ -13,7 +13,7 @@ from yaml import safe_dump, safe_load # Prepare the folders by automatically finding them from validphys -from validphys.datafiles import path_commondata as old_cd_root +from nnpdf_data import path_commondata as old_cd_root from validphys.loader import Loader # old_cd_root = validphys.datafiles / "commondata" diff --git a/nnpdf_datafiles b/nnpdf_datafiles deleted file mode 120000 index 8e4e1ae283..0000000000 --- a/nnpdf_datafiles +++ /dev/null @@ -1 +0,0 @@ -validphys2/src/validphys/datafiles \ No newline at end of file diff --git a/validphys2/src/validphys/loader.py b/validphys2/src/validphys/loader.py index bc8ccd155e..63dc2d76e4 100644 --- a/validphys2/src/validphys/loader.py +++ b/validphys2/src/validphys/loader.py @@ -39,7 +39,7 @@ TheoryIDSpec, peek_commondata_metadata, ) -from validphys.datafiles import path_vpdata +from nnpdf_data import path_vpdata from validphys.utils import tempfile_cleaner log = logging.getLogger(__name__)