egglog 6.1.0__tar.gz → 7.0.0__tar.gz

{egglog-6.1.0 → egglog-7.0.0}/.github/workflows/CI.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - main
-      - master
-    tags:
-      - "*"
   pull_request:
   workflow_dispatch:
 
@@ -81,68 +78,3 @@ jobs:
           sudo apt-get install -y graphviz
       - run: pip install -e .[docs] pre-commit
       - run: pre-commit run --hook-stage manual docs
-  linux:
-    name: build linux
-    runs-on: ubuntu-latest
-    needs: [test]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: PyO3/maturin-action@v1.40.1
-        with:
-          manylinux: auto
-          command: build
-          args: --release --sdist -o dist --find-interpreter
-      - name: Upload wheels
-        uses: actions/upload-artifact@v2
-        with:
-          name: wheels
-          path: dist
-
-  windows:
-    name: build windows
-    runs-on: windows-latest
-    needs: [test]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: PyO3/maturin-action@v1.40.1
-        with:
-          command: build
-          args: --release -o dist --find-interpreter
-      - name: Upload wheels
-        uses: actions/upload-artifact@v2
-        with:
-          name: wheels
-          path: dist
-
-  macos:
-    name: build macos
-    runs-on: macos-latest
-    needs: [test]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: PyO3/maturin-action@v1.40.1
-        with:
-          command: build
-          args: --release -o dist --universal2 --find-interpreter
-      - name: Upload wheels
-        uses: actions/upload-artifact@v2
-        with:
-          name: wheels
-          path: dist
-
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch')
-    needs: [macos, windows, linux]
-    steps:
-      - uses: actions/download-artifact@v2
-        with:
-          name: wheels
-      - name: Publish to PyPI
-        uses: PyO3/maturin-action@v1.40.1
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-        with:
-          command: upload
-          args: --skip-existing *

egglog-7.0.0/.github/workflows/version.yml

