Remove doctest dependency on ethtoken (#1395)

* Remove doctest dependency on ethtoken * Use testsetup directive for EIP20_ABI * Update broken link in README * Update README with Python 3.7 tox support * Add comment referencing the ABI to run locally
ethereum · Jul 26, 2019 · 24d15cb · 24d15cb
1 parent 8c12dc4
commit 24d15cb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -109,14 +109,14 @@ pytest -n 4 -f --maxfail=1
 
 2. Execute `tox` for the tests
 
-There are multiple [components](https://github.com/ethereum/web3.py/blob/master/.travis.yml#L53) of the tests. You can run test to against specific component. For example:
+There are multiple [components](https://github.com/ethereum/web3.py/blob/master/.circleci/config.yml#L144) of the tests. You can run test to against specific component. For example:
 
 ```sh
-# Run Tests for the Core component (for Python 3.5):
-tox -e py35-core
-
 # Run Tests for the Core component (for Python 3.6):
 tox -e py36-core
+
+# Run Tests for the Core component (for Python 3.7):
+tox -e py37-core
 ```
 
 If for some reason it is not working, add `--recreate` params.

diff --git a/docs/web3.eth.account.rst b/docs/web3.eth.account.rst
@@ -264,11 +264,18 @@ To sign a transaction locally that will invoke a smart contract:
 
 .. testsetup::
 
+    import json
+
     nonce = 0
 
+    EIP20_ABI = json.loads('[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_from","type":"address"},{"indexed":true,"name":"_to","type":"address"},{"indexed":false,"name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_owner","type":"address"},{"indexed":true,"name":"_spender","type":"address"},{"indexed":false,"name":"_value","type":"uint256"}],"name":"Approval","type":"event"}]')  # noqa: 501
+
+
 .. doctest::
 
-    >>> from ethtoken.abi import EIP20_ABI
+    # When running locally, execute the statements found in the file linked below to load the EIP20_ABI variable.
+    # See: https://github.com/carver/ethtoken.py/blob/v0.0.1-alpha.4/ethtoken/abi.py
+
     >>> from web3.auto import w3
 
     >>> unicorns = w3.eth.contract(address="0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359", abi=EIP20_ABI)

diff --git a/setup.py b/setup.py
@@ -20,7 +20,6 @@
         "click>=5.1",
         "configparser==3.5.0",
         "contextlib2>=0.5.4",
-        "ethtoken",
         "py-geth>=1.4.0",
         "py-solc>=0.4.0",
         "pytest>=4.4.0,<5.0.0",

diff --git a/tox.ini b/tox.ini
@@ -41,7 +41,6 @@ commands=
 deps =
     .[dev]
     doctest: sphinx
-    doctest: ethtoken
 passenv =
     GETH_BINARY
     GETH_VERSION