gdsfactory · joamatab · Apr 12, 2024 · Apr 11, 2024 · Apr 11, 2024 · Apr 12, 2024
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,8 +15,8 @@ classifiers = [
   "Operating System :: OS Independent"
 ]
 dependencies = [
-  "gdsfactory==7.22.2",
-  "gplugins[tidy3d,sax,schematic]>=0.11,<0.12"
+  "gdsfactory==7.23.0",
+  "gplugins[tidy3d,sax,schematic]>=0.12,<0.13"
 ]
 description = "ubcpdk pdk"
 keywords = ["python"]

diff --git a/tests/ref/_ebeam_BondPad.gds b/tests/ref/_ebeam_BondPad.gds
diff --git a/tests/ref/_ebeam_adiabatic_te1550.gds b/tests/ref/_ebeam_adiabatic_te1550.gds
diff --git a/tests/ref/_ebeam_adiabatic_tm1550.gds b/tests/ref/_ebeam_adiabatic_tm1550.gds
diff --git a/tests/ref/_ebeam_bdc_te1550.gds b/tests/ref/_ebeam_bdc_te1550.gds
diff --git a/tests/ref/_ebeam_bdc_tm1550.gds b/tests/ref/_ebeam_bdc_tm1550.gds
diff --git a/tests/ref/_ebeam_crossing4.gds b/tests/ref/_ebeam_crossing4.gds
diff --git a/tests/ref/_ebeam_splitter_adiabatic_swg_te1550.gds b/tests/ref/_ebeam_splitter_adiabatic_swg_te1550.gds
diff --git a/tests/ref/_ebeam_splitter_swg_assist_te1310.gds b/tests/ref/_ebeam_splitter_swg_assist_te1310.gds
diff --git a/tests/ref/_ebeam_splitter_swg_assist_te1550.gds b/tests/ref/_ebeam_splitter_swg_assist_te1550.gds
diff --git a/tests/ref/_ebeam_swg_edgecoupler.gds b/tests/ref/_ebeam_swg_edgecoupler.gds
diff --git a/tests/ref/_ebeam_terminator_te1310.gds b/tests/ref/_ebeam_terminator_te1310.gds
diff --git a/tests/ref/_ebeam_terminator_te1550.gds b/tests/ref/_ebeam_terminator_te1550.gds
diff --git a/tests/ref/_ebeam_terminator_tm1550.gds b/tests/ref/_ebeam_terminator_tm1550.gds
diff --git a/tests/ref/_ebeam_y_1550.gds b/tests/ref/_ebeam_y_1550.gds
diff --git a/tests/ref/_ebeam_y_adiabatic.gds b/tests/ref/_ebeam_y_adiabatic.gds
diff --git a/tests/ref/_ebeam_y_adiabatic_1310.gds b/tests/ref/_ebeam_y_adiabatic_1310.gds
diff --git a/tests/ref/_metal_via_15.gds b/tests/ref/_metal_via_15.gds
diff --git a/tests/ref/_photonic_wirebond_surfacetaper_1310.gds b/tests/ref/_photonic_wirebond_surfacetaper_1310.gds
diff --git a/tests/ref/_photonic_wirebond_surfacetaper_1550.gds b/tests/ref/_photonic_wirebond_surfacetaper_1550.gds
diff --git a/tests/ref/_thermal_phase_shifter_multimode_500um.gds b/tests/ref/_thermal_phase_shifter_multimode_500um.gds
diff --git a/tests/ref/_thermal_phase_shifter_te_1310_500um.gds b/tests/ref/_thermal_phase_shifter_te_1310_500um.gds
diff --git a/tests/ref/_thermal_phase_shifter_te_1310_500um_lowloss.gds b/tests/ref/_thermal_phase_shifter_te_1310_500um_lowloss.gds
diff --git a/tests/ref/_thermal_phase_shifter_te_1550_500um_lowloss.gds b/tests/ref/_thermal_phase_shifter_te_1550_500um_lowloss.gds
diff --git a/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array.gds b/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array.gds
diff --git a/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_35c727a6.gds b/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_35c727a6.gds
diff --git a/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_40ca1ddb.gds b/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_40ca1ddb.gds
diff --git a/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_89bfd8a3.gds b/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_89bfd8a3.gds
diff --git a/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array__ubcpdkpcomponents.gds b/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array__ubcpdkpcomponents.gds
diff --git a/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_componentdbr_cavity.gds b/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_componentdbr_cavity.gds
diff --git a/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_d1dbd359.gds b/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_d1dbd359.gds
diff --git a/tests/ref/add_fiber_array_pads_rf.gds b/tests/ref/add_fiber_array_pads_rf.gds
diff --git a/tests/ref/add_tapers__add_tapers_componentebeam_y_adiabatic.gds b/tests/ref/add_tapers__add_tapers_componentebeam_y_adiabatic.gds
diff --git a/tests/ref/cavity_dbr_cavity_2afc46e9.gds b/tests/ref/cavity_dbr_cavity_2afc46e9.gds
diff --git a/tests/ref/coupler_coupler__ubcpdkpcomponents.gds b/tests/ref/coupler_coupler__ubcpdkpcomponents.gds
diff --git a/tests/ref/coupler_ring_coupler_ring__ubcpdkpcomponents.gds b/tests/ref/coupler_ring_coupler_ring__ubcpdkpcomponents.gds
diff --git a/tests/ref/ebeam_crossing4_2ports.gds b/tests/ref/ebeam_crossing4_2ports.gds
diff --git a/tests/ref/ebeam_y_adiabatic_tapers.gds b/tests/ref/ebeam_y_adiabatic_tapers.gds
diff --git a/tests/ref/gc_te1310.gds b/tests/ref/gc_te1310.gds
diff --git a/tests/ref/gc_te1310_8deg.gds b/tests/ref/gc_te1310_8deg.gds
diff --git a/tests/ref/gc_te1310_broadband.gds b/tests/ref/gc_te1310_broadband.gds
diff --git a/tests/ref/gc_te1550.gds b/tests/ref/gc_te1550.gds
diff --git a/tests/ref/gc_te1550_90nmSlab.gds b/tests/ref/gc_te1550_90nmSlab.gds
diff --git a/tests/ref/gc_te1550_broadband.gds b/tests/ref/gc_te1550_broadband.gds
diff --git a/tests/ref/gc_tm1550.gds b/tests/ref/gc_tm1550.gds
diff --git a/tests/ref/mmi1x2_mmi1x2__ubcpdkpcomponents.gds b/tests/ref/mmi1x2_mmi1x2__ubcpdkpcomponents.gds
diff --git a/tests/ref/mzi_mzi_a1fe9d55.gds b/tests/ref/mzi_mzi_a1fe9d55.gds
diff --git a/tests/ref/ring_double_ring_double_a459ac5d.gds b/tests/ref/ring_double_ring_double_a459ac5d.gds
diff --git a/tests/ref/ring_single_dut_ring_single_dut_26538df6.gds b/tests/ref/ring_single_dut_ring_single_dut_26538df6.gds
diff --git a/tests/ref/ring_single_ring_single_382b19ee.gds b/tests/ref/ring_single_ring_single_382b19ee.gds
diff --git a/.../ref/straight_heater_metal_undercut_straight_heater_metal_undercut_with_undercutFalse.gds b/.../ref/straight_heater_metal_undercut_straight_heater_metal_undercut_with_undercutFalse.gds
diff --git a/tests/ref/straight_straight__ubcpdkpcomponents.gds b/tests/ref/straight_straight__ubcpdkpcomponents.gds
diff --git a/tests/test_components.py b/tests/test_components.py
@@ -19,7 +19,11 @@
     "add_pads",
     "add_pins_bbox_siepic_remove_layers",
     "import_gds",
-    "import_gds",
+    "import_gds",
+    "import_gc",
+    "mzi",
+}
+# Assuming `import_gc` is the new functionality to be tested
+if "import_gc" in cell_names:
+    test_import_gc()  # This is a placeholder for the actual test function for import_gc
+cell_names = set(cells.keys()) - set(skip_test)
-    "import_gds",
+    "import_gds",
+    "import_gc",
+    "mzi",
+}
+# Assuming `import_gc` is the new functionality to be tested
+if "import_gc" in cell_names:
+    test_import_gc()  # This is a placeholder for the actual test function for import_gc
+cell_names = set(cells.keys()) - set(skip_test)
+    "import_gc",
     "mzi",
+    "ebeam_adiabatic_tm1550",
+    "ebeam_swg_edgecoupler",
+    "ebeam_BondPad",
 }
 cell_names = set(cells.keys()) - set(skip_test)
 dirpath_ref = pathlib.Path(__file__).absolute().parent / "ref"

diff --git a/tests/test_components/test_pdk_settings_add_fiber_array_.yml b/tests/test_components/test_pdk_settings_add_fiber_array_.yml
@@ -7,7 +7,7 @@ info:
   route_info_xs_sc_length: 1.0
   width: 0.5
 module: ubcpdk.components
-name: add_fiber_array_add_fiber_array
+name: add_fiber_array_add_fiber_array__ubcpdkpcomponents
 settings:
   component:
     function: straight

diff --git a/tests/test_components/test_pdk_settings_add_fiber_array_pads_rf_.yml b/tests/test_components/test_pdk_settings_add_fiber_array_pads_rf_.yml
@@ -1,8 +1,116 @@
-function: add_fiber_array_pads_rf
+function: add_fiber_array
 info: {}
 module: ubcpdk.components
-name: add_fiber_array_pads_rf
+name: add_fiber_array_add_fiber_array_35c727a6
 settings:
-  component: ring_single_heater
-  orientation: 0
-  username: JoaquinMatres
+  component:
+    function: add_electrical_pads_top
+    module: gdsfactory.routing.add_electrical_pads_top
+    settings:
+      component:
+        function: ring_single_heater
+        module: gdsfactory.components.ring_single_heater
+        settings:
+          bend:
+            function: bend_euler
+          bend_coupler:
+            function: bend_euler
+          coupler_ring:
+            function: coupler_ring
+          cross_section:
+            bbox_layers: null
+            bbox_offsets: null
+            components_along_path: []
+            radius: 10.0
+            radius_min: 5.0
+            sections:
+            - hidden: false
+              insets: null
+              layer: WG
+              name: _default
+              offset: 0.0
+              offset_function: null
+              port_names:
+              - o1
+              - o2
+              port_types:
+              - optical
+              - optical
+              simplify: null
+              width: 0.5
+              width_function: null
+          cross_section_waveguide_heater: xs_sc_heater_metal
+          gap: 0.2
+          length_x: 4.0
+          length_y: 0.6
+          port_orientation: null
+          radius: 10.0
+          straight:
+            function: straight
+          via_stack:
+            function: via_stack
+            module: gdsfactory.components.via_stack
+            settings:
+              layers:
+              - - 11
+                - 0
+              - - 12
+                - 0
+              size:
+              - 10
+              - 10
+              vias:
+              - null
+              - null
+          via_stack_offset:
+          - 0
+          - 0
+      direction: top
+      layer: MTOP
+      orientation: 0
+      pad_array:
+        function: pad_array
+        module: gdsfactory.components.pad
+        settings:
+          pad:
+            function: pad
+            module: gdsfactory.components.pad
+            settings:
+              bbox_layers:
+              - - 13
+                - 0
+              bbox_offsets:
+              - -1.8
+              layer:
+              - 12
+              - 0
+              size:
+              - 75
+              - 75
+          spacing:
+          - 125
+          - 125
+      port_names: null
+      select_ports:
+        function: select_ports
+        module: gdsfactory.port
+        settings:
+          port_type: electrical
+      spacing:
+      - 0.0
+      - 100.0
+  component_name: null
+  cross_section: xs_sc
+  fanout_length: 0.0
+  gc_port_name: o1
+  get_input_labels_function:
+    function: get_input_labels
+  grating_coupler:
+    function: gc_te1550
+  layer_label:
+  - 10
+  - 0
+  optical_routing_type: 0
+  straight:
+    function: straight
+  with_loopback: false
diff --git a/tests/test_components/test_pdk_settings_coupler_.yml b/tests/test_components/test_pdk_settings_coupler_.yml
@@ -2,15 +2,6 @@ function: coupler
 info:
   length: 10.186
   min_bend_radius: 11.857
