From 2df7b8297b76137f2557431a6f47322fb785fc6f Mon Sep 17 00:00:00 2001 From: David Almeida Date: Thu, 31 Oct 2024 15:28:37 +0100 Subject: [PATCH] Revert changes to validate-project testing --- nomenclature/testing.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/nomenclature/testing.py b/nomenclature/testing.py index ea0a8fff..8a4c689f 100644 --- a/nomenclature/testing.py +++ b/nomenclature/testing.py @@ -5,7 +5,6 @@ import yaml from nomenclature.definition import DataStructureDefinition -from nomenclature.config import NomenclatureConfig from nomenclature.processor import ( DataValidator, RegionProcessor, @@ -145,16 +144,12 @@ def assert_valid_structure( f"Definitions directory not found: {path / definitions}" ) - if not dimensions: # if "dimensions" were not specified - if path / "nomenclature.yaml" in path.iterdir(): - dimensions = NomenclatureConfig.from_file( - path / "nomenclature.yaml" - ).dimensions + if dimensions == (): # if "dimensions" were not specified + dimensions = [x.stem for x in (path / definitions).iterdir() if x.is_dir()] if not dimensions: - dimensions = [x.stem for x in (path / definitions).iterdir() if x.is_dir()] - if not dimensions: - raise FileNotFoundError(f"`definitions` directory is empty: {definitions}") - + raise FileNotFoundError( + f"`definitions` directory is empty: {path / definitions}" + ) _check_mappings(path, definitions, dimensions, mappings) _check_processor_directory( path,