fix: repair pull request ci

Author: banteg

.github/workflows/core-ganache.yaml

@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.14t"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
         include:
           - python-version: "3.10"
             infura-key: ddddf0c53f254d36aa76ce4e3a6a390e
@@ -62,8 +62,6 @@ jobs:
             infura-key: ddddf0c53f254d36aa76ce4e3a6a390e
           - python-version: "3.14"
             infura-key: 1668fecbc9c242d58253476103a42ce9
-          - python-version: "3.14t"
-            infura-key: 21317ddb5ded42ce8d40c7d78f90474f
           - os: ubuntu-latest
             ccache-dir: ~/.cache/ccache
           - os: macos-latest

.github/workflows/pip-compile.yaml

@@ -59,7 +59,7 @@ jobs:
         fi
 
     - name: Commit changes
-      if: env.changes_detected == 'true'
+      if: env.changes_detected == 'true' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
       run: |
         git config --local user.name "github-actions[bot]"
         git config --local user.email "github-actions[bot]@users.noreply.github.com"

brownie/exceptions.py

@@ -225,7 +225,7 @@ class BadProjectName(Exception):
 
 @final
 class CompilerError(Exception):
-    def __init__(self, e: type[psutil.Popen], compiler: str = "Compiler") -> None:
+    def __init__(self, e: Any, compiler: str = "Compiler") -> None:
         self.compiler: Final = compiler
 
         err_json: dict[str, list[dict[str, str]]] = yaml.safe_load(e.stdout_data)

brownie/project/compiler/solidity.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 import logging
-from typing import Any, Deque, Final
+from typing import Any, Deque, Final, cast
 
 import semantic_version
 import solcast
@@ -60,8 +60,14 @@
 _BINOPS_PARAMS: Final = {"nodeType": "BinaryOperation", "typeDescriptions.typeString": "bool"}
 
 
+def _to_brownie_version(version: Any) -> semantic_version.Version:
+    if isinstance(version, Version):
+        return version
+    return Version(str(version))
+
+
 def get_version() -> semantic_version.Version:
-    return solcx.get_solc_version(with_commit_hash=True)
+    return _to_brownie_version(solcx.get_solc_version(with_commit_hash=True))
 
 
 def compile_from_input_json(
@@ -96,7 +102,7 @@ def compile_from_input_json(
             print(f"  EVM Version: {settings['evmVersion'].capitalize()}")
 
     try:
-        return solcx.compile_standard(input_json, allow_paths=allow_paths)
+        return solcx.compile_standard(cast(dict[Any, Any], input_json), allow_paths=allow_paths)
     except solcx.exceptions.SolcError as e:
         raise CompilerError(e, "solc")
 
@@ -108,22 +114,22 @@ def set_solc_version(version: VersionSpec) -> str:
     if version < Version("0.4.22"):
         raise IncompatibleSolcVersion("Brownie only supports Solidity versions >=0.4.22")
     try:
-        solcx.set_solc_version(version, silent=True)
+        solcx.set_solc_version(str(version), silent=True)
     except solcx.exceptions.SolcNotInstalled:
         if version not in _get_solc_version_list()[0]:
             raise IncompatibleSolcVersion(
                 f"Cannot install Solidity v{version} on this OS. You may be able to "
                 f"manually compile from source with `solcx.compile_solc('{version}')`"
             )
         install_solc(version)
-        solcx.set_solc_version(version, silent=True)
+        solcx.set_solc_version(str(version), silent=True)
     return str(solcx.get_solc_version())
 
 
 def install_solc(*versions: VersionSpec) -> None:
     """Installs solc versions."""
     for version in versions:
-        solcx.install_solc(version, show_progress=False)
+        solcx.install_solc(str(version), show_progress=False)
 
 
 def get_abi(contract_source: str, allow_paths: str | None = None) -> dict[str, list[ABIElement]]:
@@ -192,7 +198,7 @@ def find_solc_versions(
     # install new versions if needed
     if to_install:
         install_solc(*to_install)
-        installed_versions = solcx.get_installed_solc_versions()
+        installed_versions = [_to_brownie_version(i) for i in solcx.get_installed_solc_versions()]
     elif new_versions and not silent:
         print(
             f"New compatible solc version{'s' if len(new_versions) > 1 else ''}"
@@ -255,10 +261,14 @@ def find_best_solc_version(
 
 def _get_solc_version_list() -> tuple[VersionList, VersionList]:
     global AVAILABLE_SOLC_VERSIONS
-    installed_versions: VersionList = solcx.get_installed_solc_versions()
+    installed_versions: VersionList = [
+        _to_brownie_version(i) for i in solcx.get_installed_solc_versions()
+    ]
     if AVAILABLE_SOLC_VERSIONS is None:
         try:
-            AVAILABLE_SOLC_VERSIONS = solcx.get_installable_solc_versions()
+            AVAILABLE_SOLC_VERSIONS = [
+                _to_brownie_version(i) for i in solcx.get_installable_solc_versions()
+            ]
         except ConnectionError:
             if not installed_versions:
                 raise ConnectionError("Solc not installed and cannot connect to GitHub")

tests/network/account/test_account_deploy.py

@@ -123,13 +123,15 @@ def test_nonce_manual_on_revert_in_console(BrownieTester, accounts, console_mode
 
 
 def test_selfdestruct_during_deploy(accounts):
-    foo = compile_source("""
+    foo = compile_source(
+        """
 pragma solidity 0.5.0;
 
 contract Foo {
     constructor () public { selfdestruct(address(0)); }
 }
-    """).Foo
+    """
+    ).Foo
 
     result = foo.deploy({"from": accounts[0]})
     assert isinstance(result, TransactionReceipt)

tests/network/contract/test_contractcall.py

@@ -24,14 +24,16 @@ def test_transact(accounts, tester):
 
 
 def test_block_identifier(accounts, history):
-    contract = compile_source("""
+    contract = compile_source(
+        """
 # @version 0.2.4
 foo: public(int128)
 
 @external
 def set_foo(_foo: int128):
     self.foo = _foo
-    """).Vyper.deploy({"from": accounts[0]})
+    """
+    ).Vyper.deploy({"from": accounts[0]})
 
     contract.set_foo(13)
     contract.set_foo(42)

tests/network/test_event.py

@@ -5,7 +5,11 @@
 
 import pytest
 from web3.datastructures import AttributeDict
-from web3.exceptions import ABIEventFunctionNotFound
+
+try:
+    from web3.exceptions import ABIEventNotFound as ABIEventFunctionNotFound
+except ImportError:
+    from web3.exceptions import ABIEventFunctionNotFound
 
 from brownie import Contract, compile_source
 from brownie.exceptions import EventLookupError
@@ -110,7 +114,8 @@ def test_eventitem_raises(event):
 
 
 def test_same_topic_different_abi(accounts):
-    proj = compile_source("""
+    proj = compile_source(
+        """
     pragma solidity 0.5.0;
 
     contract Foo {
@@ -126,7 +131,8 @@ def test_same_topic_different_abi(accounts):
             _addr.foo();
             emit Baz(4, 5, 6);
         }
-    }""")
+    }"""
+    )
 
     foo = proj.Foo.deploy({"from": accounts[0]})
     bar = proj.Bar.deploy({"from": accounts[0]})

tests/network/transaction/test_internal_transfer.py

@@ -5,7 +5,8 @@
 
 
 def test_to_eoa(accounts):
-    container = compile_source("""
+    container = compile_source(
+        """
 # @version 0.2.4
 
 @external
@@ -15,7 +16,8 @@ def send_ether(receivers: address[3]) -> bool:
     for i in range(3):
         send(receivers[i], value)
         value += 100
-    return True""").Vyper
+    return True"""
+    ).Vyper
     contract = container.deploy({"from": accounts[0]})
     tx = contract.send_ether(accounts[:3], {"value": 800})
     assert tx.internal_transfers == [
@@ -26,7 +28,8 @@ def send_ether(receivers: address[3]) -> bool:
 
 
 def test_to_contract(accounts):
-    container = compile_source("""
+    container = compile_source(
+        """
 # @version 0.2.4
 
 @external
@@ -39,7 +42,8 @@ def send_ether(receiver: address) -> bool:
 @payable
 def __default__():
     return
-    """).Vyper
+    """
+    ).Vyper
     contract = container.deploy({"from": accounts[0]})
     contract2 = container.deploy({"from": accounts[0]})
     tx = contract.send_ether(contract2, {"value": 31337})
@@ -48,14 +52,16 @@ def __default__():
 
 
 def test_types(accounts):
-    container = compile_source("""
+    container = compile_source(
+        """
 # @version 0.2.4
 
 @external
 @payable
 def send_ether(receiver: address) -> bool:
     send(receiver, msg.value)
-    return True""").Vyper
+    return True"""
+    ).Vyper
     contract = container.deploy({"from": accounts[0]})
     tx = contract.send_ether(accounts[1], {"value": 800})
     xfer = tx.internal_transfers[0]
@@ -65,27 +71,31 @@ def send_ether(receiver: address) -> bool:
 
 
 def test_via_create_vyper(accounts):
-    container = compile_source("""
+    container = compile_source(
+        """
 # @version 0.2.4
 
 @external
 @payable
 def send_ether() -> bool:
     x: address = create_forwarder_to(self, value=msg.value)
-    return True""").Vyper
+    return True"""
+    ).Vyper
     contract = container.deploy({"from": accounts[0]})
     tx = contract.send_ether({"value": 42})
     assert tx.internal_transfers == [{"from": contract, "to": tx.new_contracts[0], "value": 42}]
 
 
 def test_via_create_solidity(accounts):
-    project = compile_source("""pragma solidity 0.6.2;
+    project = compile_source(
+        """pragma solidity 0.6.2;
 
 contract Foo { constructor () public payable {} }
 
 contract Deployer {
     function create () public payable returns (Foo) { return new Foo{value: msg.value}(); }
-}""")
+}"""
+    )
     contract = project.Deployer.deploy({"from": accounts[0]})
     tx = contract.create({"value": 69})
     assert tx.internal_transfers == [{"from": contract, "to": tx.new_contracts[0], "value": 69}]

tests/project/compiler/test_solidity.py

@@ -73,11 +73,15 @@ def msolc(monkeypatch):
 
 def test_set_solc_version():
     compiler.set_solc_version("0.5.7")
-    assert solcx.get_solc_version(with_commit_hash=True) == compiler.solidity.get_version()
-    assert solcx.get_solc_version(with_commit_hash=True).truncate() == Version("0.5.7")
+    assert str(solcx.get_solc_version(with_commit_hash=True)) == str(
+        compiler.solidity.get_version()
+    )
+    assert compiler.solidity.get_version().truncate() == Version("0.5.7")
     compiler.set_solc_version("0.4.25")
-    assert solcx.get_solc_version(with_commit_hash=True) == compiler.solidity.get_version()
-    assert solcx.get_solc_version(with_commit_hash=True).truncate() == Version("0.4.25")
+    assert str(solcx.get_solc_version(with_commit_hash=True)) == str(
+        compiler.solidity.get_version()
+    )
+    assert compiler.solidity.get_version().truncate() == Version("0.4.25")
 
 
 def test_generate_input_json(solc5source):

tests/project/main/test_contract_syntaxes.py

@@ -18,7 +18,9 @@ def test_only_events(newproject, minor):
 contract OnlyEvents {{
     event Transfer(address from, address to, uint256 value);
     event Approval(address owner, address spender, uint256 value);
-}}""".format(minor)
+}}""".format(
+        minor
+    )
     with newproject._path.joinpath("contracts/OnlyEvents.sol").open("w") as fp:
         fp.write(source)
     newproject.load()