Merge pull request #276 from egraphs-good/update

Upgrade dependencies

Author: saulshanabrook

.github/workflows/version.yml

@@ -11,6 +11,10 @@
 # This seperates the release process from the test process, so we can still release if we need to and tests are failing
 name: Bump Version
 on:
+  push:
+    branches:
+      - main
+  pull_request:
   workflow_dispatch:
     inputs:
       type:
@@ -27,6 +31,7 @@ jobs:
   bump:
     runs-on: ubuntu-latest
     permissions: write-all
+    if: github.event_name == 'workflow_dispatch'
     outputs:
       version: ${{ steps.bump.outputs.version }}
     steps:
@@ -52,10 +57,14 @@ jobs:
       matrix:
         target: [aarch64, ppc64]
     needs: [bump]
+    if: ${{ always() }}
     steps:
       - uses: actions/checkout@v4
+        if: ${{ needs.bump.result == 'success' }}
         with:
           ref: version-${{ needs.bump.outputs.version }}
+      - uses: actions/checkout@v4
+        if: ${{ needs.bump.result == 'skipped' }}
       - uses: PyO3/maturin-action@v1.47.1
         with:
           target: ${{ matrix.target }}
@@ -65,17 +74,21 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-linux
+          name: wheels-linux-${{ matrix.target }}
           path: dist
 
   linux:
     name: build linux
     runs-on: ubuntu-latest
     needs: [bump]
+    if: ${{ always() }}
     steps:
       - uses: actions/checkout@v4
+        if: ${{ needs.bump.result == 'success' }}
         with:
           ref: version-${{ needs.bump.outputs.version }}
+      - uses: actions/checkout@v4
+        if: ${{ needs.bump.result == 'skipped' }}
       - name: Setup QEMU
         uses: docker/setup-qemu-action@v3
       - uses: PyO3/maturin-action@v1.47.1
@@ -93,10 +106,14 @@ jobs:
     name: build windows
     runs-on: windows-latest
     needs: [bump]
+    if: ${{ always() }}
     steps:
       - uses: actions/checkout@v4
+        if: ${{ needs.bump.result == 'success' }}
         with:
           ref: version-${{ needs.bump.outputs.version }}
+      - uses: actions/checkout@v4
+        if: ${{ needs.bump.result == 'skipped' }}
       - uses: PyO3/maturin-action@v1.47.1
         with:
           command: build
@@ -111,10 +128,14 @@ jobs:
     name: build macos
     runs-on: macos-latest
     needs: [bump]
+    if: ${{ always() }}
     steps:
       - uses: actions/checkout@v4
+        if: ${{ needs.bump.result == 'success' }}
         with:
           ref: version-${{ needs.bump.outputs.version }}
+      - uses: actions/checkout@v4
+        if: ${{ needs.bump.result == 'skipped' }}
       - uses: PyO3/maturin-action@v1.47.1
         with:
           command: build
@@ -130,7 +151,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch')
-    needs: [macos, windows, linux, linux-cross]
+    needs: [macos, windows, linux, linux-cross, bump]
     steps:
       - uses: actions/download-artifact@v4
         with:

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 exclude: ^python/tests/__snapshots__/
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.3
+    rev: v0.11.0
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
   - repo: https://github.com/astral-sh/uv-pre-commit
     # uv version.
-    rev: 0.5.31
+    rev: 0.6.8
     hooks:
       - id: uv-lock

Cargo.lock

@@ -10,17 +10,17 @@ name = "egglog"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.22.6", features = ["extension-module"] }
+pyo3 = { version = "0.23.0", features = ["extension-module"] }
 
 egglog = { git = "https://github.com/saulshanabrook/egg-smol", rev = "889ca7635368d7e382e16a93b2883aba82f1078f" }
 egglog-experimental = { git = "https://github.com/egraphs-good/egglog-experimental", rev = "8a1b3d6ad2723a8438f51f05027161e51f37917c" }
 egraph-serialize = { version = "0.2.0", features = ["serde", "graphviz"] }
 serde_json = "1.0.140"
-pyo3-log = "0.11.0"
+pyo3-log = "0.12.1"
 log = "0.4.26"
 lalrpop-util = { version = "0.22", features = ["lexer"] }
 ordered-float = "3.7.0"
-uuid = { version = "1.15.1", features = ["v4"] }
+uuid = { version = "1.16.0", features = ["v4"] }
 
 # Use unreleased version of egglog in experimental
 [patch.'https://github.com/egraphs-good/egglog']

Cargo.toml

