bump pyo3

Author: DetachHead

.gitignore

@@ -186,3 +186,6 @@ profile.json
 
 # Scratchpad
 .scratch/
+
+# pyprojectx
+.pyprojectx

Cargo.lock

@@ -9,7 +9,7 @@ crate-type = ["cdylib", "lib"]
 bench = false
 
 [dependencies]
-pyo3 = { version = "0.22.5", features = ["abi3-py37", "auto-initialize"] }
+pyo3 = { version = "0.26.0", features = ["abi3-py37", "auto-initialize"] }
 regex = "1.11.1"
 once_cell = "1.21.3"
 ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", tag = "0.9.3" }

Cargo.toml

@@ -15,8 +15,6 @@ endif
 
 .PHONY: deps
 deps: ## Install dependencies
-	python -m pip install --upgrade uv
-
 	@if [ ! -d "$(VENV)" ]; then \
 		uv venv $(VENV); \
 		echo "Virtual environment created at $(VENV)"; \

Makefile

@@ -0,0 +1,255 @@
+#!/usr/bin/env python3
+
+##################################################################################
+# Pyprojectx wrapper script                                                      #
+# https://github.com/pyprojectx/pyprojectx                                       #
+#                                                                                #
+# Copyright (c) 2021 Ivo Houbrechts                                              #
+#                                                                                #
+# Licensed under the MIT license                                                 #
+##################################################################################
+import argparse
+import os
+import subprocess
+import sys
+import sysconfig
+import zipfile
+from pathlib import Path
+from urllib import request
+
+try:
+    from venv import EnvBuilder
+except ImportError:
+    EnvBuilder = None
+
+
+VERSION = "3.2.9"
+UV_VERSION = "0.8.8"
+
+PYPROJECTX_INSTALL_DIR_ENV_VAR = "PYPROJECTX_INSTALL_DIR"
+PYPROJECTX_PACKAGE_ENV_VAR = "PYPROJECTX_PACKAGE"
+PYPROJECTX_USE_UV_ENV_VAR = "PYPROJECTX_USE_UV"
+PYPROJECT_TOML = "pyproject.toml"
+DEFAULT_INSTALL_DIR = ".pyprojectx"
+SCRIPTS_DIR = Path(sysconfig.get_path("scripts")).name
+EXE = sysconfig.get_config_var("EXE")
+
+CYAN = "\033[96m"
+BLUE = "\033[94m"
+RED = "\033[91m"
+RESET = "\033[0m"
+if sys.platform.startswith("win"):
+    os.system("color")
+
+
+def run(args):
+    try:
+        options = get_options(args)
+        if options.upgrade:
+            download_wrappers()
+            return
+
+        pyprojectx_script = ensure_pyprojectx(options)
+        explicit_options = []
+        if not options.toml:
+            explicit_options += ["--toml", str(options.toml_path)]
+        if not options.install_dir:
+            explicit_options += ["--install-dir", str(options.install_path)]
+
+        subprocess.run([str(pyprojectx_script), *explicit_options, *args], check=True)
+    except subprocess.CalledProcessError as e:
+        raise SystemExit(e.returncode) from e
+
+
+def get_options(args):
+    options = arg_parser().parse_args(args)
+    options.install_path = Path(
+        options.install_dir
+        or os.environ.get(PYPROJECTX_INSTALL_DIR_ENV_VAR, Path(__file__).with_name(DEFAULT_INSTALL_DIR))
+    )
+    options.toml_path = Path(options.toml) if options.toml else Path(__file__).with_name(PYPROJECT_TOML)
+    if os.environ.get(PYPROJECTX_PACKAGE_ENV_VAR):
+        options.version = "development"
+        options.pyprojectx_package = os.environ.get(PYPROJECTX_PACKAGE_ENV_VAR)
+    else:
+        options.version = VERSION
+        options.pyprojectx_package = f"pyprojectx=={VERSION}"
+    options.verbosity = 0 if options.quiet or not options.verbosity else options.verbosity
+    return options
+
+
+def arg_parser():
+    parser = argparse.ArgumentParser(
+        description="Execute commands or aliases defined in the [tool.pyprojectx] section of pyproject.toml. "
+        "Use the -i or --info option to see available tools and aliases.",
+        allow_abbrev=False,
+    )
+    parser.add_argument("--version", action="version", version=VERSION)
+    parser.add_argument(
+        "--toml",
+        "-t",
+        action="store",
+        help="The toml config file. Defaults to 'pyproject.toml' in the same directory as the pw script.",
+    )
+    parser.add_argument(
+        "--install-dir",
+        action="store",
+        help=f"The directory where all tools (including pyprojectx) are installed; defaults to the "
+        f"{PYPROJECTX_INSTALL_DIR_ENV_VAR} environment value if set, else '.pyprojectx' "
+        f"in the same directory as the invoked pw script.",
+    )
+    parser.add_argument(
+        "--force-install",
+        "-f",
+        action="store_true",
+        help="Force clean installation of the virtual environment used to run cmd, if any.",
+    )
+    parser.add_argument(
+        "--clean",
+        "-c",
+        action="store_true",
+        help="Clean .pyprojectx directory by removing all but the current versions "
+        "of pyprojectx and context virtual environments.",
+    )
+    parser.add_argument(
+        "--install-context",
+        action="store",
+        metavar="tool-context",
+        help="Install a tool context without actually running any command.",
+    )
+    parser.add_argument(
+        "--verbose",
+        "-v",
+        action="count",
+        dest="verbosity",
+        help="Give more output. This option is additive and can be used up to 2 times.",
+    )
+    parser.add_argument(
+        "--quiet",
+        "-q",
+        action="store_true",
+        help="Suppress output.",
+    )
+    parser.add_argument(
+        "--info",
+        "-i",
+        action="store_true",
+        help="Show the configuration details of a command instead of running it. "
+        "If no command is specified, a list with all available tools and aliases is shown.",
+    )
+    parser.add_argument(
+        "--add",
+        action="store",
+        metavar="[context:]<package>,<package>...",
+        help="Add one or more packages to a tool context. "
+        "If no context is specified, the packages are added to the main context. "
+        "Packages can be specified as in 'pip install', except that a ',' can't be used in the version specification.",
+    )
+    parser.add_argument(
+        "--lock",
+        action="store_true",
+        help="Write all dependencies of all tool contexts to 'pw.lock' to guarantee reproducible outcomes.",
+    )
+    parser.add_argument(
+        "--install-px", action="store_true", help="Install the px and pxg scripts in your home directory."
+    )
+    parser.add_argument(
+        "--upgrade",
+        action="store_true",
+        help="Download the latest pyprojectx wrapper scripts.",
+    )
+    parser.add_argument(
+        "command", nargs=argparse.REMAINDER, help="The command/alias with optional arguments to execute."
+    )
+    return parser
+
+
+def ensure_pyprojectx(options):  # noqa: C901
+    venv_dir = (
+        options.install_path / "pyprojectx" / f"{options.version}-py{sys.version_info.major}.{sys.version_info.minor}"
+    )
+    pyprojectx_script = venv_dir / SCRIPTS_DIR / f"pyprojectx{EXE}"
+
+    if not pyprojectx_script.is_file():
+        if options.quiet:
+            out = subprocess.DEVNULL
+        else:
+            out = sys.stderr
+            print(f"{CYAN}creating pyprojectx venv in {BLUE}{venv_dir}{RESET}", file=sys.stderr)
+
+        use_uv_install_script = not EnvBuilder or os.environ.get(PYPROJECTX_USE_UV_ENV_VAR)
+        if not use_uv_install_script:
+            env_builder = EnvBuilder(with_pip=True)
+            env_context = env_builder.ensure_directories(venv_dir)
+            try:
+                env_builder.create(venv_dir)
+            except (SystemExit, subprocess.CalledProcessError) as e:
+                print(f"failed to create virtualenv, falling back to uv install script ({e})")
+                use_uv_install_script = True
+            else:
+                pip_cmd = [env_context.env_exe, "-m", "pip", "install", "--pre"]
+                subprocess.run(
+                    [*pip_cmd, "--upgrade", "pip"],
+                    stdout=out,
+                    check=True,
+                )
+        if use_uv_install_script:  # download and use uv to create the pyprojectx venv
+            uv_dir = Path(options.install_path) / f"uv-{UV_VERSION}"
+            release_base_url = (
+                "https://github.com/astral-sh/uv/releases/latest/download"
+                if UV_VERSION == "__uv_version__"
+                else f"https://github.com/astral-sh/uv/releases/download/{UV_VERSION}"
+            )
+            if sys.platform == "win32":
+                # https://github.com/PowerShell/PowerShell/issues/18530#issuecomment-1325691850
+                os.environ["PSMODULEPATH"] = ""
+                install_uv_cmd = (
+                    f'powershell -ExecutionPolicy Bypass -c "irm {release_base_url}/uv-installer.ps1 | iex"'
+                )
+            else:
+                install_uv_cmd = f"curl --proto '=https' --tlsv1.2 -LsSf irm {release_base_url}/uv-installer.sh | sh"
+            subprocess.run(
+                install_uv_cmd,
+                stdout=out,
+                check=True,
+                shell=True,
+                env={**os.environ, "UV_BUILD_UNMANAGED_INSTALL": str(uv_dir), "UV_UNMANAGED_INSTALL": str(uv_dir)},
+            )
+            uv = uv_dir / f"uv{EXE}"
+            subprocess.run(
+                [uv, "venv", str(venv_dir), "--python", sys.executable, "--clear"],
+                stdout=out,
+                check=True,
+            )
+            pip_cmd = [uv, "pip", "install", "--pre", "--python", str(venv_dir / SCRIPTS_DIR / f"python{EXE}")]
+
+        if not options.quiet:
+            print(
+                f"{CYAN}installing pyprojectx {BLUE}{options.version}: {options.pyprojectx_package} {RESET}",
+                file=sys.stderr,
+            )
+        if options.version == "development":
+            if not options.quiet:
+                print(
+                    f"{RED}WARNING: {options.pyprojectx_package} is installed in editable mode{RESET}",
+                    file=sys.stderr,
+                )
+            pip_cmd.append("-e")
+        subprocess.run([*pip_cmd, options.pyprojectx_package], stdout=out, check=True)
+
+    return pyprojectx_script
+
+
+def download_wrappers():
+    latest = "https://github.com/pyprojectx/pyprojectx/releases/latest/download/wrappers.zip"
+    zip_file, _ = request.urlretrieve(latest)  # noqa: S310
+    with zipfile.ZipFile(zip_file, "r") as zip_ref:
+        zip_ref.extractall(Path(__file__).parent)
+
+
+if __name__ == "__main__":
+    try:
+        run(sys.argv[1:])
+    except KeyboardInterrupt:
+        sys.tracebacklimit = -1
+        raise

