From e8a15dfc5094ed0d31c1b97ff80b56dce6c2b210 Mon Sep 17 00:00:00 2001 From: Leni Aniva Date: Fri, 10 Jan 2025 12:53:33 -0800 Subject: [PATCH 1/3] chore: Update upstream to candidate --- src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src b/src index 3744cfa..a374af3 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit 3744cfaa9608cd43e00078283339662b3720949b +Subproject commit a374af3a5fa0a47936e904c2cffd9b2cbafc0e05 From 035dd492d1bdd61f1da1bf3a788eaf9a358f054f Mon Sep 17 00:00:00 2001 From: Leni Aniva Date: Fri, 10 Jan 2025 17:07:35 -0800 Subject: [PATCH 2/3] fix: Missing flags --- pantograph/server.py | 3 ++ poetry.lock | 72 +++----------------------------------------- pyproject.toml | 4 +-- 3 files changed, 10 insertions(+), 69 deletions(-) diff --git a/pantograph/server.py b/pantograph/server.py index 645897e..032471e 100644 --- a/pantograph/server.py +++ b/pantograph/server.py @@ -261,6 +261,7 @@ class Server: 'invocations': False, "sorrys": True, "newConstants": False, + "typeErrorsAsGoals": False, }) if "error" in result: raise ServerError(result["desc"]) @@ -277,6 +278,7 @@ class Server: "type": t, "value": v, "isTheorem": is_theorem, + "typeErrorsAsGoals": False, }) if "error" in result: raise ServerError(result["desc"]) @@ -289,6 +291,7 @@ class Server: "name": name, "value": print_value, "dependency": print_dependency, + "source": True, }) if "error" in result: raise ServerError(result["desc"]) diff --git a/poetry.lock b/poetry.lock index 2a7ad49..0c0b1ee 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. [[package]] name = "accessible-pygments" @@ -52,10 +52,8 @@ files = [ ] [package.dependencies] -exceptiongroup = {version = ">=1.0.2", markers = "python_version < \"3.11\""} idna = ">=2.8" sniffio = ">=1.1" -typing-extensions = {version = ">=4.1", markers = "python_version < \"3.11\""} [package.extras] doc = ["Sphinx (>=7.4,<8.0)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] @@ -178,9 +176,6 @@ files = [ {file = "async_lru-2.0.4-py3-none-any.whl", hash = "sha256:ff02944ce3c288c5be660c42dbcca0742b32c3b279d6dceda655190240b99224"}, ] -[package.dependencies] -typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.11\""} - [[package]] name = "attrs" version = "24.2.0" @@ -672,20 +667,6 @@ files = [ {file = "docutils-0.20.1.tar.gz", hash = "sha256:f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b"}, ] -[[package]] -name = "exceptiongroup" -version = "1.2.2" -description = "Backport of PEP 654 (exception groups)" -optional = false -python-versions = ">=3.7" -files = [ - {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"}, - {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"}, -] - -[package.extras] -test = ["pytest (>=6)"] - [[package]] name = "executing" version = "2.1.0" @@ -1121,7 +1102,6 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "sys_platform == \"win32\""} decorator = "*" -exceptiongroup = {version = "*", markers = "python_version < \"3.11\""} jedi = ">=0.16" matplotlib-inline = "*" pexpect = {version = ">4.3", markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""} @@ -1129,7 +1109,6 @@ prompt-toolkit = ">=3.0.41,<3.1.0" pygments = ">=2.4.0" stack-data = "*" traitlets = ">=5.13.0" -typing-extensions = {version = ">=4.6", markers = "python_version < \"3.12\""} [package.extras] all = ["ipython[black,doc,kernel,matplotlib,nbconvert,nbformat,notebook,parallel,qtconsole]", "ipython[test,test-extra]"] @@ -1553,7 +1532,6 @@ jupyterlab-server = ">=2.27.1,<3" notebook-shim = ">=0.2" packaging = "*" setuptools = ">=40.1.0" -tomli = {version = ">=1.2.2", markers = "python_version < \"3.11\""} tornado = ">=6.2.0" traitlets = "*" @@ -2470,11 +2448,7 @@ files = [ ] [package.dependencies] -numpy = [ - {version = ">=1.22.4", markers = "python_version < \"3.11\""}, - {version = ">=1.23.2", markers = "python_version == \"3.11\""}, - {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, -] +numpy = {version = ">=1.26.0", markers = "python_version >= \"3.12\""} python-dateutil = ">=2.8.2" pytz = ">=2020.1" tzdata = ">=2022.7" @@ -2819,8 +2793,8 @@ files = [ annotated-types = ">=0.6.0" pydantic-core = "2.23.4" typing-extensions = [ - {version = ">=4.6.1", markers = "python_version < \"3.13\""}, {version = ">=4.12.2", markers = "python_version >= \"3.13\""}, + {version = ">=4.6.1", markers = "python_version < \"3.13\""}, ] [package.extras] @@ -3835,7 +3809,6 @@ sphinxcontrib-htmlhelp = ">=2.0.0" sphinxcontrib-jsmath = "*" sphinxcontrib-qthelp = "*" sphinxcontrib-serializinghtml = ">=1.1.9" -tomli = {version = ">=2", markers = "python_version < \"3.11\""} [package.extras] docs = ["sphinxcontrib-websupport"] @@ -4404,17 +4377,6 @@ webencodings = ">=0.4" doc = ["sphinx", "sphinx_rtd_theme"] test = ["pytest", "ruff"] -[[package]] -name = "tomli" -version = "2.0.2" -description = "A lil' TOML parser" -optional = false -python-versions = ">=3.8" -files = [ - {file = "tomli-2.0.2-py3-none-any.whl", hash = "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38"}, - {file = "tomli-2.0.2.tar.gz", hash = "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"}, -] - [[package]] name = "torch" version = "2.2.1" @@ -4466,7 +4428,6 @@ nvidia-cusparse-cu12 = {version = "12.1.0.106", markers = "platform_system == \" nvidia-nccl-cu12 = {version = "2.19.3", markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""} nvidia-nvtx-cu12 = {version = "12.1.105", markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""} sympy = "*" -triton = {version = "2.2.0", markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and python_version < \"3.12\""} typing-extensions = ">=4.8.0" [package.extras] @@ -4528,29 +4489,6 @@ files = [ docs = ["myst-parser", "pydata-sphinx-theme", "sphinx"] test = ["argcomplete (>=3.0.3)", "mypy (>=1.7.0)", "pre-commit", "pytest (>=7.0,<8.2)", "pytest-mock", "pytest-mypy-testing"] -[[package]] -name = "triton" -version = "2.2.0" -description = "A language and compiler for custom Deep Learning operations" -optional = false -python-versions = "*" -files = [ - {file = "triton-2.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a2294514340cfe4e8f4f9e5c66c702744c4a117d25e618bd08469d0bfed1e2e5"}, - {file = "triton-2.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da58a152bddb62cafa9a857dd2bc1f886dbf9f9c90a2b5da82157cd2b34392b0"}, - {file = "triton-2.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0af58716e721460a61886668b205963dc4d1e4ac20508cc3f623aef0d70283d5"}, - {file = "triton-2.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8fe46d3ab94a8103e291bd44c741cc294b91d1d81c1a2888254cbf7ff846dab"}, - {file = "triton-2.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8ce26093e539d727e7cf6f6f0d932b1ab0574dc02567e684377630d86723ace"}, - {file = "triton-2.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:227cc6f357c5efcb357f3867ac2a8e7ecea2298cd4606a8ba1e931d1d5a947df"}, -] - -[package.dependencies] -filelock = "*" - -[package.extras] -build = ["cmake (>=3.20)", "lit"] -tests = ["autopep8", "flake8", "isort", "numpy", "pytest", "scipy (>=1.7.1)", "torch"] -tutorials = ["matplotlib", "pandas", "tabulate", "torch"] - [[package]] name = "types-python-dateutil" version = "2.9.0.20241003" @@ -4759,5 +4697,5 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" -python-versions = "^3.10" -content-hash = "12935bf20e5ac4351734a47b1a71486daccbc0eed1239abe67858b3b17df8b37" +python-versions = "~=3.12" +content-hash = "79d6390c4f00a683f9ef9daf1cd2695956179b8da8ee778b33469da1e96359b6" diff --git a/pyproject.toml b/pyproject.toml index 7f2e9c8..234f12f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pantograph" -version = "0.2.23" +version = "0.2.24" description = "A machine-to-machine interaction system for Lean" authors = ["Leni Aniva "] license = "GPL-3" @@ -13,7 +13,7 @@ include = [ [tool.poetry.dependencies] pexpect = "^4.9.0" -python = "^3.10" +python = "~=3.12" [tool.poetry.build] generate-setup-file = false From 39aff1da2295ce75065d46b4cc74fa84561cc8f3 Mon Sep 17 00:00:00 2001 From: Leni Aniva Date: Fri, 10 Jan 2025 17:09:47 -0800 Subject: [PATCH 3/3] chore: Update version flag --- pantograph/server.py | 2 +- src | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pantograph/server.py b/pantograph/server.py index 032471e..867b3c9 100644 --- a/pantograph/server.py +++ b/pantograph/server.py @@ -344,7 +344,7 @@ def get_version(): class TestServer(unittest.TestCase): def test_version(self): - self.assertEqual(get_version(), "0.2.23") + self.assertEqual(get_version(), "0.2.24") def test_expr_type(self): server = Server() diff --git a/src b/src index a374af3..ef4e5ec 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit a374af3a5fa0a47936e904c2cffd9b2cbafc0e05 +Subproject commit ef4e5ecbf8057c6baf542391d4c40ec068810aa4