mirror of https://github.com/KLayout/klayout.git
Merge branch 'master' into drc-kissing-corners
This commit is contained in:
commit
2dd6bbc3fc
|
|
@ -37,7 +37,7 @@ jobs:
|
|||
large-packages: false # not working currently
|
||||
- uses: hmarr/debug-action@v2
|
||||
- name: Cancel Workflow Action
|
||||
uses: styfle/cancel-workflow-action@0.12.0
|
||||
uses: styfle/cancel-workflow-action@0.12.1
|
||||
- uses: actions/checkout@v4
|
||||
- name: ccache
|
||||
uses: hendrikmuhs/ccache-action@v1.2
|
||||
|
|
@ -52,7 +52,7 @@ jobs:
|
|||
HOST_CCACHE_DIR="$(ccache -k cache_dir)"
|
||||
mkdir -p $HOST_CCACHE_DIR
|
||||
- name: Build wheels # check https://cibuildwheel.readthedocs.io/en/stable/setup/#github-actions
|
||||
uses: pypa/cibuildwheel@v2.16.2
|
||||
uses: pypa/cibuildwheel@v2.16.5
|
||||
# to supply options, put them in 'env', like:
|
||||
# env:
|
||||
# CIBW_SOME_OPTION: value
|
||||
|
|
|
|||
|
|
@ -548,6 +548,23 @@
|
|||
<header>layWidgets.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>scrollArea</tabstop>
|
||||
<tabstop>lib_cbx</tabstop>
|
||||
<tabstop>browse_pb</tabstop>
|
||||
<tabstop>cell_le</tabstop>
|
||||
<tabstop>place_origin_cb</tabstop>
|
||||
<tabstop>scale_le</tabstop>
|
||||
<tabstop>angle_le</tabstop>
|
||||
<tabstop>mirror_cbx</tabstop>
|
||||
<tabstop>array_grp</tabstop>
|
||||
<tabstop>rows_le</tabstop>
|
||||
<tabstop>columns_le</tabstop>
|
||||
<tabstop>row_x_le</tabstop>
|
||||
<tabstop>row_y_le</tabstop>
|
||||
<tabstop>column_x_le</tabstop>
|
||||
<tabstop>column_y_le</tabstop>
|
||||
</tabstops>
|
||||
<resources>
|
||||
<include location="../../icons/icons.qrc"/>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -290,9 +290,9 @@ PythonInterpreter::PythonInterpreter (bool embedded)
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
Py_SetPath (tl::to_wstring (path).c_str ());
|
||||
|
||||
Py_SetPath (tl::to_wstring (path).c_str ());
|
||||
}
|
||||
|
||||
} catch (tl::Exception &ex) {
|
||||
tl::error << tl::to_string (tr ("Evaluation of Python path expression failed")) << ": " << ex.msg ();
|
||||
|
|
|
|||
Loading…
Reference in New Issue