From bcd8734f456d2f8ca2af08d57663da6be15cb672 Mon Sep 17 00:00:00 2001 From: Piper Merriam Date: Wed, 22 Mar 2017 08:55:14 -0600 Subject: [PATCH 1/5] See if things explode with pyrlp 0.4.7 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4e444c7..9b076c4 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ install_requires=[ "pylru>=1.0.9", "pysha3>=0.3", "requests>=2.12.4", - "rlp>=0.4.6,<0.4.7", + "rlp>=0.4.6", ] if sys.platform == 'win32': From 540146dc50b47b34d97914f06a9b53154410e53a Mon Sep 17 00:00:00 2001 From: Piper Merriam Date: Wed, 22 Mar 2017 08:59:21 -0600 Subject: [PATCH 2/5] Deprecate the extra manager classes that are no longer supported --- web3/providers/manager.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/web3/providers/manager.py b/web3/providers/manager.py index dcddef1..84b7f89 100644 --- a/web3/providers/manager.py +++ b/web3/providers/manager.py @@ -1,17 +1,18 @@ -import uuid -import json import collections +import json +import uuid +import warnings import rlp from eth_utils import ( - force_text, - to_normalized_address, - is_string, - is_dict, - encode_hex, decode_hex, + encode_hex, + force_text, + is_dict, + is_string, keccak, + to_normalized_address, ) from web3.utils.encoding import ( @@ -82,6 +83,10 @@ class RequestManager(object): class ManagerWrapper(object): def __init__(self, wrapped_manager): + warnings.warn(DeprecationWarning( + "ManagerWrapper has been deprecated and will be removed from" + "web3.py in subsequen releases." + )) self.wrapped_manager = wrapped_manager @property @@ -223,6 +228,10 @@ class BaseSendRawTransactionMixin(ManagerWrapper): class DelegatedSigningManager(BaseSendRawTransactionMixin): def __init__(self, *args, **kwargs): + warnings.warn(DeprecationWarning( + "DelegatedSigningManager has been deprecated and will be removed from" + "web3.py in subsequen releases." + )) self.signing_manager = kwargs.pop('signing_manager') super(DelegatedSigningManager, self).__init__(*args, **kwargs) @@ -255,6 +264,10 @@ class DelegatedSigningManager(BaseSendRawTransactionMixin): class PrivateKeySigningManager(BaseSendRawTransactionMixin): def __init__(self, *args, **kwargs): + warnings.warn(DeprecationWarning( + "PrivateKeySigningManager has been deprecated and will be removed from" + "web3.py in subsequen releases." + )) if not is_bitcoin_available(): raise ImportError( "In order to use the `PrivateKeySigningManager` the " From 74265987508ac65157e73faf9684e008b3a742e7 Mon Sep 17 00:00:00 2001 From: Piper Merriam Date: Wed, 22 Mar 2017 09:00:33 -0600 Subject: [PATCH 3/5] update docs to reflect deprecation --- docs/managers.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/managers.rst b/docs/managers.rst index 4d012ab..7b98de5 100644 --- a/docs/managers.rst +++ b/docs/managers.rst @@ -21,6 +21,7 @@ RequestManager Delegated Signing Manager ------------------------- +.. warning:: The ``DelegatedSigningManager`` has been deprecated and will be removed in subsequent releases. .. py:class:: DelegatedSigningManager(wrapped_manager, signing_manager) @@ -68,6 +69,8 @@ transaction to the network using the ``eth_sendRawTransaction`` method. Private Key Signing Manager --------------------------- +.. warning:: The ``PrivateKeySigningManager`` has been deprecated and will be removed in subsequent releases. + .. py:class:: PrivateKeySigningManager(wrapped_manager, keys={}) This manager is similar to the ``DelegatedSigningManager`` except that From 12ea8bc7c72db4fcea79861058af5f954e3cd891 Mon Sep 17 00:00:00 2001 From: Piper Merriam Date: Wed, 22 Mar 2017 09:23:28 -0600 Subject: [PATCH 4/5] unpin rlp from requirements file --- requirements-dev.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 08510ee..c0f99cc 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,6 @@ tox>=1.8.0 eth-testrpc>=1.1.0 ethereum>=1.5.2 secp256k1>=0.13.1 -rlp>=0.4.6,<0.4.7 hypothesis>=3.4.2 flaky>=3.3.0 flake8==3.0.4 From 47813628c1a8dfe7408db7873dbc6af2eb6f6e0f Mon Sep 17 00:00:00 2001 From: Piper Merriam Date: Wed, 22 Mar 2017 10:17:18 -0600 Subject: [PATCH 5/5] Update eth-testrpc --- requirements-dev.txt | 4 ++-- setup.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index c0f99cc..fcf8466 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,8 +1,8 @@ pytest>=2.8.2 pytest-pythonpath>=0.3 tox>=1.8.0 -eth-testrpc>=1.1.0 -ethereum>=1.5.2 +eth-testrpc>=1.2.0 +ethereum>=1.6.1 secp256k1>=0.13.1 hypothesis>=3.4.2 flaky>=3.3.0 diff --git a/setup.py b/setup.py index 9b076c4..cce1d6f 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ install_requires=[ "pylru>=1.0.9", "pysha3>=0.3", "requests>=2.12.4", - "rlp>=0.4.6", + "rlp>=0.4.7", ] if sys.platform == 'win32': @@ -37,8 +37,7 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'Tester': ["eth-testrpc>=1.1.0"], - 'tester': ["eth-testrpc>=1.1.0"], + 'tester': ["eth-testrpc>=1.2.0"], 'gevent': [ "gevent>=1.1.1,<1.2.0", "geventhttpclient>=1.3.1",