Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Parisnet protocol and py312 support #363

Merged
merged 8 commits into from
May 27, 2024
Merged

Parisnet protocol and py312 support #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
089e557
Parisnet protocol and py312 support
droserasprout May 15, 2024
b03b3b3
Update node version and params
droserasprout May 18, 2024
8da5640
fix sandbox tests
droserasprout May 22, 2024
2b410cc
Update tzt suite
droserasprout May 22, 2024
2d66e9f
lock
droserasprout May 22, 2024
5142652
lock requests
droserasprout May 22, 2024
b1efbab
datetime usage
droserasprout May 22, 2024
a28ebc2
Changelog, lock
droserasprout May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## [3.12.0](https://github.com/baking-bad/pytezos/compare/3.11.3...3.12.0) (2024-05-27)

### Added

* Parisnet protocol support
* Compatibility with Python 3.12

### Changed

* Octez binaries updated to v20.0-rc1

## [3.11.3](https://github.com/baking-bad/pytezos/compare/3.11.2...3.11.3) (2024-02-23)

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions michelson-kernel.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-alpine3.17 AS compile-image
FROM python:3.12-alpine3.17 AS compile-image
RUN apk add --update --no-cache \
build-base \
libtool \
Expand Down Expand Up @@ -31,7 +31,7 @@ COPY pyproject.toml requirements.txt README.md /opt/pytezos/

RUN /usr/local/bin/pip install --prefix /opt/pytezos --no-cache-dir --disable-pip-version-check --no-deps -r /opt/pytezos/requirements.txt -e .

FROM python:3.11-alpine3.17 AS build-image
FROM python:3.12-alpine3.17 AS build-image
RUN apk add --update --no-cache \
binutils \
gmp-dev \
Expand All @@ -41,7 +41,7 @@ RUN apk add --update --no-cache \
RUN adduser -D pytezos
USER pytezos
ENV PATH="/opt/pytezos/bin:$PATH"
ENV PYTHONPATH="/home/pytezos:/home/pytezos/src:/opt/pytezos/src:/opt/pytezos/lib/python3.11/site-packages:$PYTHONPATH"
ENV PYTHONPATH="/home/pytezos:/home/pytezos/src:/opt/pytezos/src:/opt/pytezos/lib/python3.12/site-packages:$PYTHONPATH"
WORKDIR /home/pytezos/
ENTRYPOINT [ "/opt/pytezos/bin/jupyter-notebook", "--port=8888", "--ip=0.0.0.0" , "--no-browser", "--no-mathjax" ]
EXPOSE 8888
Expand Down
1,157 changes: 575 additions & 582 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Software Development :: Libraries :: Application Frameworks",
"Typing :: Typed",
Expand All @@ -39,7 +40,7 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.8.1,<3.12"
python = ">=3.8.1,<3.13"
attrs = ">=21.4.0"
base58 = "^2.1.1"
cattrs = ">=22.1.0"
Expand All @@ -56,7 +57,8 @@ ply = "^3.11"
py-ecc = "^7.0.0"
pysodium = "^0.7.10"
python-dateutil = "^2.8.2"
requests = "^2.28.2"
# NOTE: https://github.com/docker/docker-py/issues/3256
requests = ">=2.28.2,<2.32.0"
secp256k1 = "^0.14.0"
simplejson = "^3.17.6"
strict-rfc3339 = "^0.7"
Expand Down Expand Up @@ -100,7 +102,7 @@ force_single_line = true

[tool.black]
line-length = 120
target-version = ['py38', 'py39', 'py310', 'py311']
target-version = ['py38', 'py39', 'py310', 'py311', 'py312']
skip-string-normalization = true

[tool.ruff]
Expand Down Expand Up @@ -128,7 +130,7 @@ lint.ignore = [
"SIM108",
"SIM114",
]
target-version = "py311"
target-version = "py312"
lint.extend-select = ["B", "C", "RET", "SIM"]

[build-system]
Expand Down
6 changes: 3 additions & 3 deletions pytezos.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-alpine3.17 AS compile-image
FROM python:3.12-alpine3.17 AS compile-image
RUN apk add --update --no-cache \
build-base \
libtool \
Expand Down Expand Up @@ -31,7 +31,7 @@ COPY pyproject.toml requirements.slim.txt README.md /opt/pytezos/

RUN /usr/local/bin/pip install --prefix /opt/pytezos --no-cache-dir --disable-pip-version-check --no-deps -r /opt/pytezos/requirements.slim.txt -e .

FROM python:3.11-alpine3.17 AS build-image
FROM python:3.12-alpine3.17 AS build-image
RUN apk add --update --no-cache \
binutils \
gmp-dev \
Expand All @@ -41,7 +41,7 @@ RUN apk add --update --no-cache \
RUN adduser -D pytezos
USER pytezos
ENV PATH="/opt/pytezos/bin:$PATH"
ENV PYTHONPATH="/home/pytezos:/home/pytezos/src:/opt/pytezos/src:/opt/pytezos/lib/python3.11/site-packages:$PYTHONPATH"
ENV PYTHONPATH="/home/pytezos:/home/pytezos/src:/opt/pytezos/src:/opt/pytezos/lib/python3.12/site-packages:$PYTHONPATH"
WORKDIR /home/pytezos/
ENTRYPOINT ["python"]

