run lint and clean up __init__ files

convert .format and % strings that pyupgrade can't do
drop unnecessary deps, remove unnecessary upper pins
remove pre-commit install from ci, it's handled by tox

Author: pacrob

.circleci/config.yml

@@ -52,9 +52,6 @@ common: &common
         command: |
           python -m pip install --upgrade pip
           python -m pip install tox
-    - run:
-        name: install pre-commit
-        command: python -m pip install --progress-bar=off pre-commit
     - run:
         name: run tox
         command: python -m tox run -r

.deepsource.toml

@@ -9,4 +9,4 @@ name = "python"
 enabled = true
 
   [analyzers.meta]
-  runtime_version = "3.x.x"
+  runtime_version = "3.x.x"

.git-blame-ignore-revs

@@ -3,4 +3,4 @@ e9049224a98439cc27522e322cc09e402503565a
 1ee3cce389e48b37895e812692f87aaf4f96e27f
 
 # ignore SHA that added black
-6c958538082fcf6e6d9165c30f289e3c64dbfc5a
+6c958538082fcf6e6d9165c30f289e3c64dbfc5a

.pre-commit-config.yaml

@@ -47,4 +47,4 @@ repos:
     rev: v1.5.1
     hooks:
     -   id: mypy
-        exclude: tests/
+        files: eth/

DEVELOPMENT.md

@@ -7,27 +7,26 @@ The following workflows are supported for blocks.
 Incremental creation
 
 1. Initialize Block - `Header.from_parent(...)`:
