Update to 2.22

- Fixes: rhbz#2020936

Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
This commit is contained in:
Matthieu Saulnier 2025-01-10 20:59:54 +01:00 committed by Miro Hrončok
commit c93909460d
4 changed files with 15 additions and 14 deletions

View file

@ -1,10 +1,10 @@
diff --git a/pycparser/c_lexer.py b/pycparser/c_lexer.py
index 045d24e..9b3cbf2 100644
index 22c64bc..a97c5d1 100644
--- a/pycparser/c_lexer.py
+++ b/pycparser/c_lexer.py
@@ -9,8 +9,8 @@
@@ -8,8 +8,8 @@
#------------------------------------------------------------------------------
import re
import sys
-from .ply import lex
-from .ply.lex import TOKEN
@ -14,20 +14,20 @@ index 045d24e..9b3cbf2 100644
class CLexer(object):
diff --git a/pycparser/c_parser.py b/pycparser/c_parser.py
index 744ede8..50156a3 100644
index d31574a..5fc3544 100644
--- a/pycparser/c_parser.py
+++ b/pycparser/c_parser.py
@@ -8,7 +8,7 @@
@@ -6,7 +6,7 @@
# Eli Bendersky [https://eli.thegreenplace.net/]
# License: BSD
#------------------------------------------------------------------------------
import re
-from .ply import yacc
+from ply import yacc
from . import c_ast
from .c_lexer import CLexer
diff --git a/setup.py b/setup.py
index 6dce89c..b3dbfb4 100644
index f7e89bf..f78f559 100644
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,8 @@ except ImportError:
@ -40,9 +40,9 @@ index 6dce89c..b3dbfb4 100644
def _run_build_tables(dir):
from subprocess import check_call
@@ -60,7 +62,8 @@ setup(
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.12',
],
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
python_requires=">=3.8",
- packages=['pycparser', 'pycparser.ply'],
+ packages=['pycparser'],
+ install_requires=['ply==' + ply.__version__],