Fix: #23. Use a separate virtuoso instance. Add tests. Add skills.

par-tec · May 7, 2024 · 9d2598c · 9d2598c
1 parent 5ca9974
commit 9d2598c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/esco/esco.json.gz b/esco/esco.json.gz
diff --git a/esco/esco_o.json.gz b/esco/esco_o.json.gz
diff --git a/esco/esco_s.json.gz b/esco/esco_s.json.gz
diff --git a/tests/test_localdb_base.py b/tests/test_localdb_base.py
@@ -40,7 +40,10 @@ def test_get_skill(db):
     assert skill["skillType"] == "skill"
 
 
-def test_search_skill_label(db):
-    products = {"ansible", "JBoss", "Bash"}
+@pytest.mark.parametrize(
+    "products,expected_results",
+    [({"ansible", "JBoss", "Bash"}, 3), ({"agile", "scrum", "kanban"}, 1)],
+)
+def test_search_skill_label(db, products, expected_results):
     skills = db.search_products(products)
-    assert len(skills) >= 3
+    assert len(skills) >= expected_results
diff --git a/tox.ini b/tox.ini
@@ -28,6 +28,11 @@ commands =
   python -m pytest tests/ {posargs}
 
 
+#
+# Install in the tox environment all dependencies
+#  and run the model generation.
+#  Note that this won't run tests.
+#
 [testenv:model]
 deps =
   .
@@ -42,12 +47,16 @@ allowlist_externals =
 sitepackages = True
 
 commands_pre =
-  python -m spacy download en_core_web_trf
+  # Eventually download en_core_web_trf.
+  python -c "import spacy; m='en_core_web_trf'; spacy.util.is_package(m) or spacy.cli.download(m)"
+  # Ensure sparql is populated.
+  pytest tests/test_sparql.py
 
 commands =
   python model/model.py
   rm generated/output -fr
   mkdir -p generated/output
+  pytest tests/test_localdb_base.py
   python -m spacy package ./generated/en_core_web_trf_esco_ner ./generated/output --build wheel
 
   bash -c '[ "{posargs}" == "upload" ] && python -m spacy huggingface-hub push generated/output/en_core_web_trf_esco_ner*/dist/*.whl'