Skip to content

Commit

Permalink
Bump cryptography and other deps (#348)
Browse files Browse the repository at this point in the history
  • Loading branch information
@droserasprout
droserasprout authored Jun 13, 2023
1 parent 4b80730 commit 15e826e
Show file tree
Hide file tree
Showing 8 changed files with 990 additions and 1,141 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,5 @@ cython_debug/

.vscode
.idea/

.flakeheaven_cache/
3 changes: 0 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ clean: ## Remove all files from .gitignore except for `.venv`
git clean -xdf --exclude=".venv"

update: ## Update dependencies, export requirements.txt
git checkout HEAD requirements.* poetry.lock

make install
poetry update

cp pyproject.toml pyproject.toml.bak
Expand Down
1,828 changes: 838 additions & 990 deletions poetry.lock
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ attrs = "^21.4.0"
base58 = "^2.1.1"
cattrs = "^22.1.0"
click = "^8.1.3"
cryptography = "^39.0.1"
cryptography = "^41.0.0"
deprecation = "^2.1.0"
docker = "^6.0.0"
fastecdsa = "^2.2.3"
Expand All @@ -65,6 +65,7 @@ strict-rfc3339 = "^0.7"
tabulate = "^0.9.0"
testcontainers = "^3.7.0"
tqdm = "^4.62.3"
setuptools = "^67.8.0"
simple-bson = "^0.0.3"

[tool.poetry.dev-dependencies]
Expand Down
155 changes: 77 additions & 78 deletions requirements.dev.txt
View file

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions requirements.slim.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,46 @@ attrs==21.4.0 ; python_version >= "3.8" and python_version < "3.12"
base58==2.1.1 ; python_version >= "3.8" and python_version < "3.12"
cached-property==1.5.2 ; python_version >= "3.8" and python_version < "3.12"
cattrs==22.2.0 ; python_version >= "3.8" and python_version < "3.12"
certifi==2022.12.7 ; python_version >= "3.8" and python_version < "3.12"
certifi==2023.5.7 ; python_version >= "3.8" and python_version < "3.12"
cffi==1.15.1 ; python_version >= "3.8" and python_version < "3.12"
charset-normalizer==3.0.1 ; python_version >= "3.8" and python_version < "3.12"
charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "3.12"
click==8.1.3 ; python_version >= "3.8" and python_version < "3.12"
colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and platform_system == "Windows"
cryptography==39.0.1 ; python_version >= "3.8" and python_version < "3.12"
cryptography==41.0.1 ; python_version >= "3.8" and python_version < "3.12"
cytoolz==0.12.1 ; python_version >= "3.8" and python_version < "3.12" and implementation_name == "cpython"
deprecation==2.1.0 ; python_version >= "3.8" and python_version < "3.12"
docker==6.0.1 ; python_version >= "3.8" and python_version < "3.12"
eth-hash==0.5.1 ; python_version >= "3.8" and python_version < "3.12"
eth-typing==3.2.0 ; python_version >= "3.8" and python_version < "3.12"
eth-utils==2.1.0 ; python_version >= "3.8" and python_version < "3.12"
exceptiongroup==1.1.0 ; python_version >= "3.8" and python_version < "3.11"
docker==6.1.3 ; python_version >= "3.8" and python_version < "3.12"
eth-hash==0.5.2 ; python_version >= "3.8" and python_version < "3.12"
eth-typing==3.4.0 ; python_version >= "3.8" and python_version < "3.12"
eth-utils==2.1.1 ; python_version >= "3.8" and python_version < "3.12"
exceptiongroup==1.1.1 ; python_version >= "3.8" and python_version < "3.11"
fastecdsa==2.3.0 ; python_version >= "3.8" and python_version < "3.12"
idna==3.4 ; python_version >= "3.8" and python_version < "3.12"
importlib-resources==5.12.0 ; python_version >= "3.8" and python_version < "3.9"
jsonschema==4.17.3 ; python_version >= "3.8" and python_version < "3.12"
mnemonic==0.20 ; python_version >= "3.8" and python_version < "3.12"
mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
netstruct==1.1.2 ; python_version >= "3.8" and python_version < "3.12"
packaging==23.0 ; python_version >= "3.8" and python_version < "3.12"
packaging==23.1 ; python_version >= "3.8" and python_version < "3.12"
pkgutil-resolve-name==1.3.10 ; python_version >= "3.8" and python_version < "3.9"
ply==3.11 ; python_version >= "3.8" and python_version < "3.12"
py-ecc==6.0.0 ; python_version >= "3.8" and python_version < "3.12"
pycparser==2.21 ; python_version >= "3.8" and python_version < "3.12"
pyrsistent==0.19.3 ; python_version >= "3.8" and python_version < "3.12"
pysodium==0.7.12 ; python_version >= "3.8" and python_version < "3.12"
python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.12"
pywin32==305 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32"
requests==2.28.2 ; python_version >= "3.8" and python_version < "3.12"
pywin32==306 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32"
requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12"
secp256k1==0.14.0 ; python_version >= "3.8" and python_version < "3.12"
simple-bson==0.0.3 ; python_version >= "3.8" and python_version < "3.12"
simplejson==3.18.3 ; python_version >= "3.8" and python_version < "3.12"
simplejson==3.19.1 ; python_version >= "3.8" and python_version < "3.12"
six==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
strict-rfc3339==0.7 ; python_version >= "3.8" and python_version < "3.12"
tabulate==0.9.0 ; python_version >= "3.8" and python_version < "3.12"
testcontainers==3.7.1 ; python_version >= "3.8" and python_version < "3.12"
toolz==0.12.0 ; python_version >= "3.8" and python_version < "3.12" and implementation_name == "pypy" or python_version >= "3.8" and python_version < "3.12" and implementation_name == "cpython"
tqdm==4.64.1 ; python_version >= "3.8" and python_version < "3.12"
urllib3==1.26.14 ; python_version >= "3.8" and python_version < "3.12"
websocket-client==1.5.1 ; python_version >= "3.8" and python_version < "3.12"
wrapt==1.14.1 ; python_version >= "3.8" and python_version < "3.12"
zipp==3.14.0 ; python_version >= "3.8" and python_version < "3.9"
toolz==0.12.0 ; python_version >= "3.8" and python_version < "3.12" and (implementation_name == "pypy" or implementation_name == "cpython")
tqdm==4.65.0 ; python_version >= "3.8" and python_version < "3.12"
urllib3==2.0.3 ; python_version >= "3.8" and python_version < "3.12"
websocket-client==1.5.3 ; python_version >= "3.8" and python_version < "3.12"
wrapt==1.15.0 ; python_version >= "3.8" and python_version < "3.12"
zipp==3.15.0 ; python_version >= "3.8" and python_version < "3.9"
102 changes: 52 additions & 50 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,117 +1,119 @@
anyio==3.6.2 ; python_version >= "3.8" and python_version < "3.12"
appnope==0.1.3 ; python_version >= "3.8" and python_version < "3.12" and platform_system == "Darwin" or python_version >= "3.8" and python_version < "3.12" and sys_platform == "darwin"
anyio==3.7.0 ; python_version >= "3.8" and python_version < "3.12"
appnope==0.1.3 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Darwin" or sys_platform == "darwin")
argon2-cffi-bindings==21.2.0 ; python_version >= "3.8" and python_version < "3.12"
argon2-cffi==21.3.0 ; python_version >= "3.8" and python_version < "3.12"
arrow==1.2.3 ; python_version >= "3.8" and python_version < "3.12"
asttokens==2.2.1 ; python_version >= "3.8" and python_version < "3.12"
attrs==21.4.0 ; python_version >= "3.8" and python_version < "3.12"
backcall==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
base58==2.1.1 ; python_version >= "3.8" and python_version < "3.12"
beautifulsoup4==4.11.2 ; python_version >= "3.8" and python_version < "3.12"
beautifulsoup4==4.12.2 ; python_version >= "3.8" and python_version < "3.12"
bleach==6.0.0 ; python_version >= "3.8" and python_version < "3.12"
cached-property==1.5.2 ; python_version >= "3.8" and python_version < "3.12"
cattrs==22.2.0 ; python_version >= "3.8" and python_version < "3.12"
certifi==2022.12.7 ; python_version >= "3.8" and python_version < "3.12"
certifi==2023.5.7 ; python_version >= "3.8" and python_version < "3.12"
cffi==1.15.1 ; python_version >= "3.8" and python_version < "3.12"
charset-normalizer==3.0.1 ; python_version >= "3.8" and python_version < "3.12"
charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "3.12"
click==8.1.3 ; python_version >= "3.8" and python_version < "3.12"
colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and platform_system == "Windows" or python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32"
comm==0.1.2 ; python_version >= "3.8" and python_version < "3.12"
cryptography==39.0.1 ; python_version >= "3.8" and python_version < "3.12"
colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Windows" or sys_platform == "win32")
comm==0.1.3 ; python_version >= "3.8" and python_version < "3.12"
cryptography==41.0.1 ; python_version >= "3.8" and python_version < "3.12"
cytoolz==0.12.1 ; python_version >= "3.8" and python_version < "3.12" and implementation_name == "cpython"
debugpy==1.6.6 ; python_version >= "3.8" and python_version < "3.12"
debugpy==1.6.7 ; python_version >= "3.8" and python_version < "3.12"
decorator==5.1.1 ; python_version >= "3.8" and python_version < "3.12"
defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.12"
deprecation==2.1.0 ; python_version >= "3.8" and python_version < "3.12"
docker==6.0.1 ; python_version >= "3.8" and python_version < "3.12"
eth-hash==0.5.1 ; python_version >= "3.8" and python_version < "3.12"
eth-typing==3.2.0 ; python_version >= "3.8" and python_version < "3.12"
eth-utils==2.1.0 ; python_version >= "3.8" and python_version < "3.12"
exceptiongroup==1.1.0 ; python_version >= "3.8" and python_version < "3.11"
docker==6.1.3 ; python_version >= "3.8" and python_version < "3.12"
eth-hash==0.5.2 ; python_version >= "3.8" and python_version < "3.12"
eth-typing==3.4.0 ; python_version >= "3.8" and python_version < "3.12"
eth-utils==2.1.1 ; python_version >= "3.8" and python_version < "3.12"
exceptiongroup==1.1.1 ; python_version >= "3.8" and python_version < "3.11"
executing==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
fastecdsa==2.3.0 ; python_version >= "3.8" and python_version < "3.12"
fastjsonschema==2.16.2 ; python_version >= "3.8" and python_version < "3.12"
fastjsonschema==2.17.1 ; python_version >= "3.8" and python_version < "3.12"
fqdn==1.5.1 ; python_version >= "3.8" and python_version < "3.12"
idna==3.4 ; python_version >= "3.8" and python_version < "3.12"
importlib-metadata==6.0.0 ; python_version >= "3.8" and python_version < "3.10"
importlib-metadata==6.6.0 ; python_version >= "3.8" and python_version < "3.10"
importlib-resources==5.12.0 ; python_version >= "3.8" and python_version < "3.9"
ipykernel==6.21.2 ; python_version >= "3.8" and python_version < "3.12"
ipykernel==6.23.2 ; python_version >= "3.8" and python_version < "3.12"
ipython-genutils==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
ipython==8.10.0 ; python_version >= "3.8" and python_version < "3.12"
ipython==8.12.2 ; python_version >= "3.8" and python_version < "3.12"
isoduration==20.11.0 ; python_version >= "3.8" and python_version < "3.12"
jedi==0.18.2 ; python_version >= "3.8" and python_version < "3.12"
jinja2==3.1.2 ; python_version >= "3.8" and python_version < "3.12"
jsonpointer==2.3 ; python_version >= "3.8" and python_version < "3.12"
jsonschema==4.17.3 ; python_version >= "3.8" and python_version < "3.12"
jsonschema[format-nongpl]==4.17.3 ; python_version >= "3.8" and python_version < "3.12"
jupyter-client==8.0.3 ; python_version >= "3.8" and python_version < "3.12"
jupyter-core==5.2.0 ; python_version >= "3.8" and python_version < "3.12"
jupyter-client==8.2.0 ; python_version >= "3.8" and python_version < "3.12"
jupyter-core==5.3.0 ; python_version >= "3.8" and python_version < "3.12"
jupyter-events==0.6.3 ; python_version >= "3.8" and python_version < "3.12"
jupyter-server-terminals==0.4.4 ; python_version >= "3.8" and python_version < "3.12"
jupyter-server==2.3.0 ; python_version >= "3.8" and python_version < "3.12"
jupyter-server==2.6.0 ; python_version >= "3.8" and python_version < "3.12"
jupyterlab-pygments==0.2.2 ; python_version >= "3.8" and python_version < "3.12"
markupsafe==2.1.2 ; python_version >= "3.8" and python_version < "3.12"
markupsafe==2.1.3 ; python_version >= "3.8" and python_version < "3.12"
matplotlib-inline==0.1.6 ; python_version >= "3.8" and python_version < "3.12"
mistune==2.0.5 ; python_version >= "3.8" and python_version < "3.12"
mnemonic==0.20 ; python_version >= "3.8" and python_version < "3.12"
mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
nbclassic==0.5.2 ; python_version >= "3.8" and python_version < "3.12"
nbclient==0.7.2 ; python_version >= "3.8" and python_version < "3.12"
nbconvert==7.2.9 ; python_version >= "3.8" and python_version < "3.12"
nbformat==5.7.3 ; python_version >= "3.8" and python_version < "3.12"
nbclassic==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
nbclient==0.8.0 ; python_version >= "3.8" and python_version < "3.12"
nbconvert==7.5.0 ; python_version >= "3.8" and python_version < "3.12"
nbformat==5.9.0 ; python_version >= "3.8" and python_version < "3.12"
nest-asyncio==1.5.6 ; python_version >= "3.8" and python_version < "3.12"
netstruct==1.1.2 ; python_version >= "3.8" and python_version < "3.12"
notebook-shim==0.2.2 ; python_version >= "3.8" and python_version < "3.12"
notebook==6.5.2 ; python_version >= "3.8" and python_version < "3.12"
packaging==23.0 ; python_version >= "3.8" and python_version < "3.12"
notebook-shim==0.2.3 ; python_version >= "3.8" and python_version < "3.12"
notebook==6.5.4 ; python_version >= "3.8" and python_version < "3.12"
overrides==7.3.1 ; python_version >= "3.8" and python_version < "3.12"
packaging==23.1 ; python_version >= "3.8" and python_version < "3.12"
pandocfilters==1.5.0 ; python_version >= "3.8" and python_version < "3.12"
parso==0.8.3 ; python_version >= "3.8" and python_version < "3.12"
pexpect==4.8.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32"
pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "3.12"
pkgutil-resolve-name==1.3.10 ; python_version >= "3.8" and python_version < "3.9"
platformdirs==3.0.0 ; python_version >= "3.8" and python_version < "3.12"
platformdirs==3.5.3 ; python_version >= "3.8" and python_version < "3.12"
ply==3.11 ; python_version >= "3.8" and python_version < "3.12"
prometheus-client==0.16.0 ; python_version >= "3.8" and python_version < "3.12"
prompt-toolkit==3.0.36 ; python_version >= "3.8" and python_version < "3.12"
psutil==5.9.4 ; python_version >= "3.8" and python_version < "3.12"
ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "3.12" and os_name != "nt" or python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32"
prometheus-client==0.17.0 ; python_version >= "3.8" and python_version < "3.12"
prompt-toolkit==3.0.38 ; python_version >= "3.8" and python_version < "3.12"
psutil==5.9.5 ; python_version >= "3.8" and python_version < "3.12"
ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "3.12" and (os_name != "nt" or sys_platform != "win32")
pure-eval==0.2.2 ; python_version >= "3.8" and python_version < "3.12"
py-ecc==6.0.0 ; python_version >= "3.8" and python_version < "3.12"
pycparser==2.21 ; python_version >= "3.8" and python_version < "3.12"
pygments==2.14.0 ; python_version >= "3.8" and python_version < "3.12"
pygments==2.15.1 ; python_version >= "3.8" and python_version < "3.12"
pyrsistent==0.19.3 ; python_version >= "3.8" and python_version < "3.12"
pysodium==0.7.12 ; python_version >= "3.8" and python_version < "3.12"
python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.12"
python-json-logger==2.0.6 ; python_version >= "3.8" and python_version < "3.12"
pywin32==305 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32"
python-json-logger==2.0.7 ; python_version >= "3.8" and python_version < "3.12"
pywin32==306 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32"
pywinpty==2.0.10 ; python_version >= "3.8" and python_version < "3.12" and os_name == "nt"
pyyaml==6.0 ; python_version >= "3.8" and python_version < "3.12"
pyzmq==25.0.0 ; python_version >= "3.8" and python_version < "3.12"
requests==2.28.2 ; python_version >= "3.8" and python_version < "3.12"
pyzmq==25.1.0 ; python_version >= "3.8" and python_version < "3.12"
requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12"
rfc3339-validator==0.1.4 ; python_version >= "3.8" and python_version < "3.12"
rfc3986-validator==0.1.1 ; python_version >= "3.8" and python_version < "3.12"
secp256k1==0.14.0 ; python_version >= "3.8" and python_version < "3.12"
send2trash==1.8.0 ; python_version >= "3.8" and python_version < "3.12"
send2trash==1.8.2 ; python_version >= "3.8" and python_version < "3.12"
simple-bson==0.0.3 ; python_version >= "3.8" and python_version < "3.12"
simplejson==3.18.3 ; python_version >= "3.8" and python_version < "3.12"
simplejson==3.19.1 ; python_version >= "3.8" and python_version < "3.12"
six==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
sniffio==1.3.0 ; python_version >= "3.8" and python_version < "3.12"
soupsieve==2.4 ; python_version >= "3.8" and python_version < "3.12"
soupsieve==2.4.1 ; python_version >= "3.8" and python_version < "3.12"
stack-data==0.6.2 ; python_version >= "3.8" and python_version < "3.12"
strict-rfc3339==0.7 ; python_version >= "3.8" and python_version < "3.12"
tabulate==0.9.0 ; python_version >= "3.8" and python_version < "3.12"
terminado==0.17.1 ; python_version >= "3.8" and python_version < "3.12"
testcontainers==3.7.1 ; python_version >= "3.8" and python_version < "3.12"
tinycss2==1.2.1 ; python_version >= "3.8" and python_version < "3.12"
toolz==0.12.0 ; python_version >= "3.8" and python_version < "3.12" and implementation_name == "pypy" or python_version >= "3.8" and python_version < "3.12" and implementation_name == "cpython"
tornado==6.2 ; python_version >= "3.8" and python_version < "3.12"
tqdm==4.64.1 ; python_version >= "3.8" and python_version < "3.12"
toolz==0.12.0 ; python_version >= "3.8" and python_version < "3.12" and (implementation_name == "pypy" or implementation_name == "cpython")
tornado==6.3.2 ; python_version >= "3.8" and python_version < "3.12"
tqdm==4.65.0 ; python_version >= "3.8" and python_version < "3.12"
traitlets==5.9.0 ; python_version >= "3.8" and python_version < "3.12"
typing-extensions==4.6.3 ; python_version >= "3.8" and python_version < "3.10"
uri-template==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
urllib3==1.26.14 ; python_version >= "3.8" and python_version < "3.12"
urllib3==2.0.3 ; python_version >= "3.8" and python_version < "3.12"
wcwidth==0.2.6 ; python_version >= "3.8" and python_version < "3.12"
webcolors==1.12 ; python_version >= "3.8" and python_version < "3.12"
webcolors==1.13 ; python_version >= "3.8" and python_version < "3.12"
webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12"
websocket-client==1.5.1 ; python_version >= "3.8" and python_version < "3.12"
wrapt==1.14.1 ; python_version >= "3.8" and python_version < "3.12"
zipp==3.14.0 ; python_version >= "3.8" and python_version < "3.10"
websocket-client==1.5.3 ; python_version >= "3.8" and python_version < "3.12"
wrapt==1.15.0 ; python_version >= "3.8" and python_version < "3.12"
zipp==3.15.0 ; python_version >= "3.8" and python_version < "3.10"
2 changes: 1 addition & 1 deletion src/pytezos/michelson/types/adt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def get_type_layout(
assert entrypoints is False, f'duplicate key {key}'
path_to_key[bin_path] = f'{arg.prim}_{i}'

idx_to_path = {i: path for i, path in enumerate(path_to_key)}
idx_to_path = dict(enumerate(path_to_key))
if len(reserved) == 0 and infer_names is False and entrypoints is False:
path_to_key = None # type: ignore
key_to_path = None
Expand Down

0 comments on commit 15e826e

Please sign in to comment.