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.

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

Removed cytoolz hard dependency and CI fixes #71

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ hypothesis==3.7.0
bumpversion==0.5.3
eth-hash[pycryptodome]>=0.1.0,<1.0.0
twine==1.11.0
mypy==0.641
7 changes: 5 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@
setup_requires=['setuptools-markdown'],
install_requires=[
"eth-hash>=0.1.0,<1.0.0",
"eth-utils>=1.0.1,<2.0.0",
"eth-utils>=1.2.2,<2.0.0",
"eth-typing>=2.0.0,<3",
"rlp>=0.4.7,<2.0.0",
"cytoolz>=0.8.0,<1",
],
license="MIT",
zip_safe=False,
keywords='ethereum blockchain evm trie merkle',
packages=find_packages(exclude=["tests", "tests.*"]),
package_data={'trie': ['py.typed']},
classifiers=[
'Development Status :: 2 - Pre-Alpha',
'Intended Audience :: Developers',
Expand All @@ -33,5 +34,7 @@
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: Implementation :: PyPy',
],
)
7 changes: 5 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist=
py{35,36,py3}-rlp{0,1}
py{35,36,37,py3}-rlp{0,1}
lint

[flake8]
Expand All @@ -18,9 +18,12 @@ deps =
basepython =
py35: python3.5
py36: python3.6
py37: python3.7
pypy3: pypy3

[testenv:lint]
basepython=python
deps=flake8
commands=flake8 {toxinidir}/trie {toxinidir}/tests
commands=
flake8 {toxinidir}/trie {toxinidir}/tests
mypy --follow-imports=silent --warn-unused-ignores --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs --disallow-any-generics -p py-trie
Empty file added trie/py.typed
Empty file.
2 changes: 1 addition & 1 deletion trie/utils/binaries.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from eth_utils import (
apply_to_return_value,
)
from cytoolz import (
from eth_utils.toolz import (
partition_all,
)

Expand Down
2 changes: 1 addition & 1 deletion trie/utils/nibbles.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from eth_utils import (
to_tuple,
)
from cytoolz import (
from eth_utils.toolz import (
partition,
)

Expand Down