From ec7a5bea1d6d3544d457c0da9546ecd4d971f766 Mon Sep 17 00:00:00 2001 From: Piper Merriam Date: Mon, 13 Feb 2017 16:34:35 -0700 Subject: [PATCH 1/3] update eth-abi-utils to latest version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 44906c9..3a7b8ea 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ setup( url='https://github.com/pipermerriam/web3.py', include_package_data=True, install_requires=[ - "ethereum-abi-utils>=0.2.1", + "ethereum-abi-utils>=0.3.0", "pylru>=1.0.9", "pysha3>=0.3", "requests>=2.12.4", From 7f15152f76df3dda17c960f5543cdf78e2dac6fb Mon Sep 17 00:00:00 2001 From: Piper Merriam Date: Mon, 13 Feb 2017 16:44:32 -0700 Subject: [PATCH 2/3] travis futzing --- .travis.yml | 14 ++++++++------ tox.ini | 19 ++----------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index a022700..511f715 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,18 +9,20 @@ before_install: - travis_retry sudo apt-get update env: matrix: - - TOX_ENV=py27-all-stdlib - - TOX_ENV=py34-all-stdlib - - TOX_ENV=py35-all-stdlib - - TOX_ENV=py27-all-gevent - - TOX_ENV=py34-all-gevent - - TOX_ENV=py35-all-gevent + - TOX_ENV=py27-stdlib + - TOX_ENV=py34-stdlib + - TOX_ENV=py35-stdlib + - TOX_ENV=py27-gevent + - TOX_ENV=py34-gevent + - TOX_ENV=py35-gevent - TOX_ENV=flake8 cache: pip: true install: - "travis_retry pip install pip setuptools --upgrade" - "travis_retry pip install tox" +before_script: + - pip freeze script: - tox -e $TOX_ENV --recreate after_script: diff --git a/tox.ini b/tox.ini index e8b494e..8d681d9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist= - py{27,34,35}-{all,admin,eth,mining,providers,version,contracts,filtering,net,txpool,db,managers,personal,utilities}-{gevent-stdlib} + py{27,34,35}-{gevent-stdlib} flake8 [flake8] @@ -10,22 +10,7 @@ exclude= tests/* [testenv] usedevelop=True commands= - all: py.test {posargs:tests} - admin: py.test {posargs:tests/admin-module} - eth: py.test {posargs:tests/eth-module} - mining: py.test {posargs:tests/mining-module} - providers: py.test {posargs:tests/providers} - version: py.test {posargs:tests/version-module} - contracts: py.test {posargs:tests/contracts} - filtering: py.test {posargs:tests/filtering} - net: py.test {posargs:tests/net-module} - shh: py.test {posargs:tests/shh-module} - txpool: py.test {posargs:tests/txpool-module} - db: py.test {posargs:tests/db-module} - managers: py.test {posargs:tests/managers} - personal: py.test {posargs:tests/personal-module} - testing: py.test {posargs:tests/testing-module} - utilities: py.test {posargs:tests/utilities} + py.test {posargs:tests} deps = stdlib: -r{toxinidir}/requirements-dev.txt gevent: -r{toxinidir}/requirements-gevent.txt From 02ef2d7e9411c95838fbe375ad5caa1a8ff3f8fd Mon Sep 17 00:00:00 2001 From: Piper Merriam Date: Mon, 13 Feb 2017 17:02:18 -0700 Subject: [PATCH 3/3] fix eth-abi-utils version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3a7b8ea..8100d63 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ setup( url='https://github.com/pipermerriam/web3.py', include_package_data=True, install_requires=[ - "ethereum-abi-utils>=0.3.0", + "ethereum-abi-utils>=0.3.1", "pylru>=1.0.9", "pysha3>=0.3", "requests>=2.12.4",