Issue 66 parsing additional translations (OSIS)

.pre-commit-config.yaml

@@ -1,3 +1,6 @@
+ci:
+  skip: [mypy,sourcery]
+
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
@@ -14,3 +17,17 @@ repos:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix ]
       - id: ruff-format
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.10.0
+    hooks:
+      - id: mypy
+        args: ["--config-file", "pyproject.toml", "--ignore-missing-imports"]
+        #args: [--strict, --ignore-missing-imports]
+  - repo: https://github.com/sourcery-ai/sourcery
+    rev: v1.18.0
+    hooks:
+      - id: sourcery
+        # The best way to use Sourcery in a pre-commit hook:
+        # * review only changed lines:
+        # * omit the summary
+        args: [--diff=git diff HEAD, --no-summary]

pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 ]
 requires = [
     "defusedxml >=0.7.1",
-    "pythonbible ==0.10.0",
+    "pythonbible ==0.13.1",
 ]
 description-file = "README.md"
 requires-python = ">=3.8"
@@ -48,12 +48,7 @@ dev = [
 all = [
 ]
 
-[tool.isort]
-profile = "black"
-add_imports = "from __future__ import annotations"
-force_single_line = true
-
-[tool.ruff]
+[tool.ruff.lint]
 select = [
     "A",
     "ANN",
@@ -101,6 +96,7 @@ select = [
 ]
 ignore = [
     "ANN401",
+    "COM812",  # causes conflicts with the formmatter
     "D100",
     "D101",
     "D102",
@@ -112,15 +108,19 @@ ignore = [
     "FBT001",
     "FBT002",
     "FBT003",
+    "ISC001",  # causes conflicts with the formmatter
 ]
-fix = true
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "pythonbible_parser/osis/old_osis_parser.py" = ["B019", "PLR0913"]
 "pythonbible_parser/osis/osis_book_parser.py" = ["C901", "PLR0913"]
 "pythonbible_parser/osis/osis_parser.py" = ["PLR0913"]
 "tests/*.py" = ["S101"]
+"tests/bible_data_test.py" = ["ERA001"]
 "tests/conftest.py" = ["E501", "RUF"]
+"tests/public_domain_versions_test.py" = ["ERA001"]
+# TODO - remove this once code is fully implemented
+"pythonbible_parser/usfm/usfm_parser.py" = ["ANN001", "ANN101", "D105", "D107", "T201"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 force-single-line = true

pythonbible_parser/bible_parser.py

@@ -19,12 +19,14 @@ class BibleParser:
     parsers (e.g. OSIS, USFM, USFX, etc.) for parsing scripture text.
     """
 
+    version: Version
+
     def __init__(self: BibleParser, version: Version) -> None:
         """Initialize the Bible parser with the version.
 
         :param version:
         """
-        self.version: Version = version
+        self.version = version
 
     @abstractmethod
     def get_book_title(self: BibleParser, book: Book) -> str:

pythonbible_parser/osis/constants.py

@@ -5,7 +5,7 @@
 import pythonbible as bible
 
 # noinspection SpellCheckingInspection
-BOOK_IDS: dict[bible.Book, str] = MappingProxyType(
+BOOK_IDS: MappingProxyType[bible.Book, str] = MappingProxyType(
     {
         bible.Book.GENESIS: "Gen",
         bible.Book.EXODUS: "Exod",

pythonbible_parser/osis/old_osis_parser.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-import os
+import ast
 from functools import lru_cache
 from pathlib import Path
 from typing import Any
@@ -25,7 +25,7 @@
 from pythonbible_parser.osis.osis_utilities import parse_osis_id
 from pythonbible_parser.osis.osis_utilities import strip_namespace_from_tag
 
-XML_FOLDER: str = Path(Path(os.path.realpath(__file__)).parent / "versions")
+XML_FOLDER: Path = Path(__file__).parent / "versions"
 
 XPATH_BOOK: str = ".//xmlns:div[@osisID='{}']"
 XPATH_BOOK_TITLE: str = f"{XPATH_BOOK}/xmlns:title"
@@ -51,7 +51,7 @@ def __init__(self: OldOSISParser, version: Version) -> None:
         super().__init__(version)
 
         self.tree: ElementTree = ElementTree.parse(
-            Path(XML_FOLDER / f"{self.version.value.lower()}.xml"),
+            XML_FOLDER / f"{self.version.value.lower()}.xml",
         )
         self.namespaces: dict[str, str] = {
             "xmlns": get_namespace(self.tree.getroot().tag),
@@ -103,7 +103,9 @@ def get_scripture_passage_text(
         verse_ids_tuple: tuple[int, ...] = tuple(verse_ids)
 
         # keyword arguments
-        include_verse_number: bool = kwargs.get("include_verse_number", True)
+        include_verse_number: bool = ast.literal_eval(
+            str(kwargs.get("include_verse_number", True))
+        )
 
         return self._get_scripture_passage_text_memoized(
             verse_ids_tuple,
@@ -131,7 +133,9 @@ def verse_text(
             raise InvalidVerseError(msg)
 
         # keyword arguments
-        include_verse_number: bool = kwargs.get("include_verse_number", True)
+        include_verse_number: bool = ast.literal_eval(
+            str(kwargs.get("include_verse_number", True))
+        )
 
         return self._get_verse_text_memoized(verse_id, include_verse_number)