@@ -89,10 +89,8 @@ ignore = [
     # allow star imports
     "F405",
     "F403",
-    # Dont care if cls isnt typed explicitly in classmethod
-    "ANN102",
-    # Same for self
-    "ANN101",
+    # allow shadow builtin import
+    "A004",
     # Allow single line docstrings on multiple lines
     "D200",
     "D212",

pyproject.toml

@@ -88,4 +88,4 @@ def wrapper(*args):
     wrapper.__name__ = f.__name__
 
     # Partially apply the wrapper function with the current values of the free vars
-    return cast(T, partial(wrapper, *(v for _, _, v, _ in additional_arg_filtered)))
+    return cast("T", partial(wrapper, *(v for _, _, v, _ in additional_arg_filtered)))

python/egglog/functionalize.py

@@ -286,8 +286,8 @@ def __hash__(self) -> int:
         return hash((id(self.__egg_decls_thunk__), self.__egg_tp__))
 
     # Support unioning like types
-    def __or__(self, __value: type) -> object:
-        return Union[self, __value]  # noqa: UP007
+    def __or__(self, value: type) -> object:
+        return Union[self, value]  # noqa: UP007
 
     @property
     def __parameters__(self) -> tuple[object, ...]:

python/egglog/runtime.py

@@ -2,12 +2,14 @@
 from __future__ import annotations
 
 import inspect
-from types import FunctionType
-from typing import cast
+from typing import TYPE_CHECKING, cast
 
 from egglog import *
 from egglog.exp.program_gen import *
 
+if TYPE_CHECKING:
+    from types import FunctionType
+
 
 class Math(Expr):
     def __init__(self, value: i64Like) -> None: ...
@@ -85,6 +87,6 @@ def test_py_object():
     egraph.register(evalled)
     egraph.run((to_program_ruleset | eval_program_rulseset | program_gen_ruleset).saturate())
     with egraph.set_current():
-        res = cast(FunctionType, evalled.as_py_object.eval())
+        res = cast("FunctionType", evalled.as_py_object.eval())
     assert res(1, 2) == 13
     assert inspect.getsource(res)

python/tests/test_program_gen.py

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.79.0"
+channel = "1.85.0"

rust-toolchain.toml

@@ -4,7 +4,7 @@ use crate::utils::*;
 use egglog::ast::Symbol;
 use ordered_float::OrderedFloat;
 use pyo3::prelude::*;
-use pyo3::types::PyDeltaAccess;
+use pyo3::types::{PyDelta, PyDeltaAccess};
 use std::collections::HashMap;
 use std::sync::Arc;
 
@@ -460,9 +460,13 @@ impl FromPyObject<'_> for Box<Schedule> {
     }
 }
 
-impl IntoPy<PyObject> for Box<Schedule> {
-    fn into_py(self, py: Python<'_>) -> PyObject {
-        (*self).into_py(py)
+impl<'py> IntoPyObject<'py> for Box<Schedule> {
+    type Target = PyAny; // the Python type
+    type Output = Bound<'py, Self::Target>; // in most cases this will be `Bound`
+    type Error = pyo3::PyErr;
+
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
+        Ok((*self).into_pyobject(py)?.as_any().clone())
     }
 }
 
@@ -472,9 +476,13 @@ impl FromPyObject<'_> for Box<Command> {
     }
 }
 
-impl IntoPy<PyObject> for Box<Command> {
-    fn into_py(self, py: Python<'_>) -> PyObject {
-        (*self).into_py(py)
+impl<'py> IntoPyObject<'py> for Box<Command> {
+    type Target = PyAny; // the Python type
+    type Output = Bound<'py, Self::Target>; // in most cases this will be `Bound`
+    type Error = pyo3::PyErr;
+
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
+        Ok((*self).into_pyobject(py)?.as_any().clone())
     }
 }
 
@@ -495,9 +503,13 @@ impl FromPyObject<'_> for WrappedOrderedF64 {
     }
 }
 
-impl IntoPy<PyObject> for WrappedOrderedF64 {
-    fn into_py(self, py: Python<'_>) -> PyObject {
-        self.0.into_inner().into_py(py)
+impl<'py> IntoPyObject<'py> for WrappedOrderedF64 {
+    type Target = PyAny; // the Python type
+    type Output = Bound<'py, Self::Target>; // in most cases this will be `Bound`
+    type Error = pyo3::PyErr;
+
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
+        Ok((self.0.into_inner()).into_pyobject(py)?.as_any().clone())
     }
 }
 
@@ -522,20 +534,22 @@ impl FromPyObject<'_> for WrappedDuration {
         )))
     }
 }
+impl<'py> IntoPyObject<'py> for WrappedDuration {
+    type Target = PyDelta; // the Python type
+    type Output = Bound<'py, Self::Target>; // in most cases this will be `Bound`
+    type Error = pyo3::PyErr;
 
-impl IntoPy<PyObject> for WrappedDuration {
-    fn into_py(self, py: Python<'_>) -> PyObject {
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
         let d = self.0;
-        pyo3::types::PyDelta::new_bound(
+        Ok(pyo3::types::PyDelta::new(
             py,
             0,
             0,
             d.as_millis()
                 .try_into()
                 .expect("Failed to convert miliseconds to int32 when converting duration"),
             true,
-        )
-        .expect("Failed to contruct timedelta")
-        .into()
+        )?
+        .clone())
     }
 }