From 9bc8a23f58241a118a3bc73adf42fec5d2af7702 Mon Sep 17 00:00:00 2001 From: Christoph Ladurner Date: Tue, 25 Jul 2023 13:10:40 +0200 Subject: [PATCH] setup: remove python3.11 support (cchardet) * and fix tests --- invenio_moodle/convert.py | 2 +- setup.cfg | 1 - tests/data/lom_metadata.json | 123 ++++++++--------------------------- tests/test_convert.py | 8 ++- 4 files changed, 34 insertions(+), 100 deletions(-) diff --git a/invenio_moodle/convert.py b/invenio_moodle/convert.py index bce46e3..3c79894 100644 --- a/invenio_moodle/convert.py +++ b/invenio_moodle/convert.py @@ -165,7 +165,7 @@ def visit_resourcetype(self, value: str, record: LOMMetadata) -> None: """Visit resourcetype.""" # https://skohub.io/dini-ag-kim/hcrt/heads/master/w3id.org/kim/hcrt/slide.en.html learningresourcetype_by_resourcetype = { - "No selection": "other", + "no selection": "other", "noselection": "other", "presentationslide": "slide", "exercise": "assessment", diff --git a/setup.cfg b/setup.cfg index 9d3f074..a12aa7a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,6 @@ classifiers = Topic :: Software Development :: Libraries :: Python Modules Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 [options] include_package_data = True diff --git a/tests/data/lom_metadata.json b/tests/data/lom_metadata.json index 9b1ea32..a6851a0 100644 --- a/tests/data/lom_metadata.json +++ b/tests/data/lom_metadata.json @@ -23,6 +23,33 @@ } } }, + "educational": { + "learningresourcetype": [ + { + "source": { + "langstring": { + "#text": "https://w3id.org/kim/hcrt/scheme", + "lang": "x-none" + } + }, + "id": "https://w3id.org/kim/hcrt/other", + "entry": [ + { + "langstring": { + "#text": "Sonstiges", + "lang": "de" + } + }, + { + "langstring": { + "#text": "Other", + "lang": "en" + } + } + ] + } + ] + }, "general": { "language": [ "de" @@ -297,102 +324,6 @@ "datetime": "2023" } } - }, - { - "course": { - "identifier": [ - { - "catalog": "teachcenter-course-id", - "entry": { - "langstring": { - "#text": "moodlecourse-475", - "lang": "x-none" - } - } - }, - { - "catalog": "tugrazonline-id", - "entry": { - "langstring": { - "#text": "0", - "lang": "x-none" - } - } - } - ], - "title": { - "langstring": { - "#text": "[INR02412UF] AK Technology Enhanced Learning (SS)", - "lang": "x-none" - } - }, - "keyword": [ - { - "langstring": { - "#text": "", - "lang": "x-none" - } - } - ], - "description": [ - { - "langstring": { - "#text": "", - "lang": "x-none" - } - } - ], - "contribute": [ - { - "role": { - "source": { - "langstring": { - "#text": "LOMv1.0", - "lang": "x-none" - } - }, - "value": { - "langstring": { - "#text": "Unknown", - "lang": "x-none" - } - } - }, - "entity": [ - "" - ] - }, - { - "role": { - "source": { - "langstring": { - "#text": "LOMv1.0", - "lang": "x-none" - } - }, - "value": { - "langstring": { - "#text": "Author", - "lang": "x-none" - } - } - }, - "entity": [ - "Martin Ebner" - ] - } - ], - "language": [ - "" - ], - "version": { - "langstring": { - "#text": "SS 2023", - "lang": "x-none" - }, - "datetime": "2023" - } - } } ] } diff --git a/tests/test_convert.py b/tests/test_convert.py index 1ccbb9d..f1cb400 100644 --- a/tests/test_convert.py +++ b/tests/test_convert.py @@ -7,6 +7,8 @@ """Module test convert.""" +from invenio_records_lom.utils import LOMMetadata + from invenio_moodle.convert import convert_moodle_to_lom @@ -15,6 +17,8 @@ def test_convert_moodle_to_lom( expected_lom_metadata: dict, ) -> None: """Test convert_unit_metadata.""" - metadata = convert_moodle_to_lom(minimal_record) + del minimal_record["courses"][1] - assert metadata.json == expected_lom_metadata + lom_metadata = LOMMetadata({}, overwritable=True) + convert_moodle_to_lom(minimal_record, lom_metadata) + assert lom_metadata.json == expected_lom_metadata