From 7f88357562d957f80a79b73188496f1a5f4e2feb Mon Sep 17 00:00:00 2001 From: Tim Rid <6593626+timrid@users.noreply.github.com> Date: Tue, 30 Mar 2021 19:20:57 +0200 Subject: [PATCH] changed "construct" dependency to 2.10.64 and adapt to the changes --- construct-stubs/lib/__init__.pyi | 3 +-- construct-stubs/lib/binary.pyi | 4 ++-- construct-stubs/lib/py3compat.pyi | 3 +-- requirements.txt | 2 +- setup.py | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/construct-stubs/lib/__init__.pyi b/construct-stubs/lib/__init__.pyi index 9a6d188..24c6562 100644 --- a/construct-stubs/lib/__init__.pyi +++ b/construct-stubs/lib/__init__.pyi @@ -29,9 +29,8 @@ __all__ = [ 'integer2bytes', 'integers2bytes', 'integertypes', - 'iteratebytes', - 'iterateints', 'ListContainer', + 'ONWINDOWS', 'PY', 'PY2', 'PY3', diff --git a/construct-stubs/lib/binary.pyi b/construct-stubs/lib/binary.pyi index 9e5b878..69ef57a 100644 --- a/construct-stubs/lib/binary.pyi +++ b/construct-stubs/lib/binary.pyi @@ -1,5 +1,5 @@ -def integer2bits(number: int, width: int) -> bytes: ... -def integer2bytes(number: int, width: int) -> bytes: ... +def integer2bits(number: int, width: int, signed: bool = ...) -> bytes: ... +def integer2bytes(number: int, width: int, signed: bool = ...) -> bytes: ... def bits2integer(data: bytes, signed: bool = ...) -> int: ... def bytes2integer(data: bytes, signed: bool = ...) -> int: ... def bytes2bits(data: bytes) -> bytes: ... diff --git a/construct-stubs/lib/py3compat.pyi b/construct-stubs/lib/py3compat.pyi index afb4b7e..f105096 100644 --- a/construct-stubs/lib/py3compat.pyi +++ b/construct-stubs/lib/py3compat.pyi @@ -3,6 +3,7 @@ import typing as t PY2: bool PY3: bool PYPY: bool +ONWINDOWS: bool stringtypes: t.Tuple[t.Type[bytes], t.Type[str]] integertypes: t.Tuple[t.Type[int]] @@ -13,8 +14,6 @@ def int2byte(character: int) -> bytes: ... def byte2int(character: bytes) -> int: ... def str2bytes(string: str) -> bytes: ... def bytes2str(string: bytes) -> str: ... -def iteratebytes(data: bytes) -> t.Iterator[bytes]: ... -def iterateints(data: bytes) -> t.Iterator[int]: ... def reprstring(data: t.Union[bytes, str]) -> str: ... def trimstring(data: t.Union[bytes, str]) -> str: ... def integers2bytes(ints: t.Iterable[int]) -> bytes: ... diff --git a/requirements.txt b/requirements.txt index fae20c6..3093f87 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -construct==2.10.61 +construct==2.10.64 pytest>=6.2.0 numpy>=1.20.* arrow diff --git a/setup.py b/setup.py index ad8d473..0f5f5e2 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setup( url="https://github.com/timrid/construct-typing", author="Tim Riddermann", python_requires=">=3.7", - install_requires=["construct==2.10.61"], + install_requires=["construct==2.10.64"], keywords=[ "construct", "kaitai",