From f259672f0995b56226b0b29317681a8aefe5eb85 Mon Sep 17 00:00:00 2001 From: Erez Shinan Date: Thu, 20 Jul 2023 21:28:12 +0200 Subject: [PATCH 1/3] Attempt to fix issue caused by lark 1.1.6 (issue #23) --- lark_cython/lark_cython.pyx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lark_cython/lark_cython.pyx b/lark_cython/lark_cython.pyx index 6b977b6..1173cae 100644 --- a/lark_cython/lark_cython.pyx +++ b/lark_cython/lark_cython.pyx @@ -567,8 +567,8 @@ cdef class _Parser: class LALR_Parser(Serialize): - def __init__(self, parser_conf, debug=False): - analysis = LALR_Analyzer(parser_conf, debug=debug) + def __init__(self, parser_conf, debug=False, strict=False): + analysis = LALR_Analyzer(parser_conf, debug=debug, strict=strict) analysis.compute_lalr() callbacks = parser_conf.callbacks From 6475a363f595dd6336a8d1c1cce2d5b9e3a030b1 Mon Sep 17 00:00:00 2001 From: Erez Shinan Date: Thu, 20 Jul 2023 22:22:12 +0200 Subject: [PATCH 2/3] Attempt to fix build error caused by pypy39 --- pyproject.toml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c8ba815..ae03638 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools", "wheel", "Cython>=0.29.1"] +requires = ["setuptools", "wheel", "Cython<0.29.35"] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index 93f8f5e..7c53c01 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ def parse_description(): ext_modules = cythonize('lark_cython/*.pyx'), # accepts a glob pattern requires = ['Cython'], - install_requires = ['lark>=1.1.4', 'cython>=0.29.0', 'Cython>=0.29.0'], + install_requires = ['lark>=1.1.7', 'cython<0.29.35', 'Cython<0.29.35'], setup_requires=['Cython'], author = "Erez Shinan", From 9bcf0ac4341db12ac376026ff4c10ae2f5c734fb Mon Sep 17 00:00:00 2001 From: Erez Shinan Date: Thu, 20 Jul 2023 23:08:29 +0200 Subject: [PATCH 3/3] Requirements use version range for Cython --- pyproject.toml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ae03638..288d265 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools", "wheel", "Cython<0.29.35"] +requires = ["setuptools", "wheel", "Cython>=0.29.1,<0.29.35"] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index 7c53c01..612eb64 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ def parse_description(): ext_modules = cythonize('lark_cython/*.pyx'), # accepts a glob pattern requires = ['Cython'], - install_requires = ['lark>=1.1.7', 'cython<0.29.35', 'Cython<0.29.35'], + install_requires = ['lark>=1.1.7', 'cython>=0.29.1,<0.29.35', 'Cython>=0.29.1,<0.29.35'], setup_requires=['Cython'], author = "Erez Shinan",