Merge branch 'develop' into drift-manager/develop/pr

jvanderaa · claude · jvanderaa · commit 6c9f0626f58f · 2026-03-17T20:30:22.000-05:00
Resolve poetry.lock conflict after lxml version update (#394) merged into develop. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
diff --git a/changes/393.dependencies b/changes/393.dependencies
@@ -0,0 +1 @@
+Pinning lxml version to support >=4.6.2,<7
diff --git a/circuit_maintenance_parser/parser.py b/circuit_maintenance_parser/parser.py
@@ -208,7 +208,7 @@ def parse_html(
     def clean_line(line):
         """Clean up of undesired characters from Html."""
         try:
-            return line.text.strip()
+            return line.text.strip().replace("\r\n", "\n").replace("\r", "\n")
         except AttributeError:
             return line.strip().replace("\r\n", "\n").replace("\r", "\n")
 
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,7 +29,7 @@ click = ">=7.1, <9.0"
 pydantic = ">=1.10.4,<3"
 icalendar = "^5.0.0"
 bs4 = "^0.0.2"
-lxml = ">=6.0.2"
+lxml = ">=4.6.2,<7"
 geopy = "^2.1.0"
 timezonefinder = ">=6.0.1,<9.0.0"
 backoff = "^2.2.1"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Pinning lxml version to support >=4.6.2,<7`