Skip to content

Commit

Permalink
Merge pull request #2 from Narodni-repozitar/unified-vocabularies
Browse files Browse the repository at this point in the history
unified vocabularies
  • Loading branch information
mesemus authored Mar 13, 2023
2 parents 07ef190 + 8bbf159 commit 79c3fdd
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 126 deletions.
File renamed without changes.
33 changes: 17 additions & 16 deletions nr_vocabularies/fixtures/catalogue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ vocabulary-access-rights:
title:
cs: Přístupová práva
en: Access rights
- source: accessRights.xlsx
- source: access-rights.xlsx

vocabulary-contributor-types:
vocabulary-contributor-roles:
- writer: vocabulary
vocabulary: contributor-types
vocabulary: contributor-roles
pid_type: v-ct
title:
cs: Role přispěvatele
en: Contributor Type
- source: contributorType.xlsx
- source: contributor-roles.xlsx

vocabulary-countries:
- writer: vocabulary
Expand Down Expand Up @@ -50,7 +50,7 @@ vocabulary-item-relation-types:
title:
cs: Typ vztahu popisovaného dokumentu k propojené jednotce
en: The type of relationship of the described document to the interconnected item (unit)
- source: itemRelationType.xlsx
- source: item-relation-types.xlsx

vocabulary-languages:
- writer: vocabulary
Expand All @@ -77,16 +77,7 @@ vocabulary-resource-types:
title:
cs: Typ zdroje
en: Resource type
- source: resourceType.xlsx

vocabulary-related-resource-types:
- writer: vocabulary
vocabulary: related-resource-types
pid_type: v-rel
title:
cs: Typ přidruženého zdroje
en: Related resource type
- source: resourceType_relatedItem.xlsx
- source: resource-types.xlsx

vocabulary-subject-categories:
- writer: vocabulary
Expand All @@ -95,4 +86,14 @@ vocabulary-subject-categories:
title:
cs: Oborové třídění
en: Subject categories
- source: subjectCategories.xlsx
- source: subject-categories.xlsx

# not ok
# vocabulary-related-resource-types:
# - writer: vocabulary
# vocabulary: related-resource-types
# pid_type: v-rel
# title:
# cs: Typ přidruženého zdroje
# en: Related resource type
# - source: resourceType_relatedItem.xlsx
Binary file removed nr_vocabularies/fixtures/institutions_old.xlsx
Binary file not shown.
107 changes: 0 additions & 107 deletions nr_vocabularies/fixtures/onetime_transform_institutions.py

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[metadata]
name = nr-vocabularies
version = 2.0.0
version = 2.0.1
description = A sample application for nr_vocabularies
long_description = Model builder plugin containing model definition of nr-vocabularies
authors = Alzbeta Pokorna <[email protected]>
Expand Down
3 changes: 1 addition & 2 deletions tests/test_import_export.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import tempfile

from invenio_vocabularies.records.api import Vocabulary
Expand All @@ -9,7 +8,7 @@ def test_complex_import_export(app, db, cache, search_clear, vocab_cf):
result = load_fixtures()
assert result.failed_count == 0
assert result.skipped_count == 0
assert len(result.results) == 11
assert len(result.results) == 10
Vocabulary.index.refresh()
with tempfile.TemporaryDirectory() as d:
dump_result = dump_fixtures(d)
Expand Down

0 comments on commit 79c3fdd

Please sign in to comment.