esp-bool-parser 0.2.0__tar.gz → 0.2.1__tar.gz

{esp_bool_parser-0.2.0 → esp_bool_parser-0.2.1}/.github/workflows/test-esp-bool-parser.yml

@@ -36,16 +36,43 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       FLIT_ROOT_INSTALL: 1
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python-version: '3.7'
+            pyparsing: '==2.4'
+          - python-version: '3.14'
+            pyparsing: '>=3'
+
+    name: Test (Python ${{ matrix.python-version }}, pyparsing ${{ matrix.pyparsing }})
+
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
+
+      - name: Install dependencies
+        run: |
+          pip install flit pyparsing${{ matrix.pyparsing }}
+
+      - name: Install package
+        run: flit install -s
+
       - name: Run tests
         run: |
-          pip install flit
-          flit install -s
-          pytest --cov esp_bool_parser --cov-report term-missing:skip-covered --junit-xml pytest.xml | tee pytest-coverage.txt
+          pip show pyparsing
+          python --version
+
+          pytest \
+            --cov esp_bool_parser \
+            --cov-report term-missing:skip-covered \
+            --junit-xml pytest.xml \
+            | tee pytest-coverage.txt
+
       - name: Pytest coverage comment
         uses: MishaKav/pytest-coverage-comment@main
         with:

{esp_bool_parser-0.2.0 → esp_bool_parser-0.2.1}/CHANGELOG.md

@@ -20,12 +20,22 @@
 </div>
 <hr>
 
+## v0.2.1 (2026-01-15)
+
+### 🔧 Code Refactoring
+
+- Add support for pyparsing 2.x and 3.x *(Igor Udot – 0da115a)*
+
+---
+
 ## v0.2.0 (2026-01-13)
 
 ### 🔧 Code Refactoring
 
 - update deprecated pyparsing functions to snake_case *(Igor Udot - 043674c)*
 
+---
+
 ## v0.1.4 (2025-07-09)
 
 ### 📖 Documentation
@@ -91,6 +101,6 @@
             <a href="https://www.github.com/espressif/cz-plugin-espressif">Commitizen Espressif plugin</a>
         </b>
     <br>
-        <sup><a href="https://www.espressif.com">Espressif Systems CO LTD. (2025)</a><sup>
+        <sup><a href="https://www.espressif.com">Espressif Systems CO LTD. (2026)</a><sup>
     </small>
 </div>

