From b8a12bf98cc1981dc48ea250544c4b6baab57611 Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Wed, 23 Oct 2024 17:05:29 +0200
Subject: [PATCH 01/22] The platform tag for windows seems to be win32 no
 matter the real CPU architecture.

---
 poetry.lock    | 2 +-
 pyproject.toml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index c12ea063..2dec19af 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2697,4 +2697,4 @@ cffi = ["cffi (>=1.11)"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10,<3.12"
-content-hash = "81e6e3d7a00acdc4f121b73a1a8155c5a955b6dd7e9420b20b6201c59974e3e5"
+content-hash = "4e898766796cdcf26d01c1ba36d64bd57ae8db650122cbf82136b161d7825bbf"
diff --git a/pyproject.toml b/pyproject.toml
index fc0b8630..5432c649 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,12 +51,12 @@ klayout = "^0.29.5"
 ngsolve = "^6.2.2404.post51"
 pydantic = "^2.8.2"
 openems = [
-    {path = "manifests/openEMS-0.0.36-cp310-cp310-win_amd64.whl", python = "~3.10", platform = "win64"},
-    {path = "manifests/openEMS-0.0.36-cp311-cp311-win_amd64.whl", python = "~3.11", platform = "win64"},
+    {path = "manifests/openEMS-0.0.36-cp310-cp310-win_amd64.whl", python = "~3.10", platform = "win32"},
+    {path = "manifests/openEMS-0.0.36-cp311-cp311-win_amd64.whl", python = "~3.11", platform = "win32"},
     ]
 csxcad = [
-    {path = "manifests/CSXCAD-0.6.3-cp310-cp310-win_amd64.whl", python = "~3.10", platform = "win64"},
-    {path = "manifests/CSXCAD-0.6.3-cp311-cp311-win_amd64.whl", python = "~3.11", platform = "win64"},
+    {path = "manifests/CSXCAD-0.6.3-cp310-cp310-win_amd64.whl", python = "~3.10", platform = "win32"},
+    {path = "manifests/CSXCAD-0.6.3-cp311-cp311-win_amd64.whl", python = "~3.11", platform = "win32"},
     ]
 h5py = "^3.11.0"
 

From 151719271fbf7df008cac41e96a1998111def23f Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Wed, 23 Oct 2024 17:22:19 +0200
Subject: [PATCH 02/22] add test for openEMS

---
 hades/wrappers/oems.py           | 17 ++++++++++++-----
 tests/test_wrappers/test_oems.py | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 tests/test_wrappers/test_oems.py

diff --git a/hades/wrappers/oems.py b/hades/wrappers/oems.py
index 7e159896..eab481e8 100644
--- a/hades/wrappers/oems.py
+++ b/hades/wrappers/oems.py
@@ -9,7 +9,7 @@
 from pathlib import Path
 from typing import Optional
 
-from pydantic import PositiveFloat, BaseModel
+from pydantic import confloat, BaseModel
 from typer import Typer
 
 from gdstk import read_gds
@@ -38,8 +38,8 @@
 
 
 class Frequency(BaseModel):
-    start: PositiveFloat = 0
-    stop: PositiveFloat
+    start: confloat(ge=0) = 0
+    stop: confloat(gt=0)
 
 
 @oems_app.command("run")
@@ -99,6 +99,9 @@ def compute(
     """
     unit = 1e-6  # all length in um
 
+    if type(freq) is tuple:
+        freq = Frequency(start=freq[0], stop=freq[1])
+
     ### Setup FDTD parameter & excitation function
     FDTD = openEMS(CoordSystem=0, EndCriteria=1e-4)  # init a rectangular FDTD
     if freq.start == freq.stop:
@@ -170,10 +173,13 @@ def compute(
 
     ### Export as a touchstone file
     f = np.linspace(freq.start, freq.stop, 401)
-    port.CalcPort(sim_path, f)
     result = Network()
     result.frequency = f
-    result.s = port.uf_ref / port.uf_inc
+    try:
+        port.CalcPort(sim_path, f)
+        result.s = port.uf_ref / port.uf_inc
+    except FileNotFoundError:
+        logging.error("Ports files not found, run the simulation first")
     return result
 
 
@@ -190,6 +196,7 @@ def make_geometry(
     :param margin: margin around the model. The simulation box is the bounding box of the model time (1 + margin).
     :return:
     """
+    logging.info(f"Creating geometry from {gds_file}")
     gdsii = read_gds(gds_file).cells[0]
 
     CSX = CSXCAD.ContinuousStructure()
diff --git a/tests/test_wrappers/test_oems.py b/tests/test_wrappers/test_oems.py
new file mode 100644
index 00000000..36ea7672
--- /dev/null
+++ b/tests/test_wrappers/test_oems.py
@@ -0,0 +1,14 @@
+from os.path import dirname
+from pathlib import Path
+
+from hades.wrappers.oems import compute, Frequency
+
+
+def test_compute(tmp_path):
+    compute(
+        Path(dirname(__file__)) / "../test_layouts/ref_ind2.gds",
+        "ind",
+        Frequency(start=0, stop=1e9),
+        sim_path=tmp_path,
+        skip_run=True,
+    )

From c84bc3c445c33be099514a1782ce9b36f0147959 Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:24:37 +0200
Subject: [PATCH 03/22] re-add dev group

needed for testing
---
 .github/workflows/python-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 9b00f352..54e55524 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -88,7 +88,7 @@ jobs:
     - name: Install Dependencies
       run: |
         poetry show --tree
-        poetry install
+        poetry install --with=dev
         poetry run pwd
     - name: Install PDK
       run: |

From cdead01db195bb1b1c8040d671c5f85ddfa43f2c Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:30:14 +0200
Subject: [PATCH 04/22] debugging

---
 .github/workflows/python-app.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 54e55524..9f6f793d 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -39,6 +39,7 @@ jobs:
 
   testing:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
 

From dca7a09c33c058d7bed5f892c33bfdb1c10505d1 Mon Sep 17 00:00:00 2001
From: Patarimi <mpqqch@gmail.com>
Date: Wed, 23 Oct 2024 20:14:16 +0200
Subject: [PATCH 05/22] skip test if openEMS not in PATH

---
 tests/test_wrappers/test_oems.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_wrappers/test_oems.py b/tests/test_wrappers/test_oems.py
index 36ea7672..aff69924 100644
--- a/tests/test_wrappers/test_oems.py
+++ b/tests/test_wrappers/test_oems.py
@@ -1,9 +1,12 @@
+import shutil
 from os.path import dirname
 from pathlib import Path
+import pytest
 
 from hades.wrappers.oems import compute, Frequency
 
 
+@pytest.skipif(shutil.which("openEMS"), reason="OpenEMS not found in PATH")
 def test_compute(tmp_path):
     compute(
         Path(dirname(__file__)) / "../test_layouts/ref_ind2.gds",

From dfdf9357a095fdf541fdbb1a197e7d94a9959142 Mon Sep 17 00:00:00 2001
From: Patarimi <mpqqch@gmail.com>
Date: Wed, 23 Oct 2024 20:14:32 +0200
Subject: [PATCH 06/22] add openEMS to nix

---
 shell.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shell.nix b/shell.nix
index 7dadcfb8..c26e8dbd 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,6 +7,7 @@ in
 pkgs.mkShellNoCC {
   packages = with pkgs; [
     magic-vlsi
+    openems
   ];
 
   shellHook =

From 1974236c0813b04580bb0a63b3c024dabe726373 Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 08:21:47 +0200
Subject: [PATCH 07/22] explicitly install CSXCAD and openEMS

---
 .github/workflows/python-app.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 9f6f793d..79bc0410 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -100,6 +100,8 @@ jobs:
       run: |
         poetry run volare enable --pdk sky130 --pdk-root ./pdk 6d4d11780c40b20ee63cc98e645307a9bf2b2ab8
         poetry run volare enable --pdk gf180mcu --pdk-root ./pdk 6d4d11780c40b20ee63cc98e645307a9bf2b2ab8
+        poetry run pip install .\manifests\openEMS-0.0.36-cp310-cp310-win_amd64.whl
+        poetry run pip install .\manifests\CSXCAD-0.0.36-cp310-cp310-win_amd64.whl
         poetry run volare ls
     - if: ${{ steps.pdk-restore.outputs.cache-hit != 'true' }}
       name: Save PDK Directory

From f2c8b17421c7360a3c2c8dec9f6423eaadbf25f5 Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 08:39:35 +0200
Subject: [PATCH 08/22] rename artifacts to avoid name-conflict

---
 .github/workflows/python-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 79bc0410..5bee31f5 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -118,7 +118,7 @@ jobs:
       if: failure()
       uses: actions/upload-artifact@v4
       with:
-        name: reports
+        name: reports-${{ matrix.os }}
         path: |
           tmp/
           pytest.log

From 9d051910a46214317e0074e40b66448201104275 Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 08:48:36 +0200
Subject: [PATCH 09/22] update CSXCAD path

---
 .github/workflows/python-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 5bee31f5..2ea6bf1f 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -101,7 +101,7 @@ jobs:
         poetry run volare enable --pdk sky130 --pdk-root ./pdk 6d4d11780c40b20ee63cc98e645307a9bf2b2ab8
         poetry run volare enable --pdk gf180mcu --pdk-root ./pdk 6d4d11780c40b20ee63cc98e645307a9bf2b2ab8
         poetry run pip install .\manifests\openEMS-0.0.36-cp310-cp310-win_amd64.whl
-        poetry run pip install .\manifests\CSXCAD-0.0.36-cp310-cp310-win_amd64.whl
+        poetry run pip install .\manifests\CSXCAD-0.6.3-cp310-cp310-win_amd64.whl
         poetry run volare ls
     - if: ${{ steps.pdk-restore.outputs.cache-hit != 'true' }}
       name: Save PDK Directory

From 921254df96c6552940b107b22b3a211e10a7dccc Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 09:22:49 +0200
Subject: [PATCH 10/22] skip openEMS testing if OpenEMS is not in PATH

---
 tests/test_wrappers/test_oems.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_wrappers/test_oems.py b/tests/test_wrappers/test_oems.py
index aff69924..8c7757c5 100644
--- a/tests/test_wrappers/test_oems.py
+++ b/tests/test_wrappers/test_oems.py
@@ -6,7 +6,7 @@
 from hades.wrappers.oems import compute, Frequency
 
 
-@pytest.skipif(shutil.which("openEMS"), reason="OpenEMS not found in PATH")
+@pytest.mark.skipif(shutil.which("openEMS") is None, reason="OpenEMS not found in PATH")
 def test_compute(tmp_path):
     compute(
         Path(dirname(__file__)) / "../test_layouts/ref_ind2.gds",

From d85dd84e8f6f13ae3da1c1ccb74ecb54af7405eb Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 09:39:09 +0200
Subject: [PATCH 11/22] add debugging infos

---
 hades/wrappers/oems.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hades/wrappers/oems.py b/hades/wrappers/oems.py
index eab481e8..6f666e4a 100644
--- a/hades/wrappers/oems.py
+++ b/hades/wrappers/oems.py
@@ -23,10 +23,12 @@
 if shutil.which("openEMS"):
     if "OPENEMS_INSTALL_PATH" not in os.environ:
         os.environ["OPENEMS_INSTALL_PATH"] = dirname(shutil.which("openEMS"))
-    from CSXCAD import CSXCAD
-    from openEMS.openEMS import openEMS
 else:
     logging.error("openEMS not found")
+    paths = os.environ["PATH"].split(";" if os.name == "nt" else ":")
+    [logging.info(f"{p}") for p in paths]
+from CSXCAD import CSXCAD
+from openEMS.openEMS import openEMS
 
 from hades.layouts.tools import Port
 

From 5ce536942813867b4c5d014e1e10b4e736e758fc Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 09:47:13 +0200
Subject: [PATCH 12/22] windows should be working now -_-

---
 .github/workflows/python-app.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 2ea6bf1f..c2808b30 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -64,9 +64,9 @@ jobs:
         dir
         winget settings --enable LocalManifestFiles
         winget install -m .\manifests\n\NGSpice\NGSpice\42
-        # winget install -m .\manifests\o\OpenEMS\OpenEMS\0.0.36
+        winget install -m .\manifests\o\OpenEMS\OpenEMS\0.0.36
         Add-Content $env:GITHUB_PATH "$env:LOCALAPPDATA\Microsoft\WinGet\Packages\NGSpice.NGSpice__DefaultSource\Spice64\bin"
-        # Add-Content $env:GITHUB_PATH "$env:LOCALAPPDATA\Microsoft\WinGet\Packages\OpenEMS.OpenEMS__DefaultSource\OpenEMS"
+        Add-Content $env:GITHUB_PATH "$env:LOCALAPPDATA\Microsoft\WinGet\Packages\OpenEMS.OpenEMS__DefaultSource\OpenEMS"
     - name: Install Nix for Ubuntu
       if: ${{runner.os != 'Windows' }}
       uses: cachix/install-nix-action@v30

From 246cea56820969ad797c28e0c0bac87a60a7a32f Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 10:45:42 +0200
Subject: [PATCH 13/22] small roll-back to be re-added when linux installation
 is fixed.

---
 hades/wrappers/oems.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hades/wrappers/oems.py b/hades/wrappers/oems.py
index 6f666e4a..465c2bfc 100644
--- a/hades/wrappers/oems.py
+++ b/hades/wrappers/oems.py
@@ -23,12 +23,12 @@
 if shutil.which("openEMS"):
     if "OPENEMS_INSTALL_PATH" not in os.environ:
         os.environ["OPENEMS_INSTALL_PATH"] = dirname(shutil.which("openEMS"))
+    from CSXCAD import CSXCAD
+    from openEMS.openEMS import openEMS
 else:
     logging.error("openEMS not found")
     paths = os.environ["PATH"].split(";" if os.name == "nt" else ":")
     [logging.info(f"{p}") for p in paths]
-from CSXCAD import CSXCAD
-from openEMS.openEMS import openEMS
 
 from hades.layouts.tools import Port
 
@@ -190,7 +190,7 @@ def make_geometry(
     tech: str = "mock",
     *,
     margin: float = 0.2,
-) -> CSXCAD.ContinuousStructure:
+):
     """
     Create a geometry in OpenEMS from a gds and a technology.
     :param gds_file: The input gds file (the top cell is used by default).

From 2c114a3055d8ce5060ffb260b9f06b07f02980ea Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:19:00 +0200
Subject: [PATCH 14/22] install openEMS through nix

---
 .github/workflows/python-app.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index c2808b30..41534c8c 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -79,6 +79,7 @@ jobs:
         sudo apt-get install -y ngspice
         nix-channel --update
         nix-channel --list
+        nix-env -iA nixpkgs.openems
     - name: Install poetry
       run: pipx install poetry
     - name: Set up Python 3.10

From 68ae007182193218d9c7ee585b2c2feb8bf09924 Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:26:45 +0200
Subject: [PATCH 15/22] should've read the doc

https://github.com/cachix/install-nix-action
---
 .github/workflows/python-app.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 41534c8c..8e5a3006 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -39,7 +39,7 @@ jobs:
 
   testing:
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
 
@@ -79,7 +79,7 @@ jobs:
         sudo apt-get install -y ngspice
         nix-channel --update
         nix-channel --list
-        nix-env -iA nixpkgs.openems
+        nix-env -i openems -f '<nixpkgs>'
     - name: Install poetry
       run: pipx install poetry
     - name: Set up Python 3.10

From 7c49250c4c6025dc8f7a2f880a7c9eb910fcfb9c Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:29:28 +0200
Subject: [PATCH 16/22] Revert "small roll-back to be re-added when linux
 installation is fixed."

This reverts commit 246cea56820969ad797c28e0c0bac87a60a7a32f.
---
 hades/wrappers/oems.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hades/wrappers/oems.py b/hades/wrappers/oems.py
index 465c2bfc..6f666e4a 100644
--- a/hades/wrappers/oems.py
+++ b/hades/wrappers/oems.py
@@ -23,12 +23,12 @@
 if shutil.which("openEMS"):
     if "OPENEMS_INSTALL_PATH" not in os.environ:
         os.environ["OPENEMS_INSTALL_PATH"] = dirname(shutil.which("openEMS"))
-    from CSXCAD import CSXCAD
-    from openEMS.openEMS import openEMS
 else:
     logging.error("openEMS not found")
     paths = os.environ["PATH"].split(";" if os.name == "nt" else ":")
     [logging.info(f"{p}") for p in paths]
+from CSXCAD import CSXCAD
+from openEMS.openEMS import openEMS
 
 from hades.layouts.tools import Port
 
@@ -190,7 +190,7 @@ def make_geometry(
     tech: str = "mock",
     *,
     margin: float = 0.2,
-):
+) -> CSXCAD.ContinuousStructure:
     """
     Create a geometry in OpenEMS from a gds and a technology.
     :param gds_file: The input gds file (the top cell is used by default).

From f7d799dcd39cdab99781d0f9a820160e18c8ae91 Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:36:35 +0200
Subject: [PATCH 17/22] install python package instead of stand-alone software

---
 .github/workflows/python-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 8e5a3006..917ad370 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -79,7 +79,7 @@ jobs:
         sudo apt-get install -y ngspice
         nix-channel --update
         nix-channel --list
-        nix-env -i openems -f '<nixpkgs>'
+        nix-env -i python-openems -f '<nixpkgs>'
     - name: Install poetry
       run: pipx install poetry
     - name: Set up Python 3.10

From cc7756e694c5e1c294ae1c3373ef2814a772ab1f Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:46:06 +0200
Subject: [PATCH 18/22] change name of package

---
 .github/workflows/python-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 917ad370..c0a9cc9e 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -79,7 +79,7 @@ jobs:
         sudo apt-get install -y ngspice
         nix-channel --update
         nix-channel --list
-        nix-env -i python-openems -f '<nixpkgs>'
+        nix-env -i python311Packages.python-openems -f '<nixpkgs>'
     - name: Install poetry
       run: pipx install poetry
     - name: Set up Python 3.10

From f205b5d9d0fd6451dbba05da475056df14451297 Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 20:48:10 +0200
Subject: [PATCH 19/22] revert openems install

---
 .github/workflows/python-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index c0a9cc9e..8e5a3006 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -79,7 +79,7 @@ jobs:
         sudo apt-get install -y ngspice
         nix-channel --update
         nix-channel --list
-        nix-env -i python311Packages.python-openems -f '<nixpkgs>'
+        nix-env -i openems -f '<nixpkgs>'
     - name: Install poetry
       run: pipx install poetry
     - name: Set up Python 3.10

From a9471aeaf367c7794f834e689b88052f74fd0232 Mon Sep 17 00:00:00 2001
From: Patarimi <mpqqch@gmail.com>
Date: Thu, 24 Oct 2024 20:59:02 +0200
Subject: [PATCH 20/22] handle missing CSXCAD package

---
 hades/wrappers/oems.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hades/wrappers/oems.py b/hades/wrappers/oems.py
index 6f666e4a..12f8a623 100644
--- a/hades/wrappers/oems.py
+++ b/hades/wrappers/oems.py
@@ -27,8 +27,12 @@
     logging.error("openEMS not found")
     paths = os.environ["PATH"].split(";" if os.name == "nt" else ":")
     [logging.info(f"{p}") for p in paths]
-from CSXCAD import CSXCAD
-from openEMS.openEMS import openEMS
+try:
+    from CSXCAD import CSXCAD
+    from openEMS.openEMS import openEMS
+except ImportError:
+    logging.error("CSXCAD or openEMS not found")
+
 
 from hades.layouts.tools import Port
 

From 5ab660d77339b81a998a6429117c15f427291da4 Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:03:08 +0200
Subject: [PATCH 21/22] Update oems.py

---
 hades/wrappers/oems.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hades/wrappers/oems.py b/hades/wrappers/oems.py
index 12f8a623..baf68966 100644
--- a/hades/wrappers/oems.py
+++ b/hades/wrappers/oems.py
@@ -194,7 +194,7 @@ def make_geometry(
     tech: str = "mock",
     *,
     margin: float = 0.2,
-) -> CSXCAD.ContinuousStructure:
+):
     """
     Create a geometry in OpenEMS from a gds and a technology.
     :param gds_file: The input gds file (the top cell is used by default).

From 936a53f111a3d89af337b886090e4981d2de8dce Mon Sep 17 00:00:00 2001
From: Patarimi <38954040+Patarimi@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:10:17 +0200
Subject: [PATCH 22/22] remove openems in linux for now

---
 .github/workflows/python-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 8e5a3006..ed7974df 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -79,7 +79,7 @@ jobs:
         sudo apt-get install -y ngspice
         nix-channel --update
         nix-channel --list
-        nix-env -i openems -f '<nixpkgs>'
+        # nix-env -i openems -f '<nixpkgs>'
     - name: Install poetry
       run: pipx install poetry
     - name: Set up Python 3.10