Skip to content

Commit

Permalink
Remove secp256k1 mentions, fix deps (#375)
Browse files Browse the repository at this point in the history
  • Loading branch information
@droserasprout
droserasprout authored Aug 19, 2024
1 parent 2f3ab66 commit ee4edbe
Show file tree
Hide file tree
Showing 10 changed files with 806 additions and 712 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [3.13.4](https://github.com/baking-bad/pytezos/compare/3.13.3...3.13.4) (2024-08-19)

### Fixed

* Fixed testcontainers version constraint.

## [3.13.3](https://github.com/baking-bad/pytezos/compare/3.13.2...3.13.3) (2024-07-12)

### Fixed
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ install-deps: ## Install binary dependencies
ifneq (,$(findstring linux-gnu,$(OSTYPE)))
sudo apt install libsodium-dev libgmp-dev pkg-config
else ifneq (,$(findstring darwin,$(OSTYPE)))
brew tap cuber/homebrew-libsecp256k1
brew install libsodium gmp pkg-config
else
echo "Unsupported platform $(OSTYPE)"
Expand Down
7 changes: 4 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,17 @@ $ sudo pacman -Syu --needed libsodium gmp
[Homebrew](https://brew.sh/) needs to be installed.

```shell
$ brew tap cuber/homebrew-libsecp256k1
$ brew install libsodium gmp pkg-config
```

#### M1 (ARM)

In case `secp256k1` or `gmp` cannot find either include or lib paths, try explicitly set environment vars:
In case `libsodium` or `gmp` cannot find either include or lib paths, try explicitly set environment vars:

```shell
CFLAGS="-I/opt/homebrew/Cellar/gmp/6.2.1_1/include/ -L/opt/homebrew/Cellar/gmp/6.2.1_1/lib/" LIB_DIR="/opt/homebrew/Cellar/libsecp256k1/0.1/lib" INCLUDE_DIR=/opt/homebrew/Cellar/libsecp256k1/0.1/include pip3 install --user pytezos
export CFLAGS="-I/opt/homebrew/Cellar/gmp/6.2.1_1/include/ -L/opt/homebrew/Cellar/gmp/6.2.1_1/lib/"
export DYLD_LIBRARY_PATH=/opt/homebrew/lib/
pip3 install --user pytezos
```

For running tests you might also need to export `LD_LIBRARY_PATH`:
Expand Down
1 change: 0 additions & 1 deletion docs/source/quick_start.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Use homebrew:

.. code-block::
$ brew tap cuber/homebrew-libsecp256k1
$ brew install libsodium gmp
*Windows*
Expand Down
1,374 changes: 730 additions & 644 deletions poetry.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ requests = ">=2.28.2"
simplejson = ">=3.17.6"
strict-rfc3339 = ">=0.7"
tabulate = ">=0.9.0"
testcontainers = ">=3.7.0"
testcontainers = ">=3.7.0,<4.8.0"
tqdm = ">=4.62.3"
simple-bson = ">=0.0.3"

Expand Down
59 changes: 30 additions & 29 deletions requirements.dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ argon2-cffi==23.1.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
arrow==1.3.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
asn1crypto==1.5.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
asttokens==2.4.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
attrs==23.2.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
babel==2.15.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
attrs==24.2.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
babel==2.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
backcall==0.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"
beautifulsoup4==4.12.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
black==24.4.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
black==24.8.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
bleach==6.1.0 ; 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.7.4 ; 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"
cffi==1.17.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
chardet==5.2.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"
coincurve==20.0.0 ; 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" or sys_platform == "win32")
comm==0.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
coverage[toml]==7.6.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
cryptography==42.0.8 ; python_full_version >= "3.8.1" and python_version < "3.13"
coverage[toml]==7.6.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
cryptography==43.0.0 ; 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"
debugpy==1.8.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
debugpy==1.8.5 ; python_full_version >= "3.8.1" and python_version < "3.13"
decorator==5.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
defusedxml==0.7.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
deprecation==2.1.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
Expand All @@ -35,18 +35,19 @@ docker==7.1.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
docutils==0.20.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
entrypoints==0.4 ; 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.4.0 ; 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"
eth-typing==5.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
eth-utils==5.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
exceptiongroup==1.2.2 ; python_full_version >= "3.8.1" and python_version < "3.11"
execnet==2.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
executing==2.0.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
fastecdsa==2.3.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
fastjsonschema==2.20.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
fqdn==1.5.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
hexbytes==1.2.1 ; 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"
imagesize==1.4.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
importlib-metadata==8.0.0 ; python_full_version >= "3.8.1" and python_version < "3.10"
importlib-resources==6.4.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
importlib-metadata==8.2.0 ; python_full_version >= "3.8.1" and python_version < "3.10"
importlib-resources==6.4.3 ; python_full_version >= "3.8.1" and python_version < "3.9"
iniconfig==2.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
ipykernel==6.29.5 ; python_full_version >= "3.8.1" and python_version < "3.13"
ipython-genutils==0.2.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
Expand All @@ -63,14 +64,14 @@ jupyter-client==7.4.9 ; python_full_version >= "3.8.1" and python_version < "3.1
jupyter-core==5.7.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
jupyter-events==0.10.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
jupyter-server-terminals==0.5.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
jupyter-server==2.14.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
jupyter-server==2.14.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
jupyterlab-pygments==0.3.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
markupsafe==2.1.5 ; python_full_version >= "3.8.1" and python_version < "3.13"
matplotlib-inline==0.1.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
mistune==3.0.2 ; 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"
mypy-extensions==1.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
mypy==1.10.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
mypy==1.11.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
nbclassic==1.1.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
nbclient==0.10.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
nbconvert==7.16.4 ; python_full_version >= "3.8.1" and python_version < "3.13"
Expand All @@ -95,34 +96,34 @@ prometheus-client==0.20.0 ; python_full_version >= "3.8.1" and python_version <
prompt-toolkit==3.0.47 ; python_full_version >= "3.8.1" and python_version < "3.13"
psutil==6.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
ptyprocess==0.7.0 ; python_full_version >= "3.8.1" and python_version < "3.13" and (os_name != "nt" or sys_platform != "win32")
pure-eval==0.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
pure-eval==0.2.3 ; 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"
pygments==2.18.0 ; 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"
pysodium==0.7.18 ; python_full_version >= "3.8.1" and python_version < "3.13"
pytest-cov==5.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
pytest-xdist==3.6.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
pytest==8.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
pytest==8.3.2 ; 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"
python-json-logger==2.0.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
pytz==2024.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
pywin32==306 ; python_full_version >= "3.8.1" and python_version < "3.13" and sys_platform == "win32"
pywinpty==2.0.13 ; python_full_version >= "3.8.1" and python_version < "3.13" and os_name == "nt"
pyyaml==6.0.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
pyzmq==26.0.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
pyyaml==6.0.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
pyzmq==26.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
referencing==0.35.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
requests==2.32.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
rfc3339-validator==0.1.4 ; python_full_version >= "3.8.1" and python_version < "3.13"
rfc3986-validator==0.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
rpds-py==0.19.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
ruff==0.5.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
rpds-py==0.20.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
ruff==0.6.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
send2trash==1.8.3 ; 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"
simplejson==3.19.3 ; 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"
sniffio==1.3.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
snowballstemmer==2.2.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
soupsieve==2.5 ; python_full_version >= "3.8.1" and python_version < "3.13"
soupsieve==2.6 ; python_full_version >= "3.8.1" and python_version < "3.13"
sphinx-click==6.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
sphinx-rtd-theme==2.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
sphinx-sitemap==2.6.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
Expand All @@ -144,20 +145,20 @@ tinycss2==1.3.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
tomli==2.0.1 ; python_full_version >= "3.8.1" and python_full_version <= "3.11.0a6"
toolz==0.12.1 ; python_full_version >= "3.8.1" and python_version < "3.13" and (implementation_name == "pypy" or implementation_name == "cpython")
tornado==6.4.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
tqdm==4.66.4 ; python_full_version >= "3.8.1" and python_version < "3.13"
tqdm==4.66.5 ; python_full_version >= "3.8.1" and python_version < "3.13"
traitlets==5.14.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
types-python-dateutil==2.9.0.20240316 ; python_full_version >= "3.8.1" and python_version < "3.13"
types-pyyaml==6.0.12.20240311 ; python_full_version >= "3.8.1" and python_version < "3.13"
types-pyyaml==6.0.12.20240808 ; python_full_version >= "3.8.1" and python_version < "3.13"
types-requests==2.32.0.20240712 ; python_full_version >= "3.8.1" and python_version < "3.13"
types-setuptools==70.3.0.20240710 ; python_full_version >= "3.8.1" and python_version < "3.13"
types-simplejson==3.19.0.20240310 ; python_full_version >= "3.8.1" and python_version < "3.13"
types-setuptools==71.1.0.20240818 ; python_full_version >= "3.8.1" and python_version < "3.13"
types-simplejson==3.19.0.20240801 ; python_full_version >= "3.8.1" and python_version < "3.13"
types-tabulate==0.9.0.20240106 ; python_full_version >= "3.8.1" and python_version < "3.13"
typing-extensions==4.12.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
uri-template==1.3.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
urllib3==2.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
wcwidth==0.2.13 ; python_full_version >= "3.8.1" and python_version < "3.13"
webcolors==24.6.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
webcolors==24.8.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
webencodings==0.5.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.2 ; python_full_version >= "3.8.1" and python_version < "3.10"
zipp==3.20.0 ; python_full_version >= "3.8.1" and python_version < "3.10"
25 changes: 13 additions & 12 deletions requirements.slim.txt
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
asn1crypto==1.5.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
attrs==23.2.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
attrs==24.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.7.4 ; 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"
cffi==1.17.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"
coincurve==20.0.0 ; 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.8 ; python_full_version >= "3.8.1" and python_version < "3.13"
cryptography==43.0.0 ; 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==7.1.0 ; 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.4.0 ; 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"
eth-typing==5.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
eth-utils==5.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
exceptiongroup==1.2.2 ; 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"
hexbytes==1.2.1 ; 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"
importlib-resources==6.4.3 ; 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.23.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"
Expand All @@ -29,21 +30,21 @@ pkgutil-resolve-name==1.3.10 ; python_full_version >= "3.8.1" and python_version
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"
pysodium==0.7.18 ; 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.32.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
rpds-py==0.19.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
rpds-py==0.20.0 ; 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"
simplejson==3.19.3 ; 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"
tqdm==4.66.5 ; python_full_version >= "3.8.1" and python_version < "3.13"
typing-extensions==4.12.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
urllib3==2.2.2 ; 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.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
zipp==3.20.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
Loading

0 comments on commit ee4edbe

Please sign in to comment.