{esp_bool_parser-0.2.0 → esp_bool_parser-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esp-bool-parser
-Version: 0.2.0
+Version: 0.2.1
 Summary: Tools for building ESP-IDF related apps.
 Author-email: Fu Hanxi <fuhanxi@espressif.com>
 Requires-Python: >=3.7
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 License-File: LICENSE
-Requires-Dist: pyparsing>=3.1
+Requires-Dist: pyparsing
 Requires-Dist: packaging
 Requires-Dist: sphinx ; extra == "doc"
 Requires-Dist: sphinx-rtd-theme ; extra == "doc"

{esp_bool_parser-0.2.0 → esp_bool_parser-0.2.1}/esp_bool_parser/__init__.py

@@ -3,7 +3,7 @@
 
 """Tools for building ESP-IDF related apps."""
 
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 import importlib
 

{esp_bool_parser-0.2.0 → esp_bool_parser-0.2.1}/esp_bool_parser/bool_parser.py

@@ -12,7 +12,6 @@ from packaging.version import (
     Version,
 )
 from pyparsing import (
-    DelimitedList,
     Keyword,
     Literal,
     ParseResults,
@@ -21,16 +20,24 @@ from pyparsing import (
     Word,
     alphas,
     hexnums,
-    infix_notation,
     nums,
     opAssoc,
 )
 
 from .utils import (
+    _IS_OLD_PYPARSING,
     InvalidInput,
+    pp_parse_string,
+    pp_set_parse_action,
     to_version,
 )
 
+if _IS_OLD_PYPARSING:
+    from pyparsing import delimitedList as DelimitedList
+    from pyparsing import infixNotation as infix_notation
+else:
+    from pyparsing import DelimitedList, infix_notation
+
 
 class Stmt:
     """Statement"""
@@ -200,29 +207,28 @@ class BoolAnd(BoolExpr):
         return all(stmt.get_value(target, config_name) for stmt in self.bool_stmts)
 
 
-CAP_WORD = Word(alphas.upper(), nums + alphas.upper() + '_').set_parse_action(ChipAttr)
+CAP_WORD = pp_set_parse_action(Word(alphas.upper(), nums + alphas.upper() + '_'))(ChipAttr)
 
 DECIMAL_NUMBER = Word(nums)
 HEX_NUMBER = Literal('0x') + Word(hexnums)
-INTEGER = (HEX_NUMBER | DECIMAL_NUMBER).set_parse_action(Integer)
+INTEGER = pp_set_parse_action(HEX_NUMBER | DECIMAL_NUMBER)(Integer)
 
-STRING = QuotedString('"').set_parse_action(String)
+STRING = pp_set_parse_action(QuotedString('"'))(String)
 
-LIST = Suppress('[') + DelimitedList(INTEGER | STRING).set_parse_action(List_) + Suppress(']')
+LIST = Suppress('[') + pp_set_parse_action(DelimitedList(INTEGER | STRING))(List_) + Suppress(']')
 
 BOOL_OPERAND = CAP_WORD | INTEGER | STRING | LIST
 
-EQ = Keyword('==').set_parse_action(lambda t: t[0])
-NE = Keyword('!=').set_parse_action(lambda t: t[0])
-LE = Keyword('<=').set_parse_action(lambda t: t[0])
-LT = Keyword('<').set_parse_action(lambda t: t[0])
-GE = Keyword('>=').set_parse_action(lambda t: t[0])
-GT = Keyword('>').set_parse_action(lambda t: t[0])
-NOT_IN = Keyword('not in').set_parse_action(lambda t: t[0])
-IN = Keyword('in').set_parse_action(lambda t: t[0])
+EQ = pp_set_parse_action(Keyword('=='))(lambda t: t[0])
+NE = pp_set_parse_action(Keyword('!='))(lambda t: t[0])
+LE = pp_set_parse_action(Keyword('<='))(lambda t: t[0])
+LT = pp_set_parse_action(Keyword('<'))(lambda t: t[0])
+GE = pp_set_parse_action(Keyword('>='))(lambda t: t[0])
+GT = pp_set_parse_action(Keyword('>'))(lambda t: t[0])
+NOT_IN = pp_set_parse_action(Keyword('not in'))(lambda t: t[0])
+IN = pp_set_parse_action(Keyword('in'))(lambda t: t[0])
 
-BOOL_STMT = BOOL_OPERAND + (EQ | NE | LE | LT | GE | GT | NOT_IN | IN) + BOOL_OPERAND
-BOOL_STMT.set_parse_action(BoolStmt)
+BOOL_STMT = pp_set_parse_action(BOOL_OPERAND + (EQ | NE | LE | LT | GE | GT | NOT_IN | IN) + BOOL_OPERAND)(BoolStmt)
 
 AND = Keyword('and')
 OR = Keyword('or')
@@ -267,4 +273,4 @@ def parse_bool_expr(stmt: str) -> BoolStmt:
             print(value)
             # Output: True
     """
-    return BOOL_EXPR.parse_string(stmt)[0]
+    return pp_parse_string(BOOL_EXPR)(stmt)[0]

{esp_bool_parser-0.2.0 → esp_bool_parser-0.2.1}/esp_bool_parser/soc_header.py

@@ -29,6 +29,7 @@ from .constants import (
     ALL_TARGETS,
     IDF_PATH,
 )
+from .utils import pp_parse_string
 
 LOGGER = logging.getLogger(__name__)
 
@@ -65,7 +66,7 @@ def get_defines(header_path: str) -> t.List[str]:
 
 
 def parse_define(define_line: str) -> ParseResults:
-    res = _define_expr.parse_string(define_line)
+    res = pp_parse_string(_define_expr)(define_line)
 
     return res
 

{esp_bool_parser-0.2.0 → esp_bool_parser-0.2.1}/esp_bool_parser/utils.py

@@ -4,6 +4,7 @@
 import importlib
 import typing as t
 
+import pyparsing
 from packaging.version import (
     Version,
 )
@@ -74,3 +75,20 @@ def to_version(s: t.Any) -> Version:
         return Version(str(s))
     except ValueError:
         raise InvalidInput(f'Invalid version: {s}')
+
+
+_IS_OLD_PYPARSING = Version(pyparsing.__version__) < Version('3.0')
+
+
+def pp_set_parse_action(o):
+    if _IS_OLD_PYPARSING:
+        return o.setParseAction
+    else:
+        return o.set_parse_action
+
+
+def pp_parse_string(o):
+    if _IS_OLD_PYPARSING:
+        return o.parseString
+    else:
+        return o.parse_string

{esp_bool_parser-0.2.0 → esp_bool_parser-0.2.1}/pyproject.toml

@@ -25,7 +25,7 @@ dynamic = ["version", "description"]
 requires-python = ">=3.7"
 
 dependencies = [
-    "pyparsing>=3.1",
+    "pyparsing",
     "packaging",
 ]
 
@@ -59,7 +59,7 @@ annotated_tag = true
 changelog_merge_prerelease = true
 tag_format = "v$version"
 update_changelog_on_bump = true
-version = "0.2.0"
+version = "0.2.1"
 version_files = [
     "esp_bool_parser/__init__.py",
 ]