From 01b0f5b57d75ceac71a74031d8ee91ca378433e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 07:27:01 +0000
Subject: [PATCH 1/3] Update luminescent requirement from ~=0.2.12 to
 >=0.2.12,<0.4.0

Updates the requirements on luminescent to permit the latest version.

---
updated-dependencies:
- dependency-name: luminescent
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 192d5bce..acb35433 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -84,7 +84,7 @@ klayout = [
   "vlsirtools"
 ]
 luminescent = [
-  "luminescent~=0.2.12",
+  "luminescent>=0.2.12,<0.4.0",
   "sortedcontainers"
 ]
 maintainer = [

From e1b6a0e6d80182ee9474bed8835d66157e869ee5 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 16:52:49 +0000
Subject: [PATCH 2/3] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/uv-pre-commit: 0.5.11 → 0.5.13](https://github.com/astral-sh/uv-pre-commit/compare/0.5.11...0.5.13)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4b54565a..645d14e2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -61,6 +61,6 @@ repos:
         additional_dependencies:
           - tomli
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.5.11
+    rev: 0.5.13
     hooks:
       - id: uv-lock

From 52ef00c5abc2d0f93440735bb76a1b2b91cd8023 Mon Sep 17 00:00:00 2001
From: Niko Savola <nikosavola@google.com>
Date: Tue, 31 Dec 2024 16:54:08 +0200
Subject: [PATCH 3/3] Fix X SPICE element parsing for Calibre-style model names

---
 gplugins/klayout/netlist_spice_reader.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gplugins/klayout/netlist_spice_reader.py b/gplugins/klayout/netlist_spice_reader.py
index 41620647..79a6a84b 100644
--- a/gplugins/klayout/netlist_spice_reader.py
+++ b/gplugins/klayout/netlist_spice_reader.py
@@ -54,7 +54,9 @@ def wants_subcircuit(self, name: str):
     @override
     def parse_element(self, s: str, element: str) -> kdb.ParseElementData:
         # Allow Calibre-style model name given as `$[model_name]` by removing the brackets
-        s = re.sub(r"\$\[([^\]]+)\]", r"\1", s)
+        # This is used for resistors and capacitors
+        if element != "X":
+            s = re.sub(r"\$\[([^\]]+)\]", r"\1", s)
 
         x_value, y_value = None, None
         if "$" in s: