Skip to content

Commit

Permalink
Rename repository attribute in Code
Browse files Browse the repository at this point in the history
  • Loading branch information
dc-almeida committed Jan 15, 2025
1 parent c62da7f commit 066c805
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion nomenclature/code.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Code(BaseModel):
description: str | None = None
file: str | Path | None = None
extra_attributes: dict[str, Any] = {}
repository: str | None = None
from_external_repository: str | None = None

def __eq__(self, other) -> bool:
return self.model_dump(exclude="file") == other.model_dump(exclude="file")
Expand Down
6 changes: 3 additions & 3 deletions nomenclature/codelist.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def _parse_codelist_dir(
code = cls.code_basis.from_dict(code_dict)
code.file = yaml_file.relative_to(path.parent).as_posix()
if repository:
code.repository = repository
code.from_external_repository = repository
code_list.append(code)

code_list = cls._parse_and_replace_tags(code_list, path, file_glob_pattern)
Expand Down Expand Up @@ -358,7 +358,7 @@ def _check_string(value):
_check_string(item)

for code in self.mapping.values():
if not code.repository:
if not code.from_external_repository:
for value in code.model_dump(exclude="file").values():
_check_string(value)
if errors:
Expand Down Expand Up @@ -845,7 +845,7 @@ def _parse_region_code_dir(
code = RegionCode.from_dict(item)
code.hierarchy = top_key
if repository:
code.repository = repository
code.from_external_repository = repository
code.file = yaml_file.relative_to(path.parent).as_posix()
code_list.append(code)

Expand Down
10 changes: 8 additions & 2 deletions tests/test_codelist.py
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,14 @@ def test_multiple_external_repos():
for repo in nomenclature_config.repositories.values()
)
assert len(variable_code_list) > 2000
assert variable_code_list["Final Energy"].repository == "common-definitions"
assert variable_code_list["Employment"].repository == "legacy-definitions"
assert (
variable_code_list["Final Energy"].from_external_repository
== "common-definitions"
)
assert (
variable_code_list["Employment"].from_external_repository
== "legacy-definitions"
)
finally:
clean_up_external_repos(nomenclature_config.repositories)

Expand Down

0 comments on commit 066c805

Please sign in to comment.