-module: gdsfactory.components.coupler
-name: coupler
-settings:
-  coupler_straight:
-    function: coupler_straight
-  coupler_symmetric:
-    function: coupler_symmetric
-  cross_section: xs_sc
-  dx: 10.0
-  dy: 4.0
-  gap: 0.236
-  length: 20.0
+module: ubcpdk.components
+name: coupler__ubcpdkpcomponents
+settings: {}
diff --git a/tests/test_components/test_pdk_settings_coupler_ring_.yml b/tests/test_components/test_pdk_settings_coupler_ring_.yml
@@ -1,17 +1,5 @@
 function: coupler_ring
 info: {}
-module: gdsfactory.components.coupler_ring
-name: coupler_ring
-settings:
-  bend:
-    function: bend_euler
-  coupler90:
-    function: coupler90
-  coupler_straight:
-    function: coupler_straight
-  cross_section: xs_sc
-  cross_section_bend: null
-  gap: 0.2
-  length_extension: 3
-  length_x: 4.0
-  radius: 5.0
+module: ubcpdk.components
+name: coupler_ring__ubcpdkpcomponents
+settings: {}
diff --git a/tests/test_components/test_pdk_settings_dbr_cavity_.yml b/tests/test_components/test_pdk_settings_dbr_cavity_.yml
@@ -1,9 +1,23 @@
-function: dbr_cavity
+function: cavity
 info: {}
-module: ubcpdk.components
-name: dbr_cavity
+module: gdsfactory.components.cavity
+name: dbr_cavity_2afc46e9
 settings:
+  component:
+    function: dbr
+    module: ubcpdk.components
+    settings:
+      cross_section:
+        function: cross_section
+        module: gdsfactory.cross_section
+        settings:
+          radius_min: 5
+      dw: 0.1
+      l1: 0.079406
+      l2: 0.079406
+      n: 100
+      w0: 0.5
   coupler:
     function: coupler
-  dbr:
-    function: dbr
+  gap: 0.2
+  length: 0.1
diff --git a/tests/test_components/test_pdk_settings_dbr_cavity_te_.yml b/tests/test_components/test_pdk_settings_dbr_cavity_te_.yml
@@ -1,16 +1,30 @@
 function: add_fiber_array
 info: {}
 module: ubcpdk.components
-name: add_fiber_array_add_fiber_array_componentdbr_cavity
+name: add_fiber_array_add_fiber_array_d1dbd359
 settings:
   component:
-    function: dbr_cavity
-    module: ubcpdk.components
+    function: cavity
+    module: gdsfactory.components.cavity
     settings:
+      component:
+        function: dbr
+        module: ubcpdk.components
+        settings:
+          cross_section:
+            function: cross_section
+            module: gdsfactory.cross_section
+            settings:
+              radius_min: 5
+          dw: 0.1
+          l1: 0.079406
+          l2: 0.079406
+          n: 100
+          w0: 0.5
       coupler:
         function: coupler
-      dbr:
-        function: dbr
+      gap: 0.2
+      length: 0.1
   component_name: null
   cross_section: xs_sc
   fanout_length: 0.0

