removed solc-select dependency, try to use solc from PATH

Author: felix314159

pyproject.toml

@@ -38,7 +38,6 @@ dependencies = [
     "semver>=3.0.1,<4",
     "pydantic>=2.10.0,<3",
     "rich>=13.7.0,<14",
-    "solc-select>=1.0.4,<2",
     "filelock>=3.15.1,<4",
     "ethereum-types>=0.2.1,<0.3",
     "pyyaml>=6.0.2,<7",
@@ -50,6 +49,7 @@ dependencies = [
     "pytest-regex>=0.2.0,<0.3",
     "eth-abi>=5.2.0",
     "joblib>=1.4.2",
+    "ckzg>=2.1.1,<3",
 ]
 
 [project.urls]

src/pytest_plugins/solc/solc.py

@@ -1,19 +1,13 @@
-"""Pytest plugin for configuring and installing the solc compiler."""
+"""Pytest plugin for configuring and verifying the solc compiler."""
 
-import platform
 import subprocess
-from argparse import ArgumentTypeError
 from shutil import which
 
 import pytest
-import solc_select.solc_select as solc_select  # type: ignore
 from pytest_metadata.plugin import metadata_key  # type: ignore
 from semver import Version
 
 from ethereum_test_forks import Frontier
-from ethereum_test_tools.code import Solc
-
-DEFAULT_SOLC_VERSION = "0.8.24"
 
 
 def pytest_addoption(parser: pytest.Parser):
@@ -26,110 +20,109 @@ def pytest_addoption(parser: pytest.Parser):
         type=str,
         default=None,
         help=(
-            "Path to a solc executable (for Yul source compilation). "
-            "No default; if unspecified `--solc-version` is used."
+            "Path to a solc executable (for Yul source compilation). Default: solc binary in PATH."
         ),
     )
-    solc_group.addoption(
-        "--solc-version",
-        action="store",
-        dest="solc_version",
-        default=None,
-        help=f"Version of the solc compiler to use. Default: {DEFAULT_SOLC_VERSION}.",
-    )
 
 
 @pytest.hookimpl(tryfirst=True)
 def pytest_configure(config: pytest.Config):
-    """
-    Ensure that the specified solc version is:
-    - available if --solc_bin has been specified,
-    - installed via solc_select if --solc_version has been specified.
-    """
+    """Ensure that solc is available and get its version."""
     solc_bin = config.getoption("solc_bin")
-    solc_version = config.getoption("solc_version")
-
-    if solc_bin and solc_version:
-        raise pytest.UsageError(
-            "You cannot specify both --solc-bin and --solc-version. Please choose one."
-        )
 
+    # Use provided solc binary or find it in PATH
     if solc_bin:
-        # will raise an error if the solc binary is not found.
-        solc_version_semver = Solc(config.getoption("solc_bin")).version
+        if not which(solc_bin):
+            pytest.exit(
+                f"Specified solc binary not found: {solc_bin}",
+                returncode=pytest.ExitCode.USAGE_ERROR,
+            )
     else:
