Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f3d2e3007 | ||
|
|
34c9453d0d | ||
|
|
df3e77868a | ||
|
|
f745d05edd | ||
|
|
c93909460d | ||
|
|
849fc51169 | ||
|
|
7ad90ebb67 |
4 changed files with 24 additions and 23 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -3,3 +3,4 @@
|
|||
/release_v2.14.tar.gz
|
||||
/release_v2.19.tar.gz
|
||||
/release_v2.20.tar.gz
|
||||
/release_v2.22.tar.gz
|
||||
|
|
|
|||
|
|
@ -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__],
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Name: python-pycparser
|
||||
Summary: C parser and AST generator written in Python
|
||||
Version: 2.20
|
||||
Version: 2.22
|
||||
Release: %autorelease
|
||||
License: BSD-3-Clause
|
||||
URL: http://github.com/eliben/pycparser
|
||||
|
|
@ -19,12 +19,11 @@ Patch100: pycparser-unbundle-ply.patch
|
|||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-ply
|
||||
|
||||
# for unit tests
|
||||
%if %{with tests}
|
||||
BuildRequires: cpp
|
||||
BuildRequires: gcc
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
|
@ -34,7 +33,6 @@ need to parse C source code.
|
|||
|
||||
%package -n python3-pycparser
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python3-pycparser}
|
||||
|
||||
%description -n python3-pycparser
|
||||
pycparser is a complete parser for the C language, written in pure Python.
|
||||
|
|
@ -50,25 +48,27 @@ rm -r pycparser/ply
|
|||
# Remove relative sys.path from the examples
|
||||
%{python3} %{SOURCE1} examples
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
pushd build/lib/pycparser
|
||||
pushd pycparser
|
||||
%{python3} _build_tables.py
|
||||
popd
|
||||
%pyproject_wheel
|
||||
|
||||
%install
|
||||
%py3_install
|
||||
%pyproject_install
|
||||
%pyproject_save_files -l pycparser
|
||||
|
||||
%check
|
||||
%pyproject_check_import
|
||||
%if %{with tests}
|
||||
%{python3} tests/all_tests.py
|
||||
%py3_test_envvars %{python3} -m unittest discover
|
||||
%endif
|
||||
|
||||
%files -n python3-pycparser
|
||||
%license LICENSE
|
||||
%files -n python3-pycparser -f %{pyproject_files}
|
||||
%doc examples
|
||||
%{python3_sitelib}/pycparser/
|
||||
%{python3_sitelib}/pycparser-*.egg-info/
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (release_v2.20.tar.gz) = d2dc48727750ec0a80d5e3b0c9fba390c3647416a3e18cad59429edb9f55d043c7695c52301b037c93af5d96ffc85fcba7cd54d376abdb89e973759c59fa189d
|
||||
SHA512 (release_v2.22.tar.gz) = 1c5be2b83c0a892cafa55a2595942d7048994772dc0fc71d2943004b4198d939c0bf2a164d763d94fe11d532e49371c59c1cf4037c32dab8d3cf0c553a8de64a
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue