From 58dc0db1c10710a25324ad5685b32e436479bfe0 Mon Sep 17 00:00:00 2001
From: htfab <mpw@htamas.net>
Date: Mon, 17 Jun 2024 04:12:01 +0200
Subject: [PATCH] fix: resolve version conflicts gdstk<->numpy &
 openlane2<->klayout

---
 .gitignore                |  1 +
 precheck/pyproject.toml   | 14 ++++++++++++++
 precheck/requirements.txt | 28 ++++++++++++++++++++++++----
 pyproject.toml            |  3 ++-
 requirements.txt          |  6 ++++--
 5 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 precheck/pyproject.toml

diff --git a/.gitignore b/.gitignore
index 5292f45..db37d93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *swp
 setuptokens.sh
 __pycache__
+*.egg-info
diff --git a/precheck/pyproject.toml b/precheck/pyproject.toml
new file mode 100644
index 0000000..cf0a928
--- /dev/null
+++ b/precheck/pyproject.toml
@@ -0,0 +1,14 @@
+[project]
+name = "tt-precheck"
+requires-python = ">=3.11"
+dynamic = ["version"]
+dependencies = [
+    "klayout>=0.28.17.post1,<0.29.0",
+    "gdstk",
+    "numpy<2",
+    "pytest",
+    "PyYAML",
+]
+
+[tool.setuptools]
+packages = []
diff --git a/precheck/requirements.txt b/precheck/requirements.txt
index 8222ced..0f9160b 100644
--- a/precheck/requirements.txt
+++ b/precheck/requirements.txt
@@ -1,4 +1,24 @@
-klayout==0.29.0
-gdstk==0.9.50
-pytest==7.4.3
-PyYAML==6.0.1
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile
+#
+gdstk==0.9.52
+    # via tt-precheck (pyproject.toml)
+iniconfig==2.0.0
+    # via pytest
+klayout==0.28.17.post1
+    # via tt-precheck (pyproject.toml)
+numpy==1.26.4
+    # via
+    #   gdstk
+    #   tt-precheck (pyproject.toml)
+packaging==24.1
+    # via pytest
+pluggy==1.5.0
+    # via pytest
+pytest==8.2.2
+    # via tt-precheck (pyproject.toml)
+pyyaml==6.0.1
+    # via tt-precheck (pyproject.toml)
diff --git a/pyproject.toml b/pyproject.toml
index d17909e..a20d05b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,8 +8,9 @@ dependencies = [
     "cocotb",
     "gdstk",
     "GitPython",
-    "klayout",
+    "klayout>=0.28.17.post1,<0.29.0",
     "mistune",
+    "numpy<2",
     "pre-commit",
     "pytest",
     "python-frontmatter",
diff --git a/requirements.txt b/requirements.txt
index 8b2130e..18f30ad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -46,14 +46,16 @@ importlib-resources==6.4.0
     # via wasmtime
 iniconfig==2.0.0
     # via pytest
-klayout==0.29.2
+klayout==0.28.17.post1
     # via tt-support-tools (pyproject.toml)
 mistune==3.0.2
     # via tt-support-tools (pyproject.toml)
 nodeenv==1.9.1
     # via pre-commit
 numpy==1.26.4
-    # via gdstk
+    # via
+    #   gdstk
+    #   tt-support-tools (pyproject.toml)
 packaging==24.1
     # via pytest
 pillow==10.3.0