-    - `coinbase`
-    - `parent_hash`
-    - `difficulty`
-    - `block_number`
-    - `gas_limit`
-    - `timestamp`
-2. Apply Transaction(s) - `Block.apply_transaction(...)`:
-3. Mine Block - `Block.mine(...)`:
-    - `uncles_hash`
-    - `state_root`
-    - `transaction_root`
-    - `receipts_root`
-    - `bloom`
-    - `gas_used`
-    - `extra_data`
-    - `mix_hash`
-    - `nonce`
-
+   - `coinbase`
+   - `parent_hash`
+   - `difficulty`
+   - `block_number`
+   - `gas_limit`
+   - `timestamp`
+1. Apply Transaction(s) - `Block.apply_transaction(...)`:
+1. Mine Block - `Block.mine(...)`:
+   - `uncles_hash`
+   - `state_root`
+   - `transaction_root`
+   - `receipts_root`
+   - `bloom`
+   - `gas_used`
+   - `extra_data`
+   - `mix_hash`
+   - `nonce`
 
 ## 2. Block Ingestion
 
 > (This is actually just a special case of use case #1.)
 
-Full ingestion of a complete block.  
+Full ingestion of a complete block.

Makefile

@@ -71,8 +71,8 @@ notes:
 	git commit -m "Compile release notes for v$(UPCOMING_VERSION)"
 
 release: check-bump clean
-	# require that you be on a branch that's linked to upstream/master
-	git status -s -b | head -1 | grep "\.\.upstream/master"
+	# require that you be on a branch that's linked to upstream/main
+	git status -s -b | head -1 | grep "\.\.upstream/main"
 	# require that upstream is configured for ethereum/py-evm
 	@git remote -v | grep -E "upstream\[email protected]:ethereum/py-evm.git \(push\)|upstream\thttps://(www.)?github.com/ethereum/py-evm \(push\)"
 	# verify that docs build correctly

README.md

@@ -6,7 +6,6 @@
 [![Python versions](https://img.shields.io/pypi/pyversions/py-evm.svg)](https://pypi.python.org/pypi/py-evm)
 [![Docs build](https://readthedocs.org/projects/py-evm/badge/?version=latest)](https://py-evm.readthedocs.io/en/latest/?badge=latest)
 
-
 ## Py-EVM
 
 Py-EVM is an implementation of the Ethereum protocol in Python. It contains the low level

docs/api/api.chain.rst

@@ -17,4 +17,4 @@ MiningChain
 -----------
 
 .. autoclass:: eth.chains.base.MiningChain
-  :members:
+  :members:

docs/api/api.vm.rst

@@ -18,4 +18,4 @@ Virtual Machine
    vm/api.vm.stack
    vm/api.vm.state
    vm/api.vm.transaction_context
-   vm/api.vm.forks
+   vm/api.vm.forks

docs/api/db/api.db.atomic.rst

@@ -10,4 +10,3 @@ AtomicDB
 
 .. autoclass:: eth.db.atomic.AtomicDBWriteBatch
   :members:
-

docs/api/db/api.db.backends.rst

@@ -11,4 +11,4 @@ MemoryDB
 --------
 
 .. autoclass:: eth.db.backends.memory.MemoryDB
-  :members:
+  :members:

docs/api/db/api.db.diff.rst

@@ -18,5 +18,3 @@ DiffMissingError
 
 .. autoclass:: eth.db.diff.DiffMissingError
   :members:
-
-

docs/api/db/api.db.journal.rst

@@ -5,4 +5,4 @@ JournalDB
 ---------
 
 .. autoclass:: eth.db.journal.JournalDB
-  :members:
+  :members:

docs/api/db/api.db.schema.rst

@@ -5,4 +5,4 @@ SchemaV1
 --------
 
 .. autoclass:: eth.db.schema.SchemaV1
-  :members:
+  :members:

docs/api/index.rst

@@ -11,7 +11,7 @@ This section aims to provide a detailed description of all APIs. If you are look
    :maxdepth: 4
    :name: toc-api-eth
 
-   
+
    api.abc
    api.chain
    api.db

docs/api/rlp/api.rlp.transactions.rst

@@ -24,4 +24,3 @@ BaseUnsignedTransaction
 
 .. autoclass:: eth.rlp.transactions.BaseUnsignedTransaction
   :members:
-

docs/api/tools/api.tools.fixtures.rst

@@ -4,15 +4,15 @@ Builder Tools
 
 The JSON test fillers found in `eth.tools.fixtures` is a set of tools which facilitate
 creating standard JSON consensus tests as found in the
-`ethereum/tests repository <https://github.com/ethereum/tests>`_. 
+`ethereum/tests repository <https://github.com/ethereum/tests>`_.
 
 .. note:: Only VM and state tests are supported right now.
 
 
 State Test Fillers
 ------------------
 
-Tests are generated in two steps. 
+Tests are generated in two steps.
 
 * First, a *test filler* is written that contains a high level description of the test case.
 * Subsequently, the filler is compiled to the actual test in a process called
@@ -52,7 +52,7 @@ sequence of functions.
         )
     )
 
-.. note:: 
+.. note::
 
     Note that :func:`~eth.tools.fixtures.setup_filler` returns a
     dictionary, whereas all of the following functions such as
@@ -68,4 +68,3 @@ sequence of functions.
 .. autofunction:: eth.tools.fixtures.fillers.execution
 
 .. autofunction:: eth.tools.fixtures.fillers.expect
-

docs/api/vm/api.vm.code_stream.rst

@@ -3,4 +3,3 @@ CodeStream
 
 .. autoclass:: eth.vm.code_stream.CodeStream
   :members:
-

docs/api/vm/api.vm.execution_context.rst

@@ -3,4 +3,3 @@ ExecutionContext
 
 .. autoclass:: eth.vm.execution_context.ExecutionContext
   :members:
-

docs/api/vm/api.vm.gas_meter.rst

@@ -3,4 +3,3 @@ GasMeter
 
 .. autoclass:: eth.vm.gas_meter.GasMeter
   :members:
-

docs/api/vm/api.vm.memory.rst

@@ -3,4 +3,3 @@ Memory
 
 .. autoclass:: eth.vm.memory.Memory
   :members:
-

docs/api/vm/api.vm.message.rst

@@ -3,4 +3,3 @@ Message
 
 .. autoclass:: eth.vm.message.Message
   :members:
-

docs/api/vm/api.vm.opcode.rst

@@ -3,4 +3,3 @@ Opcode
 
 .. autoclass:: eth.vm.opcode.Opcode
   :members:
-

docs/api/vm/api.vm.stack.rst

@@ -3,4 +3,3 @@ Stack
 
 .. autoclass:: eth.vm.stack.Stack
   :members:
-

docs/api/vm/api.vm.transaction_context.rst

@@ -3,4 +3,3 @@ BaseTransactionContext
 
 .. autoclass:: eth.vm.transaction_context.BaseTransactionContext
   :members:
-

docs/api/vm/api.vm.vm.rst

@@ -9,4 +9,3 @@ VM
 .. autoclass:: eth.vm.base.VM
   :members:
   :exclude-members: get_prev_hashes
-

docs/conf.py

@@ -120,8 +120,8 @@
 
 
 def setup(app):
-    app.add_stylesheet("css/custom.css")
-    app.add_javascript("js/matomo.js")
+    app.add_css_file("css/custom.css")
+    app.add_js_file("js/matomo.js")
 
 
 # Allows the mod index to function more helpfully (not everything under 'e')
@@ -133,7 +133,7 @@ def setup(app):
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = "ethdocs"
+htmlhelp_basename = "py-evmdocs"
 
 
 # -- Options for LaTeX output ---------------------------------------------

docs/contributing.rst

@@ -51,7 +51,7 @@ Code Style
 
 When multiple people are working on the same body of code, it is important that they write code that conforms to a similar style. It often doesn't matter as much which style, but rather that they conform to one style.
 
-To ensure your contribution conforms to the style being used in this project, we encourage you to read our `style guide <https://github.com/pipermerriam/ethereum-dev-tactical-manual/blob/master/style-guide.md>`_.
+To ensure your contribution conforms to the style being used in this project, we encourage you to read our `style guide <https://github.com/ethereum/snake-charmers-tactical-manual/blob/main/style-guide.md>`_.
 
 
 
@@ -74,7 +74,7 @@ Documentation
 ~~~~~~~~~~~~~
 
 Good documentation will lead to quicker adoption and happier users. Please check out our guide
-on `how to create documentation for the Python Ethereum ecosystem <https://github.com/ethereum/snake-charmers-tactical-manual/blob/master/documentation.md>`_.
+on `how to create documentation for the Python Ethereum ecosystem <https://github.com/ethereum/snake-charmers-tactical-manual/blob/main/documentation.md>`_.
 
 
 Pull Requests
@@ -92,7 +92,7 @@ do not pass the CI build yet won't get reviewed unless explicitly requested.
 
 If the pull request introduces changes that should be reflected in the release notes,
 please add a `newsfragment` file as explained
-`here <https://github.com/ethereum/py-evm/blob/master/newsfragments/README.md>`_.
+`here <https://github.com/ethereum/py-evm/blob/main/newsfragments/README.md>`_.
 
 If possible, the change to the release notes file should be included in the commit that introduces the
 feature or bugfix.
@@ -107,7 +107,7 @@ Before releasing a new version, build and test the package that will be released
 
 .. code:: sh
 
-    git checkout master && git pull
+    git checkout main && git pull
 
     make package
 

docs/cookbook/index.rst

@@ -104,13 +104,13 @@ Building blocks incrementally
 ------------------------------
 
 The default :class:`~eth.chains.chain.Chain` is stateless and thus does not keep a tip block open
-that would allow us to incrementally build a block. However, we can import the 
+that would allow us to incrementally build a block. However, we can import the
 :class:`~eth.chains.chain.MiningChain` which does allow exactly that.
 
 .. doctest::
 
   >>> from eth.chains.base import MiningChain
 
 Please check out the :doc:`Understanding the mining process
-</guides/understanding_the_mining_process>` guide for a full example that demonstrates how 
+</guides/understanding_the_mining_process>` guide for a full example that demonstrates how
 to use the :class:`~eth.chains.chain.MiningChain`.

docs/fragments/virtualenv_explainer.rst

@@ -19,4 +19,4 @@ To activate the virtual directory we have to *source* it
 
 .. code:: sh
 
-  . venv/bin/activate
+  . venv/bin/activate

docs/guides/architecture.rst

@@ -90,7 +90,7 @@ The term **Computation** is used to encapsulate:
 
 - The computational state during VM execution (e.g. memory, stack, gas metering)
 - The computational results of VM execution (e.g. return data, gas consumption and refunds, execution errors)
-  
+
 This abstraction is the interface through which opcode logic is implemented.
 
 

docs/guides/building_an_app_that_uses_pyevm.rst

@@ -99,10 +99,7 @@ Next, we'll create a new directory ``app`` and create a file ``main.py`` inside.
 
   >>> mock_address_balance = chain.get_vm().state.get_balance(MOCK_ADDRESS)
 
-  >>> print("The balance of address {} is {} wei".format(
-  ...     encode_hex(MOCK_ADDRESS),
-  ...     mock_address_balance)
-  ... )
+  >>> print(f"The balance of address {encode_hex(MOCK_ADDRESS)} is {mock_address_balance} wei")
   The balance of address 0x0000000000000000000000000000000000000000 is 10000000000000000000000 wei
 
 Running the script

docs/guides/creating_opcodes.rst

@@ -51,7 +51,7 @@ Usage of the :func:`~eth.vm.opcode.as_opcode` helper:
 
     def custom_op(computation):
         ... # opcode logic here
-    
+
     class ExampleComputation(BaseComputation):
         opcodes = {
             b'\x01': as_opcode(custom_op, 'CUSTOM_OP', 10),

docs/guides/quickstart.rst

@@ -58,5 +58,3 @@ Finally, install the ``py-evm`` package via pip:
 
   :doc:`Build a first app </guides/building_an_app_that_uses_pyevm>` on top of Py-EVM in under
   5 minutes
-
-

eth/__init__.py

@@ -1,7 +1,10 @@
-import pkg_resources
 import sys
 
-from eth.chains import (  # noqa: F401
+from importlib.metadata import (
+    version as __version,
+)
+
+from eth.chains import (
     Chain,
     MainnetChain,
     MainnetTesterChain,
@@ -15,4 +18,4 @@
 sys.setrecursionlimit(max(EVM_RECURSION_LIMIT, sys.getrecursionlimit()))
 
 
-__version__ = pkg_resources.get_distribution("py-evm").version
+__version__ = __version("py-evm")

eth/_utils/blake2/compression.py

@@ -83,7 +83,6 @@ def blake2b_compress(
     'F Compression' from section 3.2 of RFC 7693:
     https://tools.ietf.org/html/rfc7693#section-3.2
     """
-
     # Dereference these for [very small] speed improvement.
     # Perhaps more than anything, this makes the code
     # easier to read.
@@ -107,7 +106,7 @@ def blake2b_compress(
     m = (
         block
         if isinstance(block, tuple)
-        else struct.unpack_from("<16%s" % Blake2b.WORDFMT, bytes(block))
+        else struct.unpack_from(f"<16{Blake2b.WORDFMT}", bytes(block))
     )
 
     v = [0] * 16