Skip to content

Commit

Permalink
Merge pull request #24 from martinjankoehler/wheel-fix
Browse files Browse the repository at this point in the history
Wheel: fixed path to tech pb json
  • Loading branch information
martinjankoehler authored Dec 13, 2024
2 parents 61fc684 + 7b49cd2 commit b354e1d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions install_test_pypi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ set -x
set -e

pip3 install \
--upgrade \
--index-url https://test.pypi.org/simple/ \
--extra-index-url https://pypi.org/simple/ \
klayout-pex
Expand Down
6 changes: 3 additions & 3 deletions klayout_pex/kpex_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,12 @@ class PDK(StrEnum):
def config(self) -> PDKConfig:
# NOTE: installation paths of resources in the distribution wheel differes from source repo
base_dir = os.path.dirname(os.path.realpath(__file__))
tech_pb_json_dir = base_dir
if os.path.isdir(os.path.join(base_dir, '..', '.git')): # in source repo
base_dir = os.path.dirname(base_dir)
tech_pb_json_dir = os.path.join(base_dir, 'build')

else: # site-packages/klayout_pex -> site-packages/klayout_pex_protobuf
tech_pb_json_dir = os.path.join(os.path.dirname(base_dir), 'klayout_pex_protobuf')

match self:
case PDK.IHP_SG13G2:
return PDKConfig(
Expand Down Expand Up @@ -389,7 +390,6 @@ def input_file_stem(path: str):

# at least one engine must be activated

print("m#äh")
if not (args.run_magic or args.run_fastcap or args.run_fastercap or args.run_2_5D):
error("No PEX engines activated")
engine_help = """
Expand Down
2 changes: 1 addition & 1 deletion klayout_pex/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# --------------------------------------------------------------------------------
#
__version__ = "0.1.4"
__version__ = "0.1.6"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "klayout-pex"
version = "0.1.4"
version = "0.1.6"
description = "Parasitic Extraction Tool for KLayout"
authors = ["Martin Köhler <[email protected]>"]
homepage = "https://martinjankoehler.github.io/klayout-pex-website/"
Expand Down

0 comments on commit b354e1d

Please sign in to comment.