@@ -0,0 +1,133 @@
+# Creates a new version by:
+# 1. bumping the version number in the changelog and cargo
+# 2. Creates a new branch for this version
+# 3. makes a new commit
+# 4. Opens a PR for the new version
+# 5. Pulls that branch and builds it for different platforms
+# 6. Once all those build, makes a release
+# 7. Creates a tag for that release
+# 7. merges that PR when tests pass and removes the branch
+
+# 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:
+  workflow_dispatch:
+    inputs:
+      type:
+        description: "Release type"
+        required: true
+        default: "major"
+        type: choice
+        options:
+          - major
+          - minor
+          - patch
+
+jobs:
+  bump:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    outputs:
+      version: ${{ steps.bump.outputs.version }}
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          git config user.name github-actions[bot]
+          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+          VERSION=$(python increment_version.py $TYPE)
+          git checkout -b "version-$VERSION"
+          git commit -am "Version $VERSION"
+          git push -u origin HEAD
+          gh pr create --fill
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+        id: bump
+        env:
+          TYPE: ${{ inputs.type }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  linux:
+    name: build linux
+    runs-on: ubuntu-latest
+    needs: [bump]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: version-${{ needs.bump.outputs.version }}
+      - uses: PyO3/maturin-action@v1.40.1
+        with:
+          manylinux: auto
+          command: build
+          args: --release --sdist -o dist --find-interpreter
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  windows:
+    name: build windows
+    runs-on: windows-latest
+    needs: [bump]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: version-${{ needs.bump.outputs.version }}
+      - uses: PyO3/maturin-action@v1.40.1
+        with:
+          command: build
+          args: --release -o dist --find-interpreter
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  macos:
+    name: build macos
+    runs-on: macos-latest
+    needs: [bump]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: version-${{ needs.bump.outputs.version }}
+      - uses: PyO3/maturin-action@v1.40.1
+        with:
+          command: build
+          args: --release -o dist --universal2 --find-interpreter
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch')
+    needs: [macos, windows, linux]
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: wheels
+      - name: Publish to PyPI
+        uses: PyO3/maturin-action@v1.40.1
+        env:
+          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+        with:
+          command: upload
+          args: --skip-existing *
+  tag-and-merge:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    needs: [release, bump]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: version-${{ needs.bump.outputs.version }}
+      - run: |
+          git tag "v$VERSION"
+          git push --tags
+          gh pr merge --admin --delete-branch
+        env:
+          VERSION: ${{ needs.bump.outputs.version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{egglog-6.1.0 → egglog-7.0.0}/.pre-commit-config.yaml

@@ -5,7 +5,7 @@ ci:
   skip: [mypy, docs, stubtest]
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.1
+    rev: v0.4.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

egglog-7.0.0/CITATION.cff

@@ -0,0 +1,35 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: 'Egglog Python: A Pythonic Library for E-graphs'
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Saul
+    family-names: Shanabrook
+    email: s.shanabrook@gmail.com
+    orcid: 'https://orcid.org/0000-0002-0258-4236'
+identifiers:
+  - type: other
+    value: 'arXiv:2305.04311'
+repository-code: 'https://github.com/egraphs-good/egglog-python'
+url: 'https://egglog-python.readthedocs.io/'
+abstract: >-
+  E-graphs have emerged as a versatile data structure with
+  applications in synthesis, optimization, and verification
+  through techniques such as equality saturation. This paper
+  introduces Python bindings for the experimental egglog
+  library (previously called egg-smol), which aims to bring
+  the benefits of e-graphs to the Python ecosystem. The
+  bindings offer a high-level, Pythonic API providing an
+  accessible and familiar interface for Python users. By
+  integrating e-graph techniques with Python, we hope to
+  enable collaboration and innovation across various domains
+  in the scientific computing and machine learning
+  communities. We discuss the advantages of using Python
+  bindings for both Python and existing egg-smol users, as
+  well as possible future directions for development.
+license: MIT

{egglog-6.1.0 → egglog-7.0.0}/Cargo.lock

@@ -312,7 +312,7 @@ dependencies = [
 
 [[package]]
 name = "egglog-python"
-version = "6.1.0"
+version = "7.0.0"
 dependencies = [
  "egglog",
  "egraph-serialize",
@@ -798,6 +798,12 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -821,15 +827,16 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0"
+checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
 dependencies = [
  "cfg-if",
  "indoc",
  "libc",
  "memoffset",
  "parking_lot",
+ "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
@@ -838,9 +845,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be"
+checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -848,9 +855,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1"
+checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -858,9 +865,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-log"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd"
+checksum = "2af49834b8d2ecd555177e63b273b708dea75150abc6f5341d0a6e1a9623976c"
 dependencies = [
  "arc-swap",
  "log",
@@ -869,9 +876,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3"
+checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -881,12 +888,13 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f"
+checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
 dependencies = [
  "heck",
  "proc-macro2",
+ "pyo3-build-config",
  "quote",
  "syn 2.0.32",
 ]

{egglog-6.1.0 → egglog-7.0.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "egglog-python"
-version = "6.1.0"
+version = "7.0.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,7 +9,7 @@ name = "egglog_python"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.20.2", features = ["extension-module"] }
+pyo3 = { version = "0.21", features = ["extension-module"] }
 
 # https://github.com/egraphs-good/egglog/compare/ceed816e9369570ffed9feeba157b19471dda70d...main
 egglog = { git = "https://github.com/egraphs-good/egglog", rev = "0113af1d6476b75d4319591cc3d675f96a71cdc5" }
@@ -17,7 +17,7 @@ egglog = { git = "https://github.com/egraphs-good/egglog", rev = "0113af1d6476b7
 # egglog = { git = "https://github.com/saulshanabrook/egg-smol", rev = "38b3014b34399cc78887ede09c845b2a5d6c7d19" }
 egraph-serialize = { git = "https://github.com/egraphs-good/egraph-serialize", rev = "5838c036623e91540831745b1574539e01c8cb23" }
 serde_json = "*"
-pyo3-log = "0.9.0"
+pyo3-log = "0.10.0"
 log = "0.4.20"
 lalrpop-util = { version = "0.20.0", features = ["lexer"] }
 ordered-float = "*"

{egglog-6.1.0 → egglog-7.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: egglog
-Version: 6.1.0
+Version: 7.0.0
 Classifier: Environment :: MacOS X
 Classifier: Environment :: Win32 (MS Windows)
 Classifier: Intended Audience :: Developers
@@ -19,22 +19,6 @@ Classifier: Typing :: Typed
 Requires-Dist: typing-extensions
 Requires-Dist: black
 Requires-Dist: graphviz
-Requires-Dist: pre-commit; extra == 'dev'
-Requires-Dist: ruff; extra == 'dev'
-Requires-Dist: mypy; extra == 'dev'
-Requires-Dist: anywidget[dev]; extra == 'dev'
-Requires-Dist: egglog[docs,test]; extra == 'dev'
-Requires-Dist: pytest; extra == 'test'
-Requires-Dist: mypy; extra == 'test'
-Requires-Dist: syrupy; extra == 'test'
-Requires-Dist: egglog[array]; extra == 'test'
-Requires-Dist: pytest-codspeed; extra == 'test'
-Requires-Dist: pytest-benchmark; extra == 'test'
-Requires-Dist: pytest-xdist; extra == 'test'
-Requires-Dist: scikit-learn; extra == 'array'
-Requires-Dist: array_api_compat; extra == 'array'
-Requires-Dist: numba==0.59.0rc1; extra == 'array'
-Requires-Dist: llvmlite==0.42.0rc1; extra == 'array'
 Requires-Dist: pydata-sphinx-theme; extra == 'docs'
 Requires-Dist: myst-nb; extra == 'docs'
 Requires-Dist: sphinx-autodoc-typehints; extra == 'docs'
@@ -47,10 +31,26 @@ Requires-Dist: egglog[array]; extra == 'docs'
 Requires-Dist: line-profiler; extra == 'docs'
 Requires-Dist: sphinxcontrib-mermaid; extra == 'docs'
 Requires-Dist: ablog; extra == 'docs'
+Requires-Dist: pre-commit; extra == 'dev'
+Requires-Dist: ruff; extra == 'dev'
+Requires-Dist: mypy; extra == 'dev'
+Requires-Dist: anywidget[dev]; extra == 'dev'
+Requires-Dist: egglog[docs,test]; extra == 'dev'
+Requires-Dist: scikit-learn; extra == 'array'
+Requires-Dist: array_api_compat; extra == 'array'
+Requires-Dist: numba==0.59.0rc1; extra == 'array'
+Requires-Dist: llvmlite==0.42.0rc1; extra == 'array'
+Requires-Dist: pytest; extra == 'test'
+Requires-Dist: mypy; extra == 'test'
+Requires-Dist: syrupy; extra == 'test'
+Requires-Dist: egglog[array]; extra == 'test'
+Requires-Dist: pytest-codspeed; extra == 'test'
+Requires-Dist: pytest-benchmark; extra == 'test'
+Requires-Dist: pytest-xdist; extra == 'test'
+Provides-Extra: docs
 Provides-Extra: dev
-Provides-Extra: test
 Provides-Extra: array
-Provides-Extra: docs
+Provides-Extra: test
 License-File: LICENSE
 Summary: e-graphs in Python built around the the egglog rust library
 License: MIT

{egglog-6.1.0 → egglog-7.0.0}/docs/changelog.md

@@ -4,6 +4,14 @@ _This project uses semantic versioning_
 
 ## UNRELEASED
 
+## 7.0.0 (2024-04-27)
+
+- Defers adding rules in functions until they are used, so that you can use types that are not present yet.
+- Removes ability to set custom default ruleset for egraph. Either just use the empty default ruleset or explicitly set it for every run
+- Automatically mark Python builtin operators as preserved if they must return a real Python value
+- Properly pretty print all items (rewrites, actions, exprs, etc) so that expressions are de-duplicated and state is handled correctly.
+- Add automatic releases from github manual action
+
 ## 6.1.0 (2024-03-06)
 
 - Upgrade [egglog](https://github.com/egraphs-good/egglog/compare/4cc011f6b48029dd72104a38a2ca0c7657846e0b...0113af1d6476b75d4319591cc3d675f96a71cdc5)