pw

@@ -0,0 +1,2 @@
+@echo off
+python "%~dp0pw" %*

pw.bat

@@ -0,0 +1,3 @@
+[main]
+requirements = ["uv==0.9.0"]
+hash = "45210da832f9626829457a65e9e7c4d0"

pw.lock

@@ -133,7 +133,7 @@ struct CheckExternalMetadata {
 /// Get metadata for checking external dependencies.
 fn get_check_external_metadata(project_config: &ProjectConfig) -> Result<CheckExternalMetadata> {
     Python::with_gil(|py| {
-        let external_utils = PyModule::import_bound(py, "tach.utils.external")
+        let external_utils = PyModule::import(py, "tach.utils.external")
             .expect("Failed to import tach.utils.external");
         let mut module_mappings: HashMap<String, Vec<String>> = external_utils
             .getattr("get_module_mappings")

src/commands/check/check_external.rs

@@ -16,13 +16,16 @@ pub struct PythonImport {
     pub line_number: usize,
 }
 
-impl IntoPy<PyObject> for LocatedImport {
-    fn into_py(self, py: Python<'_>) -> PyObject {
+impl<'py> IntoPyObject<'py> for LocatedImport {
+    type Target = PythonImport;
+    type Output = Bound<'py, Self::Target>;
+    type Error = pyo3::PyErr;
+    fn into_pyobject(self, py: Python<'py>) -> std::result::Result<Self::Output, Self::Error>  {
         PythonImport {
             module_path: self.import.module_path,
             line_number: self.alias_line_number,
         }
-        .into_py(py)
+        .into_pyobject(py)
     }
 }