Compare commits

..

No commits in common. "968392a4a32956a6b85112673908516249f1a021" and "7efc5a39d4b8e549040a47786b0858a477d7acaa" have entirely different histories.

24 changed files with 3102 additions and 3043 deletions

View File

@ -27,4 +27,3 @@ ignore =
per-file-ignores =
# F401 import without use
*/__init__.py: F401,
__init__.py: F401,

View File

@ -3,8 +3,6 @@
**fatamorgana** is a Python package for reading and writing OASIS format layout files.
**Homepage:** https://mpxd.net/code/jan/fatamorgana
* [PyPI](https://pypi.org/project/fatamorgana)
* [Github mirror](https://github.com/anewusername/fatamorgana)
**Capabilities:**
* This package is a work-in-progress and is largely untested -- it works for
@ -22,7 +20,7 @@
## Installation
**Dependencies:**
* python >=3.11
* python 3.5 or newer
* (optional) numpy

View File

@ -15,7 +15,7 @@
numpy to speed up reading/writing.
Dependencies:
- Python 3.11 or later
- Python 3.8 or later
- numpy (optional, faster but no additional functionality)
To get started, try:
@ -24,28 +24,17 @@
help(fatamorgana.OasisLayout)
```
"""
from .main import (
OasisLayout as OasisLayout,
Cell as Cell,
XName as XName,
)
import pathlib
from .main import OasisLayout, Cell, XName
from .basic import (
NString as NString,
AString as AString,
Validation as Validation,
OffsetTable as OffsetTable,
OffsetEntry as OffsetEntry,
EOFError as EOFError,
SignedError as SignedError,
InvalidDataError as InvalidDataError,
InvalidRecordError as InvalidRecordError,
UnfilledModalError as UnfilledModalError,
ReuseRepetition as ReuseRepetition,
GridRepetition as GridRepetition,
ArbitraryRepetition as ArbitraryRepetition,
NString, AString, Validation, OffsetTable, OffsetEntry,
EOFError, SignedError, InvalidDataError, InvalidRecordError,
UnfilledModalError,
ReuseRepetition, GridRepetition, ArbitraryRepetition
)
__author__ = 'Jan Petykiewicz'
__version__ = '0.13'
__version__ = '0.12'
version = __version__

File diff suppressed because it is too large Load Diff

View File

@ -3,7 +3,7 @@ This module contains data structures and functions for reading from and
writing to whole OASIS layout files, and provides a few additional
abstractions for the data contained inside them.
"""
from typing import IO
from typing import List, Dict, Union, Optional, Type
import io
import logging
@ -27,20 +27,20 @@ class FileModals:
"""
File-scoped modal variables
"""
cellname_implicit: bool | None = None
propname_implicit: bool | None = None
xname_implicit: bool | None = None
textstring_implicit: bool | None = None
propstring_implicit: bool | None = None
cellname_implicit: Optional[bool] = None
propname_implicit: Optional[bool] = None
xname_implicit: Optional[bool] = None
textstring_implicit: Optional[bool] = None
propstring_implicit: Optional[bool] = None
property_target: list[records.Property]
property_target: List[records.Property]
within_cell: bool = False
within_cblock: bool = False
end_has_offset_table: bool = False
started: bool = False
def __init__(self, property_target: list[records.Property]) -> None:
def __init__(self, property_target: List[records.Property]):
self.property_target = property_target
@ -53,49 +53,43 @@ class OasisLayout:
record objects.
Cells are stored using `Cell` objects (different from `records.Cell`
record objects).
Attributes:
(File properties)
version (AString): Version string ('1.0')
unit (real_t): grid steps per micron
validation (Validation): checksum data
(Names)
cellnames (Dict[int, CellName]): Cell names
propnames (Dict[int, NString]): Property names
xnames (Dict[int, XName]): Custom names
(Strings)
textstrings (Dict[int, AString]): Text strings
propstrings (Dict[int, AString]): Property strings
(Data)
layers (List[records.LayerName]): Layer definitions
properties (List[records.Property]): Property values
cells (List[Cell]): Layout cells
"""
# File properties
version: AString
"""File format version string ('1.0')"""
unit: real_t
"""grid steps per micron"""
validation: Validation
"""checksum data"""
# Data
properties: list[records.Property]
"""Property values"""
properties: List[records.Property]
cells: List['Cell']
cells: list['Cell']
"""Layout cells"""
cellnames: Dict[int, 'CellName']
propnames: Dict[int, NString]
xnames: Dict[int, 'XName']
layers: list[records.LayerName]
"""Layer definitions"""
textstrings: Dict[int, AString]
propstrings: Dict[int, AString]
layers: List[records.LayerName]
# Names
cellnames: dict[int, 'CellName']
"""Cell names"""
propnames: dict[int, NString]
"""Property names"""
xnames: dict[int, 'XName']
"""Custom names"""
# String storage
textstrings: dict[int, AString]
"""Text strings"""
propstrings: dict[int, AString]
"""Property strings"""
def __init__(
self,
unit: real_t,
validation: Validation | None = None,
) -> None:
def __init__(self, unit: real_t, validation: Validation = None):
"""
Args:
unit: Real number (i.e. int, float, or `Fraction`), grid steps per micron.
@ -118,7 +112,7 @@ class OasisLayout:
self.layers = []
@staticmethod
def read(stream: IO[bytes]) -> 'OasisLayout':
def read(stream: io.BufferedIOBase) -> 'OasisLayout':
"""
Read an entire .oas file into an `OasisLayout` object.
@ -138,9 +132,8 @@ class OasisLayout:
pass
return layout
def read_record(
self,
stream: IO[bytes],
def read_record(self,
stream: io.BufferedIOBase,
modals: Modals,
file_state: FileModals
) -> bool:
@ -163,12 +156,13 @@ class OasisLayout:
"""
try:
record_id = read_uint(stream)
except EOFError:
except EOFError as e:
if file_state.within_cblock:
return True
raise
else:
raise e
logger.info(f'read_record of type {record_id} at position 0x{stream.tell():x}')
logger.info('read_record of type {} at position 0x{:x}'.format(record_id, stream.tell()))
record: Record
@ -188,10 +182,11 @@ class OasisLayout:
# Make sure order is valid (eg, no out-of-cell geometry)
if not file_state.started and record_id != 1:
raise InvalidRecordError(f'Non-Start record {record_id} before Start')
raise InvalidRecordError('Non-Start record {} before Start'.format(record_id))
if record_id == 1:
if file_state.started:
raise InvalidRecordError('Duplicate Start record')
else:
file_state.started = True
if record_id == 2 and file_state.within_cblock:
raise InvalidRecordError('End within CBlock')
@ -202,11 +197,11 @@ class OasisLayout:
file_state.within_cell = False
elif record_id in range(15, 28) or record_id in (32, 33):
if not file_state.within_cell:
raise InvalidRecordError('Geometry outside Cell')
raise Exception('Geometry outside Cell')
elif record_id in (13, 14):
file_state.within_cell = True
else:
raise InvalidRecordError(f'Unknown record id: {record_id}')
raise InvalidRecordError('Unknown record id: {}'.format(record_id))
if record_id == 0:
''' Pad '''
@ -340,10 +335,10 @@ class OasisLayout:
self.cells[-1].geometry.append(record)
file_state.property_target = record.properties
else:
raise InvalidRecordError(f'Unknown record id: {record_id}')
raise InvalidRecordError('Unknown record id: {}'.format(record_id))
return False
def write(self, stream: IO[bytes]) -> int:
def write(self, stream: io.BufferedIOBase) -> int:
"""
Write this object in OASIS fromat to a stream.
@ -404,28 +399,32 @@ class OasisLayout:
class Cell:
"""
Representation of an OASIS cell.
Attributes:
name (Union[NString, int]): name or "CellName reference" number
properties (List[records.Property]): Properties of this cell
placements (List[records.Placement]): Placement record objects
geometry: (List[records.geometry_t]): Geometry record objectes
"""
name: NString | int
"""name or "CellName reference" number"""
name: Union[NString, int]
properties: List[records.Property]
placements: List[records.Placement]
geometry: List[records.geometry_t]
properties: list[records.Property]
placements: list[records.Placement]
geometry: list[records.geometry_t]
def __init__(
self,
name: NString | str | int,
def __init__(self,
name: Union[NString, str, int],
*,
properties: list[records.Property] | None = None,
placements: list[records.Placement] | None = None,
geometry: list[records.geometry_t] | None = None,
) -> None:
self.name = name if isinstance(name, NString | int) else NString(name)
properties: Optional[List[records.Property]] = None,
placements: Optional[List[records.Placement]] = None,
geometry: Optional[List[records.geometry_t]] = None,
):
self.name = name if isinstance(name, (NString, int)) else NString(name)
self.properties = [] if properties is None else properties
self.placements = [] if placements is None else placements
self.geometry = [] if geometry is None else geometry
def dedup_write(self, stream: IO[bytes], modals: Modals) -> int:
def dedup_write(self, stream: io.BufferedIOBase, modals: Modals) -> int:
"""
Write this cell to a stream, using the provided modal variables to
deduplicate any repeated data.
@ -459,13 +458,11 @@ class CellName:
with the reference data stripped out.
"""
nstring: NString
properties: list[records.Property]
properties: List[records.Property]
def __init__(
self,
nstring: NString | str,
properties: list[records.Property] | None = None,
) -> None:
def __init__(self,
nstring: Union[NString, str],
properties: Optional[List[records.Property]] = None):
"""
Args:
nstring: The contained string.
@ -502,7 +499,7 @@ class XName:
attribute: int
bstring: bytes
def __init__(self, attribute: int, bstring: bytes) -> None:
def __init__(self, attribute: int, bstring: bytes):
"""
Args:
attribute: Attribute number.
@ -526,7 +523,7 @@ class XName:
# Mapping from record id to record class.
_GEOMETRY: dict[int, type[records.geometry_t]] = {
_GEOMETRY: Dict[int, Type[records.geometry_t]] = {
19: records.Text,
20: records.Rectangle,
21: records.Polygon,

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,10 @@
"""
'''
Build files equivalent to the test cases used by KLayout.
"""
'''
# type: ignore
from typing import IO
from collections.abc import Callable
from pathlib import Path
from typing import Callable
from io import BufferedIOBase
from . import (
@ -12,13 +12,12 @@ from . import (
test_files_circles, test_files_ctrapezoids, test_files_trapezoids,
test_files_placements, test_files_paths, test_files_modals,
test_files_polygons, test_files_rectangles, test_files_empty,
test_files_texts, test_files_cells,
)
test_files_texts, test_files_cells)
def build_file(num: str, func: Callable[[IO[bytes]], IO[bytes]]) -> None:
with Path('t' + num + '.oas').open('wb') as ff:
func(ff)
def build_file(num: str, func: Callable[[BufferedIOBase], BufferedIOBase]) -> None:
with open('t' + num + '.oas', 'wb') as f:
func(f)
def write_all_files() -> None:

View File

@ -1,11 +1,17 @@
# mypy: disable-error-code="union-attr"
from typing import IO
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_bstring, write_byte
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -26,9 +32,9 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.cells[0].properties
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)
@ -92,15 +98,11 @@ def test_file_1() -> None:
assert geometry[1].height == 610
assert geometry[1].width == 680
assert_equal(geometry[2].point_list, [
[-30, -360],
[480, -50],
[180, 430],
[-630, -20],
])
assert_equal(geometry[2].point_list,
[[-30, -360], [480, -50], [180, 430], [-630, -20]])
assert_equal(geometry[3].point_list, [
[-30, -400],
assert_equal(geometry[3].point_list,
[[-30, -400],
[450, 40],
[70, -220],
[10, 210],
@ -121,29 +123,23 @@ def test_file_1() -> None:
[210, 10],
[40, 820],
[-1340, 60],
[30, -1370],
])
[30, -1370]])
assert_equal(geometry[4].point_list, [
[40, -760],
[490, -50],
[110, 800],
[-640, 10],
])
assert_equal(geometry[4].point_list,
[[40, -760], [490, -50], [110, 800], [-640, 10]])
assert_equal(geometry[5].point_list, [
[140, -380],
assert_equal(geometry[5].point_list,
[[140, -380],
[340, -10],
[30, -100],
[-320, 20],
[130, -460],
[-480, -20],
[-210, 910],
[370, 40],
])
[370, 40]])
assert_equal(geometry[6].point_list, [
[720, -20],
assert_equal(geometry[6].point_list,
[[720, -20],
[20, 20],
[690, 0],
[-10, 650],
@ -157,11 +153,10 @@ def test_file_1() -> None:
[-90, -20],
[-60, 140],
[-1390, 50],
[10, 30],
])
[10, 30]])
assert_equal(geometry[7].point_list, [
[150, -830],
assert_equal(geometry[7].point_list,
[[150, -830],
[-1320, 40],
[-70, 370],
[310, -30],
@ -172,25 +167,17 @@ def test_file_1() -> None:
[-20, 290],
[-1070, 20],
[0, 230],
[1380, -60],
])
[1380, -60]])
assert_equal(geometry[8].point_list, [
[330, 0],
[-10, 480],
[620, -20],
[-10, 330],
[-930, 60],
[0, -850],
])
assert_equal(geometry[8].point_list,
[[330, 0], [-10, 480], [620, -20], [-10, 330], [-930, 60], [0, -850]])
assert_equal(geometry[9].point_list, [
[-140, -410],
assert_equal(geometry[9].point_list,
[[-140, -410],
[10, -140],
[270, 0],
[130, 1030],
[-500, 50],
[10, -330],
[210, -10],
[10, -190],
])
[10, -190]])

View File

@ -1,11 +1,14 @@
# mypy: disable-error-code="union-attr"
from typing import IO
from io import BytesIO
# type: ignore
import pytest
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_bstring
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -23,10 +26,10 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.layers
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
Single cell with explicit name 'XYZ'
"""
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)
@ -48,10 +51,10 @@ def test_file_1() -> None:
assert not layout.cellnames
def write_file_2(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_2(buf: BufferedIOBase) -> BufferedIOBase:
'''
Two cellnames ('XYZ', 'ABC') and two cells with name references.
"""
'''
buf.write(HEADER)
write_uint(buf, 3) # CELLNAME record (implicit id 0)
@ -85,10 +88,10 @@ def test_file_2() -> None:
assert layout.cells[1].name == 1
def write_file_3(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_3(buf: BufferedIOBase) -> BufferedIOBase:
'''
Invalid file, contains a mix of explicit and implicit cellnames
"""
'''
buf.write(HEADER)
write_uint(buf, 4) # CELLNAME record (explicit id)
@ -113,13 +116,13 @@ def test_file_3() -> None:
buf.seek(0)
with pytest.raises(InvalidRecordError):
_layout = OasisLayout.read(buf)
layout = OasisLayout.read(buf)
def write_file_4(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_4(buf: BufferedIOBase) -> BufferedIOBase:
'''
Two cells referencing two names with explicit ids (unsorted)
"""
'''
buf.write(HEADER)
write_uint(buf, 4) # CELLNAME record (explicit id)
@ -155,10 +158,10 @@ def test_file_4() -> None:
assert layout.cells[1].name == 1
def write_file_5(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_5(buf: BufferedIOBase) -> BufferedIOBase:
'''
Reference to non-existent cell name.
"""
'''
buf.write(HEADER)
write_uint(buf, 4) # CELLNAME record (explicit id)
@ -196,10 +199,10 @@ def test_file_5() -> None:
#TODO add optional error checking for this case
def write_file_6(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_6(buf: BufferedIOBase) -> BufferedIOBase:
'''
Cellname with invalid n-string.
"""
'''
buf.write(HEADER)
write_uint(buf, 4) # CELLNAME record (explicit id)
@ -226,7 +229,7 @@ def test_file_6() -> None:
buf.seek(0)
with pytest.raises(InvalidDataError):
_layout = OasisLayout.read(buf)
layout = OasisLayout.read(buf)
#base_tests(layout)
#assert len(layout.cellnames) == 2
@ -237,10 +240,10 @@ def test_file_6() -> None:
#assert layout.cells[1].name == 1
def write_file_7(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_7(buf: BufferedIOBase) -> BufferedIOBase:
'''
Unused cellname.
"""
'''
buf.write(HEADER)
write_uint(buf, 4) # CELLNAME record (explicit id)

View File

@ -1,9 +1,17 @@
# mypy: disable-error-code="union-attr"
from typing import IO
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -24,9 +32,9 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.cells[0].properties
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)

View File

@ -1,9 +1,17 @@
# mypy: disable-error-code="union-attr"
from typing import IO
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -20,9 +28,9 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.layers
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)
@ -58,10 +66,9 @@ def write_file_1(buf: IO[bytes]) -> IO[bytes]:
+ [0b10] * 4
+ [0b01] * 2
+ [0b10] * 2
+ [0b11, 0b10]
)
+ [0b11, 0b10])
for t, (x, x_en) in enumerate(zip(wh, wh_en, strict=True)):
for t, (x, x_en) in enumerate(zip(wh, wh_en)):
write_uint(buf, 26) # CTRAPEZOID record
write_byte(buf, 0b1000_1011 | (x_en << 5)) # TWHX_YRDL
write_uint(buf, 1) # layer
@ -135,7 +142,8 @@ def test_file_1() -> None:
assert gg.width == [250, None][is_ctrapz], msg
elif ct_type in range(22, 24) or ct_type == 25:
assert gg.height == [100, None][is_ctrapz], msg
elif ct_type < 8 or 16 <= ct_type < 25 or ct_type >= 26:
else:
if ct_type < 8 or 16 <= ct_type < 25 or 26 <= ct_type :
assert gg.width == 250, msg
assert gg.height == 100, msg
else:
@ -152,9 +160,9 @@ def test_file_1() -> None:
assert geometry[55].repetition.b_vector == [0, 300]
def write_file_2(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_2(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)

View File

@ -1,9 +1,14 @@
from typing import IO
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
from .utils import MAGIC_BYTES, FOOTER
from ..basic import write_uint, write_bstring
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring
from ..main import OasisLayout
@ -21,12 +26,12 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.layers
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
File contains one PAD record.
1000 units/micron
Offset table inside START.
"""
'''
buf.write(MAGIC_BYTES)
write_uint(buf, 1) # START record
@ -54,12 +59,13 @@ def test_file_1() -> None:
assert layout.unit == 1000
def write_file_2(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_2(buf: BufferedIOBase) -> BufferedIOBase:
'''
File contains no records.
1/2 unit/micron
Offset table inside START.
"""
'''
buf.write(MAGIC_BYTES)
write_uint(buf, 1) # START record
@ -85,12 +91,12 @@ def test_file_2() -> None:
assert layout.unit == 0.5
def write_file_3(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_3(buf: BufferedIOBase) -> BufferedIOBase:
'''
File contains no records.
10/4 unit/micron
Offset table inside START.
"""
'''
buf.write(MAGIC_BYTES)
write_uint(buf, 1) # START record
@ -117,12 +123,12 @@ def test_file_3() -> None:
assert layout.unit == 10 / 4
def write_file_4(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_4(buf: BufferedIOBase) -> BufferedIOBase:
'''
File contains no records.
12.5 unit/micron (float32)
Offset table inside START.
"""
'''
buf.write(MAGIC_BYTES)
write_uint(buf, 1) # START record
@ -148,12 +154,12 @@ def test_file_4() -> None:
assert layout.unit == 12.5
def write_file_5(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_5(buf: BufferedIOBase) -> BufferedIOBase:
'''
File contains no records.
12.5 unit/micron (float64)
Offset table inside START.
"""
'''
buf.write(MAGIC_BYTES)
write_uint(buf, 1) # START record

View File

@ -1,15 +1,20 @@
from typing import IO
from collections.abc import Sequence
# type: ignore
from io import BytesIO
from typing import List, Tuple, Iterable, Sequence
from itertools import chain
from io import BytesIO, BufferedIOBase
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
LAYERS = [
(1, 2), (1, 5), (1, 6), (1, 8),
LAYERS = [(1, 2), (1, 5), (1, 6), (1, 8),
(5, 2), (5, 5), (5, 6), (5, 8),
(6, 2), (6, 5), (6, 6), (6, 8),
(7, 2), (7, 5), (7, 6), (7, 8),
@ -27,11 +32,11 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.cellnames
assert len(layout.cells) == 1
assert layout.cells[0].name.string == 'A' # type: ignore
assert layout.cells[0].name.string == 'A'
assert not layout.cells[0].properties
def write_names_geom(buf: IO[bytes], short: bool = False) -> IO[bytes]:
def write_names_geom(buf: BufferedIOBase, short: bool = False) -> BufferedIOBase:
write_uint(buf, 11) # LAYERNAME record (geometry)
write_bstring(buf, b'AA') # name
write_uint(buf, 0) # all layers
@ -97,7 +102,7 @@ def write_names_geom(buf: IO[bytes], short: bool = False) -> IO[bytes]:
return buf
def write_names_text(buf: IO[bytes], prefix: bytes = b'') -> IO[bytes]:
def write_names_text(buf: BufferedIOBase, prefix: bytes = b'') -> BufferedIOBase:
write_uint(buf, 12) # LAYERNAME record (geometry)
write_bstring(buf, prefix + b'AA') # name
write_uint(buf, 0) # all layers
@ -129,7 +134,7 @@ def write_names_text(buf: IO[bytes], prefix: bytes = b'') -> IO[bytes]:
write_uint(buf, 0) # all datatypes
return buf
def write_geom(buf: IO[bytes]) -> IO[bytes]:
def write_geom(buf: BufferedIOBase) -> BufferedIOBase:
for ll, dt in LAYERS:
write_uint(buf, 27) # CIRCLE record
write_byte(buf, 0b0011_1011) # 00rX_YRDL
@ -141,7 +146,7 @@ def write_geom(buf: IO[bytes]) -> IO[bytes]:
return buf
def write_text(buf: IO[bytes]) -> IO[bytes]:
def write_text(buf: BufferedIOBase) -> BufferedIOBase:
for ll, dt in LAYERS:
write_uint(buf, 19) # TEXT record
write_byte(buf, 0b0101_1011) # 0CNX_YRTL
@ -155,8 +160,7 @@ def write_text(buf: IO[bytes]) -> IO[bytes]:
def name_test(layers: Sequence, is_textlayer: bool) -> None:
for ii, nn in enumerate(layers):
msg = f'Fail on layername {ii}'
assert is_textlayer == nn.is_textlayer, msg
assert is_textlayer == nn.is_textlayer, f'Fail on layername {ii}'
assert nn.nstring.string == ['AA', 'L5A', 'H5A', 'E5A', 'I56A',
'E5L4', 'E5H4', 'E5E4', 'E5I47'][ii], msg
@ -168,8 +172,7 @@ def name_test(layers: Sequence, is_textlayer: bool) -> None:
def name_test_text(layers: Sequence) -> None:
for ii, nn in enumerate(layers):
msg = f'Fail on layername {ii}'
assert nn.is_textlayer, msg
assert nn.is_textlayer, f'Fail on layername {ii}'
assert nn.nstring.string == ['TAA', 'TL5A', 'TH5A', 'TE5A', 'TI56A'][ii], msg
assert nn.layer_interval[0] == [None, None, 5, 5, 5][ii], msg
@ -206,9 +209,9 @@ def elem_test_text(geometry: Sequence) -> None:
assert not gg.properties, msg
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_names_geom(buf)
@ -236,9 +239,9 @@ def test_file_1() -> None:
name_test(layout.layers, is_textlayer=False)
def write_file_2(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_2(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_names_text(buf)
@ -266,9 +269,9 @@ def test_file_2() -> None:
name_test(layout.layers, is_textlayer=True)
def write_file_3(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_3(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_names_text(buf, prefix=b'T')
write_names_geom(buf, short=True)
@ -282,9 +285,9 @@ def write_file_3(buf: IO[bytes]) -> IO[bytes]:
return buf
def write_file_4(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_4(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)

View File

@ -1,9 +1,17 @@
# mypy: disable-error-code="union-attr"
from typing import IO
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -20,9 +28,9 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.layers
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)

View File

@ -1,11 +1,17 @@
# mypy: disable-error-code="union-attr"
from typing import IO
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -26,9 +32,9 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.cells[0].properties
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)
@ -182,7 +188,7 @@ def test_file_1() -> None:
else:
assert gg.half_width == 12, msg
assert len(gg.point_list) == 3, msg # type: ignore
assert len(gg.point_list) == 3, msg
assert_equal(gg.point_list, [[150, 0], [0, 50], [-50, 0]], err_msg=msg)
if ii >= 4:

View File

@ -1,12 +1,17 @@
# mypy: disable-error-code="union-attr"
from typing import IO, cast
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte, write_float32, write_float64
from ..records import Rectangle
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import InvalidRecordError, InvalidDataError, write_float32, write_float64
from ..main import OasisLayout
@ -22,7 +27,7 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.layers
def write_rectangle(buf: IO[bytes], pos: tuple[int, int] = (300, -400)) -> None:
def write_rectangle(buf: BufferedIOBase, pos: Tuple[int, int] = (300, -400)) -> None:
write_uint(buf, 20) # RECTANGLE record
write_byte(buf, 0b0111_1011) # SWHX_YRDL
write_uint(buf, 1) # layer
@ -33,9 +38,9 @@ def write_rectangle(buf: IO[bytes], pos: tuple[int, int] = (300, -400)) -> None:
write_sint(buf, pos[1]) # geometry-y (absolute)
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)
@ -174,7 +179,7 @@ def test_file_1() -> None:
assert not layout.cells[1].properties
assert not layout.cells[1].geometry
geometry = cast(list[Rectangle], layout.cells[0].geometry)
geometry = layout.cells[0].geometry
assert len(geometry) == 1
assert geometry[0].layer == 1
assert geometry[0].datatype == 2
@ -202,19 +207,19 @@ def test_file_1() -> None:
if ii < 3:
assert pp.y == 400 * (ii + 1), msg
elif ii >= 7:
elif 7 <= ii:
assert pp.y == 0, msg
if ii < 4 or ii == 5:
assert not bool(pp.flip), msg
assert pp.flip == False, msg
else:
assert bool(pp.flip), msg
assert pp.flip == True, msg
if ii < 5:
assert pp.angle == 0, msg
elif ii in (5, 6):
assert pp.angle == 90, msg
elif ii >= 7:
elif 7 <= ii:
assert pp.angle == 270, msg
if ii < 7:
@ -249,9 +254,9 @@ def test_file_1() -> None:
assert placements[12].repetition.b_vector == [-330, 330]
def write_file_common(buf: IO[bytes], variant: int) -> IO[bytes]:
"""
"""
def write_file_common(buf: BufferedIOBase, variant: int) -> BufferedIOBase:
'''
'''
assert variant in (2, 3, 5, 7), 'Error in test definition!'
buf.write(HEADER)
@ -497,9 +502,9 @@ def common_tests(layout: OasisLayout, variant: int) -> None:
assert pp.y == 400 * (ii + 1), msg
if ii in (4, 6):
assert bool(pp.flip), msg
assert pp.flip == True, msg
else:
assert not bool(pp.flip), msg
assert pp.flip == False, msg
if ii in (5, 6):
assert pp.angle == 90, msg
@ -515,9 +520,9 @@ def common_tests(layout: OasisLayout, variant: int) -> None:
assert placements[6].y == 2400
def write_file_4(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_4(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 3) # CELLNAME record (implicit id 0)
@ -594,9 +599,9 @@ def write_file_4(buf: IO[bytes]) -> IO[bytes]:
return buf
def write_file_6(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_6(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)
@ -747,9 +752,9 @@ def test_file_6() -> None:
assert pp.y == [0, 1000][ii], msg
def write_file_8(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_8(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)
@ -843,7 +848,7 @@ def test_file_8() -> None:
assert not layout.cells[2].properties
assert not layout.cells[2].placements
geometry = cast(list[Rectangle], layout.cells[2].geometry)
geometry = layout.cells[2].geometry
assert len(geometry) == 1
assert geometry[0].layer == 1
assert geometry[0].datatype == 2

View File

@ -1,12 +1,17 @@
# mypy: disable-error-code="union-attr, arg-type"
from typing import IO
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -80,11 +85,8 @@ def common_tests(layout: OasisLayout) -> None:
for ii in range(4):
msg = f'Fail on poly {ii}'
assert len(geometry[0].point_list) == 6, msg
assert_equal(
geometry[0].point_list,
[[150, 0], [0, 50], [-50, 0], [0, 50], [-100, 0], [0, -100]],
err_msg=msg,
)
assert_equal(geometry[0].point_list, [[150, 0], [0, 50], [-50, 0], [0, 50],
[-100, 0], [0, -100]], err_msg=msg)
assert len(geometry[4].point_list) == 6
assert_equal(geometry[4].point_list, [[0, 150], [50, 0], [0, -50], [50, 0], [0, -100], [-100, 0]])
@ -95,10 +97,8 @@ def common_tests(layout: OasisLayout) -> None:
assert len(geometry[7].point_list) == 9
assert_equal(geometry[7].point_list, [[25, 0], [50, 50], [0, 50], [-50, 50], [-50, 0], [-50, -50], [10, -75], [25, -25], [40, 0]])
assert len(geometry[8].point_list) == 9
assert_equal(
geometry[8].point_list,
numpy.cumsum([[25, 0], [50, 50], [0, 50], [-50, 50], [-50, 0], [-50, -50], [10, -75], [25, -25], [45, -575]], axis=0),
)
assert_equal(geometry[8].point_list,
numpy.cumsum([[25, 0], [50, 50], [0, 50], [-50, 50], [-50, 0], [-50, -50], [10, -75], [25, -25], [45, -575]], axis=0))
for ii in range(9, 12):
msg = f'Fail on poly {ii}'
@ -106,9 +106,9 @@ def common_tests(layout: OasisLayout) -> None:
assert_equal(geometry[ii].point_list, [[0, 150], [50, 0], [0, -50], [50, 0], [0, -100], [-100, 0]], err_msg=msg)
def write_file_common(buf: IO[bytes], variant: int) -> IO[bytes]:
"""
"""
def write_file_common(buf: BufferedIOBase, variant: int) -> BufferedIOBase:
'''
'''
assert variant in (1, 3), 'Error in test!!'
buf.write(HEADER)
@ -263,7 +263,7 @@ def write_file_common(buf: IO[bytes], variant: int) -> IO[bytes]:
write_uint(buf, 50 << 4 | 0b0100) # (pointlist)
write_uint(buf, 50 << 4 | 0b1100) # (pointlist)
write_uint(buf, 10 << 2 | 0b01) # (pointlist)
write_sint(buf, -75)
write_sint(buf, -75 )
write_uint(buf, 25 << 4 | 0b1110) # (pointlist)
write_sint(buf, 900) # geometry-x (absolute)
@ -286,7 +286,7 @@ def write_file_common(buf: IO[bytes], variant: int) -> IO[bytes]:
write_uint(buf, 50 << 4 | 0b0100) # (pointlist)
write_uint(buf, 50 << 4 | 0b1100) # (pointlist)
write_uint(buf, 10 << 2 | 0b01) # (pointlist)
write_sint(buf, -75)
write_sint(buf, -75 )
write_uint(buf, 25 << 4 | 0b1110) # (pointlist)
write_sint(buf, 1100) # geometry-x (absolute)
@ -375,9 +375,9 @@ def test_file_1() -> None:
assert not gg.properties, f'Fail on polygon {ii}'
def write_file_2(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_2(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)
@ -425,8 +425,7 @@ def test_file_2() -> None:
assert_equal(poly.point_list,
([[-1000, 0]]
+ [[(-1) ** nn * 10, 20] for nn in range(8000)]
+ [[1000, 0], [0, -20 * 8000]]),
)
+ [[1000, 0], [0, -20 * 8000]]))
def test_file_3() -> None:
@ -445,7 +444,7 @@ def test_file_3() -> None:
for ii, gg in enumerate(geometry):
msg = f'Fail on polygon {ii}'
assert len(gg.properties) == 1, msg
assert gg.properties[0].name == 0, msg # type: ignore
assert gg.properties[0].name == 0, msg
assert len(gg.properties[0].values) == 1, msg
assert gg.properties[0].values[0] * 5 == 1, msg # type: ignore
assert gg.properties[0].values[0] * 5 == 1, msg

View File

@ -1,13 +1,17 @@
# mypy: disable-error-code="union-attr, index, arg-type"
from typing import IO
from io import BytesIO
# type: ignore
import pytest
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte
from ..basic import InvalidDataError
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -23,12 +27,12 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.layers
def write_file_common(buf: IO[bytes], variant: int) -> IO[bytes]:
"""
"""
def write_file_common(buf: BufferedIOBase, variant: int) -> BufferedIOBase:
'''
'''
include_repetitions = variant in (2, 5)
def var_byte(buf: IO[bytes], byte: int) -> None:
def var_byte(buf, byte):
if include_repetitions:
byte |= 0b0100
write_byte(buf, byte)
@ -50,6 +54,7 @@ def write_file_common(buf: IO[bytes], variant: int) -> IO[bytes]:
write_uint(buf, 7) # PROPNAME record (implicit id 1)
write_bstring(buf, b'PROP1')
write_uint(buf, 14) # CELL record (explicit)
write_bstring(buf, b'A') # Cell name
@ -354,9 +359,9 @@ def test_file_5() -> None:
assert gg.repetition.b_vector == [0, 320], msg
def write_file_3(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_3(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 10) # PROPSTRING (explicit id)
@ -370,7 +375,7 @@ def write_file_3(buf: IO[bytes]) -> IO[bytes]:
write_uint(buf, 7) # PROPNAME record (implicit id 0)
write_bstring(buf, b'S_GDS_PROPERTY')
# ** CELL **
write_uint(buf, 14) # CELL record (explicit)
write_bstring(buf, b'A') # Cell name
@ -579,9 +584,9 @@ def test_file_3() -> None:
assert geometry[ii].properties[0].values[1].string == 'PROP_VALUE2', msg
def write_file_4_6(buf: IO[bytes], variant: int) -> IO[bytes]:
"""
"""
def write_file_4_6(buf: BufferedIOBase, variant: int) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 10) # PROPSTRING (explicit id)
@ -609,7 +614,7 @@ def write_file_4_6(buf: IO[bytes], variant: int) -> IO[bytes]:
write_sint(buf, 300) # geometry-x (relative)
write_sint(buf, -400) # geometry-y (relative)
# ** CELL **
write_uint(buf, 14) # CELL record (explicit)
write_bstring(buf, b'TOP') # Cell name
@ -786,8 +791,8 @@ def write_file_4_6(buf: IO[bytes], variant: int) -> IO[bytes]:
def test_file_4() -> None:
"""
"""
'''
'''
buf = write_file_4_6(BytesIO(), 4)
buf.seek(0)
@ -823,7 +828,7 @@ def test_file_4() -> None:
assert pp.x == [-300, 0, 0, 300, 700, 700, 700, 2000, 4000, 6000, 8000, 10000, 12000][ii], msg
assert pp.y == [400, 200, 400, 400, 400, 1400, 2400, 0, 0, 0, 0, 0, 0][ii], msg
if ii == 4 or ii >= 6:
if ii == 4 or 6 <= ii:
assert pp.flip, msg
else:
assert not pp.flip, msg
@ -855,8 +860,8 @@ def test_file_4() -> None:
def test_file_6() -> None:
"""
"""
'''
'''
buf = write_file_4_6(BytesIO(), 6)
buf.seek(0)
@ -892,7 +897,7 @@ def test_file_6() -> None:
assert pp.x == [-300, 0, 0, 300, 700, 700, 700, 2000, 4000, 6000, 8000, 10000, 12000][ii], msg
assert pp.y == [400, 400, 400, 400, 400, 1400, 2400, 0, 0, 0, 0, 0, 0][ii], msg
if ii == 4 or ii >= 6:
if ii == 4 or 6 <= ii:
assert pp.flip, msg
else:
assert not pp.flip, msg
@ -927,9 +932,9 @@ def test_file_6() -> None:
assert placements[ii].properties[0].values[1].string == 'PROP_VALUE2', msg
def write_file_7_8_9(buf: IO[bytes], variant: int) -> IO[bytes]:
"""
"""
def write_file_7_8_9(buf: BufferedIOBase, variant: int) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 28) # PROPERTY record
@ -986,7 +991,7 @@ def write_file_7_8_9(buf: IO[bytes], variant: int) -> IO[bytes]:
write_uint(buf, 10) # prop-value 0 (a-string)
write_bstring(buf, b'CPValue0')
# ** CELL **
write_uint(buf, 13) # CELL record (name ref.)
write_uint(buf, 0) # Cell name 0 (XYZ)
@ -1015,6 +1020,7 @@ def write_file_7_8_9(buf: IO[bytes], variant: int) -> IO[bytes]:
return buf
def test_file_7() -> None:
buf = write_file_7_8_9(BytesIO(), 7)
@ -1059,20 +1065,20 @@ def test_file_7() -> None:
def test_file_8() -> None:
"""
"""
'''
'''
buf = write_file_7_8_9(BytesIO(), 8)
buf.seek(0)
with pytest.raises(InvalidDataError):
_layout = OasisLayout.read(buf)
layout = OasisLayout.read(buf)
def test_file_9() -> None:
"""
"""
'''
'''
buf = write_file_7_8_9(BytesIO(), 9)
buf.seek(0)
with pytest.raises(InvalidDataError):
_layout = OasisLayout.read(buf)
layout = OasisLayout.read(buf)

View File

@ -1,9 +1,15 @@
# mypy: disable-error-code="union-attr"
from typing import IO
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -74,9 +80,9 @@ def base_tests(layout: OasisLayout) -> None:
assert geometry[10].repetition.x_displacements == [200, 300]
def write_file_common(buf: IO[bytes], variant: int) -> IO[bytes]:
"""
"""
def write_file_common(buf: BufferedIOBase, variant: int) -> BufferedIOBase:
'''
'''
assert variant in (1, 2), 'Error in test!!'
buf.write(HEADER)
@ -267,7 +273,7 @@ def test_file_2() -> None:
prop = gg.properties[0]
assert prop.name == 0, msg
assert len(prop.values) == 1, msg # type: ignore
assert prop.values[0].numerator == 1, msg # type: ignore
assert prop.values[0].denominator == 5, msg # type: ignore
assert len(prop.values) == 1, msg
assert prop.values[0].numerator == 1, msg
assert prop.values[0].denominator == 5, msg

View File

@ -1,11 +1,14 @@
# mypy: disable-error-code="union-attr, index"
from typing import IO
from io import BytesIO
# type: ignore
import pytest
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte
from ..basic import InvalidRecordError, InvalidDataError
from ..basic import GridRepetition, ArbitraryRepetition
from ..main import OasisLayout
@ -30,8 +33,8 @@ def common_tests(layout: OasisLayout) -> None:
geometry = layout.cells[0].geometry
assert geometry[0].layer == 1
assert geometry[0].datatype == 2
geometry[0].layer == 1
geometry[0].datatype == 2
for ii, gg in enumerate(geometry[1:]):
assert gg.layer == 2, f'textstring #{ii + 1}'
assert gg.datatype == 1, f'textstring #{ii + 1}'
@ -83,12 +86,12 @@ def common_tests(layout: OasisLayout) -> None:
assert geometry[13].repetition.b_vector == [-10, 10]
assert geometry[14].repetition.a_count == 3
assert geometry[14].repetition.b_count is None
assert geometry[14].repetition.b_count == None
assert geometry[14].repetition.a_vector == [11, 12]
assert geometry[14].repetition.b_vector is None
assert geometry[15].repetition.a_count == 4
assert geometry[15].repetition.b_count is None
assert geometry[15].repetition.b_count == None
assert geometry[15].repetition.a_vector == [-10, 10]
assert geometry[15].repetition.b_vector is None
@ -99,10 +102,10 @@ def common_tests(layout: OasisLayout) -> None:
assert geometry[19].repetition.y_displacements == [12, -9]
def write_file_common(buf: IO[bytes], variant: int) -> IO[bytes]:
"""
def write_file_common(buf: BufferedIOBase, variant: int) -> BufferedIOBase:
'''
Single cell with explicit name 'XYZ'
"""
'''
assert variant in (1, 2, 5, 12), 'Error in test!!'
buf.write(HEADER)
@ -460,11 +463,11 @@ def test_file_12() -> None:
assert layout.textstrings[2].string == 'B'
def write_file_3(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_3(buf: BufferedIOBase) -> BufferedIOBase:
'''
File with one textstring with explicit id, and one with an implicit id.
Should fail.
"""
'''
buf.write(HEADER)
write_uint(buf, 6) # TEXTSTRING record (explicit id)
@ -494,15 +497,15 @@ def test_file_3() -> None:
buf.seek(0)
with pytest.raises(InvalidRecordError):
_layout = OasisLayout.read(buf)
layout = OasisLayout.read(buf)
def write_file_4(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_4(buf: BufferedIOBase) -> BufferedIOBase:
'''
File with a TEXT record that references a non-existent TEXTSTRING
TODO add an optional check for valid references
"""
'''
buf.write(HEADER)
write_uint(buf, 5) # TEXTSTRING record (implicit id 0)
@ -537,10 +540,10 @@ def test_file_4() -> None:
base_tests(layout)
def write_file_6(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_6(buf: BufferedIOBase) -> BufferedIOBase:
'''
File with TEXT record that uses an un-filled modal for the repetition
"""
'''
buf.write(HEADER)
write_uint(buf, 5) # TEXTSTRING record (implicit id 0)
@ -567,13 +570,13 @@ def test_file_6() -> None:
buf.seek(0)
with pytest.raises(InvalidDataError):
_layout = OasisLayout.read(buf)
layout = OasisLayout.read(buf)
def write_file_7(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_7(buf: BufferedIOBase) -> BufferedIOBase:
'''
File with TEXT record that uses an un-filled modal for the layer
"""
'''
buf.write(HEADER)
write_uint(buf, 5) # TEXTSTRING record (implicit id 0)
@ -598,13 +601,13 @@ def test_file_7() -> None:
buf.seek(0)
with pytest.raises(InvalidDataError):
_layout = OasisLayout.read(buf)
layout = OasisLayout.read(buf)
def write_file_8(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_8(buf: BufferedIOBase) -> BufferedIOBase:
'''
File with TEXT record that uses an un-filled modal for the datatype
"""
'''
buf.write(HEADER)
write_uint(buf, 5) # TEXTSTRING record (implicit id 0)
@ -629,13 +632,13 @@ def test_file_8() -> None:
buf.seek(0)
with pytest.raises(InvalidDataError):
_layout = OasisLayout.read(buf)
layout = OasisLayout.read(buf)
def write_file_9(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_9(buf: BufferedIOBase) -> BufferedIOBase:
'''
File with TEXT record that uses a default modal for the x coordinate
"""
'''
buf.write(HEADER)
write_uint(buf, 5) # TEXTSTRING record (implicit id 0)
@ -668,10 +671,10 @@ def test_file_9() -> None:
assert text.y == -200
def write_file_10(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_10(buf: BufferedIOBase) -> BufferedIOBase:
'''
File with TEXT record that uses a default modal for the y coordinate
"""
'''
buf.write(HEADER)
write_uint(buf, 5) # TEXTSTRING record (implicit id 0)
@ -704,10 +707,10 @@ def test_file_10() -> None:
assert text.x == 100
def write_file_11(buf: IO[bytes]) -> IO[bytes]:
"""
def write_file_11(buf: BufferedIOBase) -> BufferedIOBase:
'''
File with TEXT record that uses an un-filled modal for the text string
"""
'''
buf.write(HEADER)
write_uint(buf, 5) # TEXTSTRING record (implicit id 0)
@ -732,4 +735,4 @@ def test_file_11() -> None:
buf.seek(0)
with pytest.raises(InvalidDataError):
_layout = OasisLayout.read(buf)
layout = OasisLayout.read(buf)

View File

@ -1,9 +1,17 @@
# mypy: disable-error-code="union-attr"
from typing import IO
from io import BytesIO
# type: ignore
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
import pytest # type: ignore
import numpy
from numpy.testing import assert_equal
from .utils import HEADER, FOOTER
from ..basic import write_uint, write_sint, write_bstring, write_byte
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte, PathExtensionScheme
from ..basic import InvalidRecordError, InvalidDataError
from ..main import OasisLayout
@ -24,9 +32,9 @@ def base_tests(layout: OasisLayout) -> None:
assert not layout.cells[0].properties
def write_file_1(buf: IO[bytes]) -> IO[bytes]:
"""
"""
def write_file_1(buf: BufferedIOBase) -> BufferedIOBase:
'''
'''
buf.write(HEADER)
write_uint(buf, 14) # CELL record (explicit)
@ -209,7 +217,7 @@ def test_file_1() -> None:
if ii in (0, 4):
assert gg.delta_a == -20, msg
elif ii >= 8:
elif 8 <= ii:
assert gg.delta_a == 0, msg
else:
assert gg.delta_a == 20, msg

View File

@ -1,6 +1,9 @@
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO
import pytest # type: ignore
from ..basic import read_uint, read_sint, write_uint, write_sint

View File

@ -1,6 +1,12 @@
from io import BytesIO
from typing import List, Tuple, Iterable
from itertools import chain
from io import BytesIO, BufferedIOBase
import struct
from ..basic import write_uint, write_bstring, write_byte
import pytest # type: ignore
from ..basic import write_uint, write_sint, read_uint, read_sint, write_bstring, write_byte
from ..main import OasisLayout
MAGIC_BYTES = b'%SEMI-OASIS\r\n'

View File

@ -44,7 +44,7 @@ classifiers = [
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
]
requires-python = ">=3.11"
requires-python = ">=3.8"
dynamic = ["version"]
dependencies = [
]
@ -53,38 +53,4 @@ dependencies = [
path = "fatamorgana/__init__.py"
[project.optional-dependencies]
numpy = ["numpy>=1.26"]
[tool.ruff]
exclude = [
".git",
"dist",
]
line-length = 145
indent-width = 4
lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
lint.select = [
"NPY", "E", "F", "W", "B", "ANN", "UP", "SLOT", "SIM", "LOG",
"C4", "ISC", "PIE", "PT", "RET", "TCH", "PTH", "INT",
"ARG", "PL", "R", "TRY",
"G010", "G101", "G201", "G202",
"Q002", "Q003", "Q004",
]
lint.ignore = [
#"ANN001", # No annotation
"ANN002", # *args
"ANN003", # **kwargs
"ANN401", # Any
"ANN101", # self: Self
"SIM108", # single-line if / else assignment
"RET504", # x=y+z; return x
"PIE790", # unnecessary pass
"ISC003", # non-implicit string concatenation
"C408", # dict(x=y) instead of {'x': y}
"PLR09", # Too many xxx
"PLR2004", # magic number
"PLC0414", # import x as x
"TRY003", # Long exception message
]
numpy = ["numpy~=1.21"]