Merge branch 'master' of github.com:SDXorg/pysd into skip_cov

SDXorg · Jun 27, 2024 · 38abeaf · 38abeaf
2 parents 5b68208 + 10d5972
commit 38abeaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pysd/translators/vensim/parsing_grammars/sketch.peg b/pysd/translators/vensim/parsing_grammars/sketch.peg
@@ -35,7 +35,7 @@ other_objects = other_objects_code "," anything
 
 # fonts
 font_properties = font_name? "|" font_size? "|" font_style? "|" color
-font_style =  "B" / "I" / "U" / "S" / "V"  # italics, bold, underline, etc
+font_style =  ("B" / "I" / "U" / "S" / "V")+  # italics, bold, underline, etc
 font_size =  ~r"\d+"  # this needs to be made a regex to match any font
 font_name = ~r"(?<=,)[^\|\d]+(?=\|)"
 

diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,7 @@ lxml
 regex
 chardet
 black
-openpyxl>=3.1
+openpyxl>=3.1.2
 scipy
 progressbar2
 portion