Skip to content

Commit fe0ebd9

Browse files
authored
Refactor version extraction with regex
Updated version extraction logic from requirements.txt to use regex.
1 parent 9b94881 commit fe0ebd9

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

pretext/utils.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import logging
1717
import logging.handlers
1818
import psutil
19+
import re
1920
import typing as t
2021
from . import types as pt # PreTeXt types
2122
from lxml import etree as ET # noqa: N812
@@ -133,9 +134,10 @@ def requirements_version(dirpath: Optional[Path] = None) -> Optional[str]:
133134
return None
134135
try:
135136
with open(pp / "requirements.txt", "r") as f:
137+
REGEX = r"\s*pretext(book)?(\[.*\])?\s*==\s*(?P<version>[\d\.]*)\s*"gm
136138
for line in f.readlines():
137-
if ("pretext ==" in line) or ("pretextbook ==" in line):
138-
return line.split("==")[1].strip()
139+
if re.match(REGEX, line):
140+
return re.match(REGEX, line).group("version")
139141
except Exception as e:
140142
log.debug("Could not read `requirements.txt`:")
141143
log.debug(e)

0 commit comments

Comments
 (0)