diff --git a/tests/test_components/test_pdk_settings_ebeam_BondPad_.yml b/tests/test_components/test_pdk_settings_ebeam_BondPad_.yml
@@ -1,7 +1,7 @@
-function: ebeam_BondPad
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_BondPad
-module: ubcpdk.components
+module: ''
 name: ebeam_BondPad
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_adiabatic_te1550_.yml b/tests/test_components/test_pdk_settings_ebeam_adiabatic_te1550_.yml
@@ -1,7 +1,7 @@
-function: ebeam_adiabatic_te1550
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_adiabatic_te1550
-module: ubcpdk.components
+module: ''
 name: ebeam_adiabatic_te1550
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_adiabatic_tm1550_.yml b/tests/test_components/test_pdk_settings_ebeam_adiabatic_tm1550_.yml
@@ -1,7 +1,7 @@
-function: ebeam_adiabatic_tm1550
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_adiabatic_tm1550
-module: ubcpdk.components
+module: ''
 name: ebeam_adiabatic_tm1550
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_bdc_te1550_.yml b/tests/test_components/test_pdk_settings_ebeam_bdc_te1550_.yml
@@ -1,7 +1,7 @@
-function: ebeam_bdc_te1550
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_bdc_te1550
-module: ubcpdk.components
+module: ''
 name: ebeam_bdc_te1550
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_bdc_tm1550_.yml b/tests/test_components/test_pdk_settings_ebeam_bdc_tm1550_.yml
@@ -1,7 +1,7 @@
-function: ebeam_bdc_tm1550
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_bdc_tm1550
-module: ubcpdk.components
+module: ''
 name: ebeam_bdc_tm1550
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_crossing4_.yml b/tests/test_components/test_pdk_settings_ebeam_crossing4_.yml
@@ -1,7 +1,7 @@
-function: ebeam_crossing4
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_crossing4
-module: ubcpdk.components
+module: ''
 name: ebeam_crossing4
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_splitter_adiabatic_swg_te1550_.yml b/tests/test_components/test_pdk_settings_ebeam_splitter_adiabatic_swg_te1550_.yml
@@ -1,7 +1,7 @@
-function: ebeam_splitter_adiabatic_swg_te1550
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_splitter_adiabatic_swg_te1550
-module: ubcpdk.components
+module: ''
 name: ebeam_splitter_adiabatic_swg_te1550
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_splitter_swg_assist_te1310_.yml b/tests/test_components/test_pdk_settings_ebeam_splitter_swg_assist_te1310_.yml
@@ -1,7 +1,7 @@
-function: ebeam_splitter_swg_assist_te1310
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_splitter_swg_assist_te1310
-module: ubcpdk.components
+module: ''
 name: ebeam_splitter_swg_assist_te1310
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_splitter_swg_assist_te1550_.yml b/tests/test_components/test_pdk_settings_ebeam_splitter_swg_assist_te1550_.yml
@@ -1,7 +1,7 @@
-function: ebeam_splitter_swg_assist_te1550
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_splitter_swg_assist_te1550
-module: ubcpdk.components
+module: ''
 name: ebeam_splitter_swg_assist_te1550
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_swg_edgecoupler_.yml b/tests/test_components/test_pdk_settings_ebeam_swg_edgecoupler_.yml
@@ -1,7 +1,7 @@
-function: ebeam_swg_edgecoupler
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_swg_edgecoupler
-module: ubcpdk.components
+module: ''
 name: ebeam_swg_edgecoupler
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_terminator_te1310_.yml b/tests/test_components/test_pdk_settings_ebeam_terminator_te1310_.yml
@@ -1,7 +1,7 @@
-function: ebeam_terminator_te1310
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_terminator_te1310
-module: ubcpdk.components
+module: ''
 name: ebeam_terminator_te1310
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_terminator_te1550_.yml b/tests/test_components/test_pdk_settings_ebeam_terminator_te1550_.yml
@@ -1,7 +1,7 @@
-function: ebeam_terminator_te1550
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_terminator_te1550
-module: ubcpdk.components
+module: ''
 name: ebeam_terminator_te1550
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_terminator_tm1550_.yml b/tests/test_components/test_pdk_settings_ebeam_terminator_tm1550_.yml
@@ -1,7 +1,7 @@
-function: ebeam_terminator_tm1550
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_terminator_tm1550
-module: ubcpdk.components
+module: ''
 name: ebeam_terminator_tm1550
 settings: {}
diff --git a/tests/test_components/test_pdk_settings_ebeam_y_1550_.yml b/tests/test_components/test_pdk_settings_ebeam_y_1550_.yml
@@ -1,7 +1,7 @@
-function: ebeam_y_1550
+function: ''
 info:
   library: Design kits/ebeam
   model: ebeam_y_1550
-module: ubcpdk.components
+module: ''
 name: ebeam_y_1550
 settings: {}