Merge pull request #51 from gdsfactory/update_gdsfactory

update gdsfactory

.gitignore

@@ -6,6 +6,8 @@ __pycache__/
 # C extensions
 *.so
 *.fsp
+tests/ref/*.oas
+
 
 # Distribution / packaging
 .Python

gvtt/components/__init__.py

@@ -17,8 +17,8 @@
 from gvtt.components.transitions import (
     rib_taper,
     rib_to_strip,
-    strip_to_rib,
     strip_taper,
+    strip_to_rib,
     xs_rib_strip,
 )
 from gvtt.xsections import straight, straight_rib, straight_sc

gvtt/components/mmi1x2.py

@@ -1,16 +1,14 @@
 from functools import partial
 
-# from gdsfactory.components import mmi1x2 as _mmi1x2
-
-from gvtt.components.transitions import strip_taper
-from gvtt.xsections import xs_sc
-
 import gdsfactory as gf
-
 from gdsfactory.component import Component
 from gdsfactory.components.taper import taper as taper_function
 from gdsfactory.typings import ComponentFactory, CrossSectionSpec
 
+# from gdsfactory.components import mmi1x2 as _mmi1x2
+from gvtt.components.transitions import strip_taper
+from gvtt.xsections import xs_sc
+
 
 @gf.cell
 def _mmi1x2(

gvtt/components/mmi2x2.py

@@ -1,15 +1,14 @@
 from functools import partial
 
-# from gdsfactory.components import mmi2x2 as _mmi2x2
-
-from gvtt.components.transitions import strip_taper
-from gvtt.xsections import xs_sc
-
 import gdsfactory as gf
 from gdsfactory.component import Component
 from gdsfactory.components.taper import taper as taper_function
 from gdsfactory.typings import ComponentFactory, CrossSectionSpec
 
+# from gdsfactory.components import mmi2x2 as _mmi2x2
+from gvtt.components.transitions import strip_taper
+from gvtt.xsections import xs_sc
+
 
 @gf.cell
 def _mmi2x2(

gvtt/components/transitions.py

@@ -8,8 +8,8 @@
     cross_section,
 )
 
-from gvtt.xsections import rib, strip
 from gvtt.layers import LAYER
+from gvtt.xsections import rib, strip
 
 
 def xs_rib_strip(

pyproject.toml

@@ -12,7 +12,7 @@ classifiers = [
   "Operating System :: OS Independent"
 ]
 dependencies = [
-  "gdsfactory[cad]==7.26.1"
+  "gdsfactory~=7.26.1"
 ]
 description = "gdsfactory VTT PDK"
 keywords = ["python"]

tests/test_components/test_pdk_settings_die_.yml

@@ -1,9 +1,6 @@
 function: die
 info:
-  port_x_position_east: 2423.5
-  port_x_position_west: -2423.5
-  port_y_position_north: 4673.5
-  port_y_position_south: -4673.5
+  frame_margin: 76.5
 module: gvtt.components.die
 name: die
 settings:

tests/test_components/test_pdk_settings_mmi1x2_.yml

@@ -1,82 +1,18 @@
-function: mmi1x2
+function: _mmi1x2
 info: {}
-module: gdsfactory.components.mmi1x2
-name: mmi1x2_c8071938
+module: gvtt.components.mmi1x2
+name: _mmi1x2_574421d1
 settings:
   cross_section:
-    bbox_layers: null
-    bbox_offsets: null
-    components_along_path: []
-    radius: 10.0
-    radius_min: null
-    sections:
-    - hidden: false
-      insets: null
-      layer:
-      - 89
-      - 1
-      name: _default
-      offset: 0.0
-      offset_function: null
-      port_names:
-      - o1
-      - o2
-      port_types:
-      - optical
-      - optical
-      simplify: null
+    function: strip
+    module: gvtt.xsections
+    settings:
       width: 1.875
-      width_function: null
-    - hidden: false
-      insets: null
-      layer: WG_RIBS_SUB
-      name: WG
-      offset: 0
-      offset_function: null
-      port_names:
-      - null
-      - null
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 1.875
-      width_function: null
-    - hidden: false
-      insets: null
-      layer: WG_RIBS_ADD
-      name: trench
-      offset: 0
-      offset_function: null
-      port_names:
-      - null
-      - null
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 21.875
-      width_function: null
-    - hidden: false
-      insets: null
-      layer: WG_MOST_ADD
-      name: trench_2
-      offset: 0
-      offset_function: null
-      port_names:
-      - null
-      - null
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 22.875
-      width_function: null
   gap_mmi: 1.25
   length_mmi: 43.25
   length_taper: 1.0
   taper:
     function: strip_taper
-  width: null
+  width: 1.875
   width_mmi: 6.25
   width_taper: 1.875

tests/test_components/test_pdk_settings_mmi2x2_.yml

@@ -1,80 +1,16 @@
-function: mmi2x2
+function: _mmi2x2
 info: {}
-module: gdsfactory.components.mmi2x2
-name: mmi2x2_55c4183e
+module: gvtt.components.mmi2x2
+name: _mmi2x2_07b187b9
 settings:
   cross_section:
-    bbox_layers: null
-    bbox_offsets: null
-    components_along_path: []
-    radius: 10.0
-    radius_min: null
-    sections:
-    - hidden: false
-      insets: null
-      layer:
-      - 89
-      - 1
-      name: _default
-      offset: 0.0
-      offset_function: null
-      port_names:
-      - o1
-      - o2
-      port_types:
-      - optical
-      - optical
-      simplify: null
+    function: strip
+    module: gvtt.xsections
+    settings:
       width: 1.875
-      width_function: null
-    - hidden: false
-      insets: null
-      layer: WG_RIBS_SUB
-      name: WG
-      offset: 0
-      offset_function: null
-      port_names:
-      - null
-      - null
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 1.875
-      width_function: null
-    - hidden: false
-      insets: null
-      layer: WG_RIBS_ADD
-      name: trench
-      offset: 0
-      offset_function: null
-      port_names:
-      - null
-      - null
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 21.875
-      width_function: null
-    - hidden: false
-      insets: null
-      layer: WG_MOST_ADD
-      name: trench_2
-      offset: 0
-      offset_function: null
-      port_names:
-      - null
-      - null
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 22.875
-      width_function: null
   gap_mmi: 1.25
   length_mmi: 112.0
-  length_taper: 1.0
+  length_taper: null
   taper:
     function: strip_taper
   width: null

tests/test_components/test_pdk_settings_straight_.yml

@@ -7,76 +7,12 @@ info:
   route_info_weight: 10.0
   width: 1.875
 module: gdsfactory.components.straight
-name: straight_bdf7fc24
+name: straight_7a68ed6c
 settings:
   cross_section:
-    bbox_layers: null
-    bbox_offsets: null
-    components_along_path: []
-    radius: 10.0
-    radius_min: null
-    sections:
-    - hidden: false
-      insets: null
-      layer:
-      - 89
-      - 1
-      name: _default
-      offset: 0.0
-      offset_function: null
-      port_names:
-      - o1
-      - o2
-      port_types:
-      - optical
-      - optical
-      simplify: null
+    function: strip
+    module: gvtt.xsections
+    settings:
       width: 1.875
-      width_function: null
-    - hidden: false
-      insets: null
-      layer: WG_RIBS_SUB
-      name: WG
-      offset: 0
-      offset_function: null
-      port_names:
-      - null
-      - null
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 1.875
-      width_function: null
-    - hidden: false
-      insets: null
-      layer: WG_RIBS_ADD
-      name: trench
-      offset: 0
-      offset_function: null
-      port_names:
-      - null
-      - null
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 21.875
-      width_function: null
-    - hidden: false
-      insets: null
-      layer: WG_MOST_ADD
-      name: trench_2
-      offset: 0
-      offset_function: null
-      port_names:
-      - null
-      - null
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 22.875
-      width_function: null
   length: 10.0
   npoints: 2