Skip to content

Commit f978fe7

Browse files
Upgrade all dependencies
1 parent 12d8d5f commit f978fe7

22 files changed

+1967
-1881
lines changed

.github/workflows/CI.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- "3.10"
2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: dtolnay/rust-toolchain@1.71.1
28+
- uses: dtolnay/rust-toolchain@1.79.0
2929
- uses: Swatinem/rust-cache@v2
3030
- name: Setup python ${{ matrix.py }}
3131
uses: actions/setup-python@v5
@@ -38,7 +38,7 @@ jobs:
3838
runs-on: ubuntu-latest
3939
steps:
4040
- uses: actions/checkout@v4
41-
- uses: dtolnay/rust-toolchain@1.71.1
41+
- uses: dtolnay/rust-toolchain@1.79.0
4242
- uses: Swatinem/rust-cache@v2
4343
- uses: actions/setup-python@v5
4444
with:
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- uses: actions/checkout@v4
54-
- uses: dtolnay/rust-toolchain@1.71.1
54+
- uses: dtolnay/rust-toolchain@1.79.0
5555
- uses: Swatinem/rust-cache@v2
5656
- uses: actions/setup-python@v5
5757
with:
@@ -66,7 +66,7 @@ jobs:
6666
runs-on: ubuntu-latest
6767
steps:
6868
- uses: actions/checkout@v4
69-
- uses: dtolnay/rust-toolchain@1.71.1
69+
- uses: dtolnay/rust-toolchain@1.79.0
7070
- uses: Swatinem/rust-cache@v2
7171
- uses: actions/setup-python@v5
7272
with:

Cargo.lock

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

Cargo.toml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,24 @@ name = "egglog"
99
crate-type = ["cdylib"]
1010

1111
[dependencies]
12-
pyo3 = { version = "0.21", features = ["extension-module"] }
12+
pyo3 = { version = "0.22.5", features = ["extension-module"] }
1313

1414
# https://github.com/egraphs-good/egglog/compare/ceed816e9369570ffed9feeba157b19471dda70d...main
15-
# egglog = { git = "https://github.com/egraphs-good/egglog", rev = "fb4a9f114f9bb93154d6eff0dbab079b5cb4ebb6" }
15+
egglog = { git = "https://github.com/egraphs-good/egglog", rev = "b0db06832264c9b22694bd3de2bdacd55bbe9e32" }
1616
# egglog = { path = "../egg-smol" }
1717
# egglog = { git = "https://github.com/oflatt/egg-smol", branch = "oflatt-fast-terms" }
18-
egglog = { git = "https://github.com/saulshanabrook/egg-smol", rev = "a555b2f5e82c684442775cc1a5da94b71930113c" }
19-
egraph-serialize = { git = "https://github.com/saulshanabrook/egraph-serialize", rev = "1c205fcc6d3426800b828e9264dbadbd4a5ef6e9", features = [
20-
"serde",
21-
"graphviz",
22-
] }
18+
# egglog = { git = "https://github.com/saulshanabrook/egg-smol", rev = "a555b2f5e82c684442775cc1a5da94b71930113c" }
19+
egraph-serialize = { version = "0.2.0", features = ["serde", "graphviz"] }
2320
# egraph-serialize = { path = "../egraph-serialize", features = [
2421
# "serde",
2522
# "graphviz",
2623
# ] }
27-
serde_json = "*"
28-
pyo3-log = "0.10.0"
24+
serde_json = "1.0.1"
25+
pyo3-log = "0.11.0"
2926
log = "0.4.21"
30-
lalrpop-util = { version = "0.20.2", features = ["lexer"] }
31-
ordered-float = "*"
27+
lalrpop-util = { version = "0.20", features = ["lexer"] }
28+
ordered-float = "3.7"
3229
uuid = { version = "1.8.0", features = ["v4"] }
33-
num-rational = "*"
3430

3531
# Use unreleased version of egraph-serialize in egglog as well
3632
# [patch.crates-io]

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ python/egglog/visualizer.js python/egglog/visualizer.css: visualizer.tgz
2222

2323
clean:
2424
rm -rf package python/egglog/visualizer.css python/egglog/visualizer.js visualizer.tgz
25+
26+
from-local:
27+
cp ../egraph-visualizer/dist/index.js python/egglog/visualizer.js
28+
cp ../egraph-visualizer/dist/style.css python/egglog/visualizer.css

docs/how-to-guides.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ file_format: mystnb
66

77
## Parsing and running program strings
88

9-
You can provide your program in a special DSL language. You can parse this with {meth}`egglog.bindings.EGraph.parse_program` and then run the result with You can parse this with {meth}`egglog.bindings.EGraph.run_program`::
9+
You can provide your program in a special DSL language. You can parse this with {meth}`egglog.bindings.parse_program` and then run the result with You can parse this with {meth}`egglog.bindings.EGraph.run_program`::
1010

1111
```{code-cell}
1212
from egglog.bindings import EGraph
1313
1414
egraph = EGraph()
15-
commands = egraph.parse_program("(check (= (+ 1 2) 3))")
15+
commands = parse_program("(check (= (+ 1 2) 3))")
1616
commands
1717
```
1818

docs/reference/bindings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ eqsat_basic = """(datatype Math
3636
(check (= expr1 expr2))"""
3737
3838
egraph = EGraph()
39-
commands = egraph.parse_program(eqsat_basic)
39+
commands = parse_program(eqsat_basic)
4040
egraph.run_program(*commands)
4141
```
4242

docs/reference/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Then install the package in editable mode with the development dependencies:
3535
maturin develop -E dev,docs,test,array
3636
```
3737

38-
Anytime you change the rust code, you can run `maturin develop -E` to recompile the rust code.
38+
Anytime you change the rust code, you can run `maturin develop` to recompile the rust code.
3939

4040
If you would like to download a new version of the visualizer source, run `make clean; make`. This will download
4141
the most recent released version from the github actions artifact in the [egraph-visualizer](https://github.com/egraphs-good/egraph-visualizer) repo. It is checked in because it's a pain to get cargo to include only one git ignored file while ignoring the rest of the files that were ignored.

0 commit comments

Comments
 (0)