Skip to content

Commit 8d981a9

Browse files
Upgrade egglog version
Upgrades the egglog version to use the new parser as well as the experimental repo.
1 parent e81e641 commit 8d981a9

29 files changed

+988
-1357
lines changed

Cargo.lock

Lines changed: 86 additions & 325 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "egglog_python"
33
version = "8.0.1"
44
edition = "2021"
55

6+
67
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
78
[lib]
89
name = "egglog"
@@ -11,27 +12,23 @@ crate-type = ["cdylib"]
1112
[dependencies]
1213
pyo3 = { version = "0.22.5", features = ["extension-module"] }
1314

14-
# https://github.com/egraphs-good/egglog/compare/ceed816e9369570ffed9feeba157b19471dda70d...main
15-
egglog = { git = "https://github.com/egraphs-good/egglog", rev = "b0db06832264c9b22694bd3de2bdacd55bbe9e32" }
16-
# egglog = { path = "../egg-smol" }
17-
# egglog = { git = "https://github.com/oflatt/egg-smol", branch = "oflatt-fast-terms" }
18-
# egglog = { git = "https://github.com/saulshanabrook/egg-smol", rev = "a555b2f5e82c684442775cc1a5da94b71930113c" }
15+
egglog = { git = "https://github.com/saulshanabrook/egg-smol", rev = "56fce297" }
16+
egglog-experimental = { git = "https://github.com/egraphs-good/egglog-experimental", rev = "8a1b3d6ad2723a8438f51f05027161e51f37917c" }
1917
egraph-serialize = { version = "0.2.0", features = ["serde", "graphviz"] }
20-
# egraph-serialize = { path = "../egraph-serialize", features = [
21-
# "serde",
22-
# "graphviz",
23-
# ] }
2418
serde_json = "1.0.132"
2519
pyo3-log = "0.11.0"
2620
log = "0.4.22"
2721
lalrpop-util = { version = "0.22", features = ["lexer"] }
28-
ordered-float = "3.7"
22+
ordered-float = "3.7.0"
2923
uuid = { version = "1.11.0", features = ["v4"] }
3024

31-
# Use unreleased version of egraph-serialize in egglog as well
32-
# [patch.crates-io]
33-
# egraph-serialize = { git = "https://github.com/egraphs-good/egraph-serialize", rev = "5838c036623e91540831745b1574539e01c8cb23" }
34-
# egraph-serialize = { path = "../egraph-serialize" }
25+
# Use unreleased version of egglog in experimental
26+
[patch.'https://github.com/egraphs-good/egglog']
27+
# https://github.com/rust-lang/cargo/issues/5478#issuecomment-522719793
28+
egglog = { git = "https://github.com/saulshanabrook/egg-smol.git", rev = "56fce297" }
29+
30+
# [replace]
31+
# 'https://github.com/egraphs-good/egglog.git#[email protected]' = { git = "https://github.com/egraphs-good/egglog.git", rev = "215714e1cbb13ae9e21bed2f2e1bf95804571512" }
3532

3633
# enable debug symbols for easier profiling
3734
# [profile.release]

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ strict_equality = true
227227
warn_unused_configs = true
228228
allow_redefinition = true
229229
exclude = ["__snapshots__", "_build", "^conftest.py$"]
230+
# mypy_path = "python"
231+
# explicit_package_bases = true
232+
# namespace_packages = true
230233

231234
[tool.maturin]
232235
python-source = "python"

0 commit comments

Comments
 (0)