-        # if no solc binary is specified, use solc-select
-        solc_version = solc_version or DEFAULT_SOLC_VERSION
-        try:
-            version, _ = solc_select.current_version()
-        except ArgumentTypeError:
-            version = None
-        if version != solc_version:
-            # solc-select current does not support ARM linux
-            if platform.system().lower() == "linux" and platform.machine().lower() == "aarch64":
-                error_message = (
-                    f"Version {version} does not match solc_version {solc_version} "
-                    "and since solc-select currently does not support ARM linux you must "
-                    "manually do the following: "
-                    "Build solc from source, and manually move the binary to "
-                    ".venv/.solc-select/artifacts/solc-x.y.z/solc-x.y.z, then run "
-                    "'uv run solc-select use <x.y.z>'"
-                )
-                pytest.exit(error_message, returncode=pytest.ExitCode.USAGE_ERROR)
-
-            if config.getoption("verbose") > 0:
-                print(f"Setting solc version {solc_version} via solc-select...")
-            try:
-                solc_select.switch_global_version(solc_version, always_install=True)
-            except Exception as e:
-                message = f"Failed to install solc version {solc_version}: {e}. "
-                if isinstance(e, ArgumentTypeError):
-                    message += "\nList available versions using `uv run solc-select install`."
-                pytest.exit(message, returncode=pytest.ExitCode.USAGE_ERROR)
-        solc_version_semver = Version.parse(solc_version)
-        config.option.solc_bin = which("solc")  # save for fixture
+        solc_bin = which("solc")
+        if not solc_bin:
+            pytest.exit(
+                "solc binary not found in PATH. Please install solc and ensure it's in your PATH.",
+                returncode=pytest.ExitCode.USAGE_ERROR,
+            )
+
+    # Get solc version using subprocess
+    try:
+        result = subprocess.run(
+            [solc_bin, "--version"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            check=True,
+            timeout=10,
+        )
+    except subprocess.CalledProcessError as e:
+        pytest.exit(
+            f"Failed to get solc version. Command output: {e.stdout}",
+            returncode=pytest.ExitCode.USAGE_ERROR,
+        )
+    except subprocess.TimeoutExpired:
+        pytest.exit("Timeout while getting solc version.", returncode=pytest.ExitCode.USAGE_ERROR)
+    except Exception as e:
+        pytest.exit(
+            f"Unexpected error while getting solc version: {e}",
+            returncode=pytest.ExitCode.USAGE_ERROR,
+        )
+
+    # Parse version from output
+    version_output = result.stdout
+    version_line = None
+
+    # Look for version in output (format: "Version: X.Y.Z+commit.hash")
+    for line in version_output.split("\n"):
+        if line.startswith("Version:"):
+            version_line = line
+            break
+
+    if not version_line:
+        pytest.exit(
+            f"Could not parse solc version from output:\n{version_output}",
+            returncode=pytest.ExitCode.USAGE_ERROR,
+        )
 
+    # Extract version number
+    try:
+        # Format is typically "Version: 0.8.24+commit.e11b9ed9.Linux.g++"
+        version_str = version_line.split()[1].split("+")[0]
+        solc_version_semver = Version.parse(version_str)
+    except (IndexError, ValueError) as e:
+        pytest.exit(
+            f"Failed to parse solc version from: {version_line}\nError: {e}",
+            returncode=pytest.ExitCode.USAGE_ERROR,
+        )
+
+    # Store version in metadata
     if "Tools" not in config.stash[metadata_key]:
         config.stash[metadata_key]["Tools"] = {
             "solc": str(solc_version_semver),
         }
     else:
         config.stash[metadata_key]["Tools"]["solc"] = str(solc_version_semver)
 
+    # Check minimum version requirement
     if solc_version_semver < Frontier.solc_min_version():
         pytest.exit(
-            f"Unsupported solc version: {solc_version}. Minimum required version is "
+            f"Unsupported solc version: {solc_version_semver}. Minimum required version is "
             f"{Frontier.solc_min_version()}",
             returncode=pytest.ExitCode.USAGE_ERROR,
         )
+
+    # Store for later use
     config.solc_version = solc_version_semver  # type: ignore
+    config.option.solc_bin = solc_bin  # save for fixture
 
-    # test whether solc_version matches actual one
-    # using subprocess because that's how yul is compiled in
-    # ./src/ethereum_test_specs/static_state/common/compile_yul.py
-    expected_solc_version_string: str = str(solc_version_semver)
-    actual_solc_version = subprocess.run(
-        ["solc", "--version"],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-        text=True,
-        check=True,
-    )
-    actual_solc_version_string = actual_solc_version.stdout
-    # use only look at first 10 chars to pass e.g.
-    # actual: 0.8.25+commit.b61c2a91.Linux.g++ should pass with expected: "0.8.25+commit.b61c2a91
-    if (
-        expected_solc_version_string[:10] not in actual_solc_version_string
-    ) or expected_solc_version_string == "":
-        error_message = f"Expected solc version {solc_version_semver} but detected a\
- different solc version:\n{actual_solc_version_string}\nCritical error, aborting.."
-        pytest.exit(error_message, returncode=pytest.ExitCode.USAGE_ERROR)
+    if config.getoption("verbose") > 0:
+        print(f"Using solc version {solc_version_semver} from {solc_bin}")
 
 
 @pytest.fixture(autouse=True, scope="session")
 def solc_bin(request: pytest.FixtureRequest):
     """Return configured solc binary path."""
-    return request.config.getoption("solc_bin")
+    return request.config.getoption("solc_bin") or which("solc")
 
 
 @pytest.hookimpl(trylast=True)
@@ -138,4 +131,5 @@ def pytest_report_header(config, start_path):
     if config.option.collectonly:
         return
     solc_version = config.stash[metadata_key]["Tools"]["solc"]
-    return [(f"solc: {solc_version}")]
+    solc_path = config.option.solc_bin or which("solc")
+    return [f"solc: {solc_version}", f"solc path: {solc_path}"]