Expand Down
323 changes: 161 additions & 162 deletions requirements.dev.txt
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 49 additions & 49 deletions requirements.slim.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
attrs==23.2.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
base58==2.1.1 ; python_full_version >= "3.8.1" and python_version < "3.12"
cached-property==1.5.2 ; python_full_version >= "3.8.1" and python_version < "3.12"
cattrs==23.2.3 ; python_full_version >= "3.8.1" and python_version < "3.12"
certifi==2024.2.2 ; python_full_version >= "3.8.1" and python_version < "3.12"
cffi==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
charset-normalizer==3.3.2 ; python_full_version >= "3.8.1" and python_version < "3.12"
click==8.1.7 ; python_full_version >= "3.8.1" and python_version < "3.12"
colorama==0.4.6 ; python_full_version >= "3.8.1" and python_version < "3.12" and platform_system == "Windows"
cryptography==42.0.4 ; python_full_version >= "3.8.1" and python_version < "3.12"
cytoolz==0.12.3 ; python_full_version >= "3.8.1" and python_version < "3.12" and implementation_name == "cpython"
deprecation==2.1.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
docker==6.1.3 ; python_full_version >= "3.8.1" and python_version < "3.12"
eth-hash==0.6.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
eth-typing==4.0.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
eth-utils==4.0.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
exceptiongroup==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.11"
fastecdsa==2.3.2 ; python_full_version >= "3.8.1" and python_version < "3.12"
idna==3.6 ; python_full_version >= "3.8.1" and python_version < "3.12"
importlib-resources==6.1.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
jsonschema-specifications==2023.12.1 ; python_full_version >= "3.8.1" and python_version < "3.12"
jsonschema==4.21.1 ; python_full_version >= "3.8.1" and python_version < "3.12"
mnemonic==0.21 ; python_full_version >= "3.8.1" and python_version < "3.12"
netstruct==1.1.2 ; python_full_version >= "3.8.1" and python_version < "3.12"
packaging==23.2 ; python_full_version >= "3.8.1" and python_version < "3.12"
attrs==23.2.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
base58==2.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
cached-property==1.5.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
cattrs==23.2.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
certifi==2024.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
cffi==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
charset-normalizer==3.3.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
click==8.1.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
colorama==0.4.6 ; python_full_version >= "3.8.1" and python_version < "3.13" and platform_system == "Windows"
cryptography==42.0.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
cytoolz==0.12.3 ; python_full_version >= "3.8.1" and python_version < "3.13" and implementation_name == "cpython"
deprecation==2.1.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
docker==6.1.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
eth-hash==0.7.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
eth-typing==4.2.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
eth-utils==4.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
exceptiongroup==1.2.1 ; python_full_version >= "3.8.1" and python_version < "3.11"
fastecdsa==2.3.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
idna==3.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
importlib-resources==6.4.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
jsonschema-specifications==2023.12.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
jsonschema==4.22.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
mnemonic==0.21 ; python_full_version >= "3.8.1" and python_version < "3.13"
netstruct==1.1.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
packaging==24.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
pkgutil-resolve-name==1.3.10 ; python_full_version >= "3.8.1" and python_version < "3.9"
ply==3.11 ; python_full_version >= "3.8.1" and python_version < "3.12"
py-ecc==7.0.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
pycparser==2.21 ; python_full_version >= "3.8.1" and python_version < "3.12"
pysodium==0.7.17 ; python_full_version >= "3.8.1" and python_version < "3.12"
python-dateutil==2.8.2 ; python_full_version >= "3.8.1" and python_version < "3.12"
pywin32==306 ; python_full_version >= "3.8.1" and python_version < "3.12" and sys_platform == "win32"
referencing==0.33.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
requests==2.31.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
rpds-py==0.18.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
secp256k1==0.14.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
setuptools==69.1.1 ; python_full_version >= "3.8.1" and python_version < "3.12"
simple-bson==0.0.3 ; python_full_version >= "3.8.1" and python_version < "3.12"
simplejson==3.19.2 ; python_full_version >= "3.8.1" and python_version < "3.12"
six==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
strict-rfc3339==0.7 ; python_full_version >= "3.8.1" and python_version < "3.12"
tabulate==0.9.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
testcontainers==3.7.1 ; python_full_version >= "3.8.1" and python_version < "3.12"
toolz==0.12.1 ; python_full_version >= "3.8.1" and python_version < "3.12" and (implementation_name == "pypy" or implementation_name == "cpython")
tqdm==4.66.2 ; python_full_version >= "3.8.1" and python_version < "3.12"
typing-extensions==4.9.0 ; python_full_version >= "3.8.1" and python_version < "3.11"
urllib3==2.2.1 ; python_full_version >= "3.8.1" and python_version < "3.12"
websocket-client==1.7.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
wrapt==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.12"
zipp==3.17.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
ply==3.11 ; python_full_version >= "3.8.1" and python_version < "3.13"
py-ecc==7.0.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
pycparser==2.22 ; python_full_version >= "3.8.1" and python_version < "3.13"
pysodium==0.7.17 ; python_full_version >= "3.8.1" and python_version < "3.13"
python-dateutil==2.9.0.post0 ; python_full_version >= "3.8.1" and python_version < "3.13"
pywin32==306 ; python_full_version >= "3.8.1" and python_version < "3.13" and sys_platform == "win32"
referencing==0.35.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
requests==2.31.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
rpds-py==0.18.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
secp256k1==0.14.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
setuptools==69.5.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
simple-bson==0.0.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
simplejson==3.19.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
six==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
strict-rfc3339==0.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
tabulate==0.9.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
testcontainers==3.7.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
toolz==0.12.1 ; python_full_version >= "3.8.1" and python_version < "3.13" and (implementation_name == "pypy" or implementation_name == "cpython")
tqdm==4.66.4 ; python_full_version >= "3.8.1" and python_version < "3.13"
typing-extensions==4.12.0 ; python_full_version >= "3.8.1" and python_version < "3.11"
urllib3==2.2.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
websocket-client==1.8.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
wrapt==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
zipp==3.19.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
Loading
Loading