Update antlr (#165)

* bump antlr for python 3.13 compat

* ci| add python 3.13

* fix python 3.12 compat for missing pkg_resources

* update generated code from antlr 4.13.2

* remove Python version that is EOL

* update GHA versions

* update pypi deploy test workflow runner

* do not mix user and global pip install

* Apply suggestion from @zachcran

Co-authored-by: Zachery Crandall <zachcran@gmail.com>

* Apply suggestion from @zachcran

Co-authored-by: Zachery Crandall <zachcran@gmail.com>

* Apply suggestion from @zachcran

Co-authored-by: Zachery Crandall <zachcran@gmail.com>

* Use virtual environment to help isolate installations

* Ensure absolute path to venv python binary

---------

Co-authored-by: Zachery Crandall <zachcran@gmail.com>

Author: renefritze

.github/workflows/cmake_install.yaml

@@ -25,16 +25,16 @@ jobs:
 
     strategy:
       matrix:
-        python_version: ['3.8.13', '3.9.13', '3.10.5']
+        python_version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python_version }}
-      - uses: lukka/get-cmake@v3.20.1
+      - uses: lukka/get-cmake@v4.0.3
       - name: Build
         run: |
           python3 --version

.github/workflows/pip_install.yaml

@@ -31,10 +31,10 @@ jobs:
         python_version: ['3.8.13', '3.9.13', '3.10.5', '3.11.2']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python_version }}
       - name: Build

.github/workflows/test_pip_install.yaml

@@ -1,4 +1,4 @@
- # Copyright 2022 CMakePP
+# Copyright 2022 CMakePP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,24 +19,30 @@ on:
   pull_request:
     branches:
       - master
-      
+
 jobs:
   test_release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Get the tags
-        run: git fetch --all --tags
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Create Python virtual environment
+        id: venv
+        run: |
+          python -m venv venv
+          echo "python=$PWD/venv/bin/python3" >> $GITHUB_OUTPUT
       - name: Install Python's "build" package
-        run: python -m pip install build twine --user
+        run: ${{ steps.venv.outputs.python }} -m pip install build twine packaging>=24.2
       - name: Build binary wheel and source tarball
-        run: python -m build --sdist --wheel --outdir dist/
+        run: ${{ steps.venv.outputs.python }} -m build --sdist --wheel --outdir dist/
       - name: Test Long Description
-        run: twine check dist/*
+        run: ${{ steps.venv.outputs.python }} -m twine check dist/*
       - name: Test built package
         run: |
-          pip install pytest
-          pip install --user dist/*.tar.gz
+          ${{ steps.venv.outputs.python }} -m pip install pytest
+          ${{ steps.venv.outputs.python }} -m pip install dist/*.tar.gz
           cd tests
-          python -B test_all.py  
+          ${{ steps.venv.outputs.python }} -B test_all.py

pyproject.toml

@@ -34,7 +34,7 @@ classifiers = ["Development Status :: 5 - Production/Stable",
 ]
 urls = {"GitHub" = "https://github.com/CMakePP/CMinx"}
 scripts = {"cminx" = "cminx:main"}
-dependencies = ["antlr4-python3-runtime==4.7.2",
+dependencies = ["antlr4-python3-runtime==4.13.2",
     "confuse>=1.7",
     "pathspec>=0.9.0"
 ]

src/cminx/__init__.py

@@ -33,15 +33,15 @@
 
 import pathspec
 from confuse import Configuration
-from pkg_resources import get_distribution, DistributionNotFound
+from importlib.metadata import version, PackageNotFoundError
 
 from .config import config_template, dict_to_settings, Settings
 from .documenter import Documenter
 from .rstwriter import RSTWriter
 
 try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
+    __version__ = version(__name__)
+except PackageNotFoundError:
     # package is not installed
     __version__ = "UNKNOWN"
 

src/cminx/parser/CMake.interp

@@ -45,4 +45,4 @@ compound_argument
 
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 17, 60, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 3, 2, 5, 2, 18, 10, 2, 3, 2, 3, 2, 3, 2, 7, 2, 23, 10, 2, 12, 2, 14, 2, 26, 11, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 7, 6, 41, 10, 6, 12, 6, 14, 6, 44, 11, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 7, 8, 53, 10, 8, 12, 8, 14, 8, 56, 11, 8, 3, 8, 3, 8, 3, 8, 2, 2, 9, 2, 4, 6, 8, 10, 12, 14, 2, 3, 4, 2, 9, 10, 12, 13, 2, 60, 2, 17, 3, 2, 2, 2, 4, 29, 3, 2, 2, 2, 6, 32, 3, 2, 2, 2, 8, 34, 3, 2, 2, 2, 10, 36, 3, 2, 2, 2, 12, 47, 3, 2, 2, 2, 14, 49, 3, 2, 2, 2, 16, 18, 5, 6, 4, 2, 17, 16, 3, 2, 2, 2, 17, 18, 3, 2, 2, 2, 18, 24, 3, 2, 2, 2, 19, 23, 5, 4, 3, 2, 20, 23, 5, 10, 6, 2, 21, 23, 5, 8, 5, 2, 22, 19, 3, 2, 2, 2, 22, 20, 3, 2, 2, 2, 22, 21, 3, 2, 2, 2, 23, 26, 3, 2, 2, 2, 24, 22, 3, 2, 2, 2, 24, 25, 3, 2, 2, 2, 25, 27, 3, 2, 2, 2, 26, 24, 3, 2, 2, 2, 27, 28, 7, 2, 2, 3, 28, 3, 3, 2, 2, 2, 29, 30, 5, 8, 5, 2, 30, 31, 5, 10, 6, 2, 31, 5, 3, 2, 2, 2, 32, 33, 7, 5, 2, 2, 33, 7, 3, 2, 2, 2, 34, 35, 7, 6, 2, 2, 35, 9, 3, 2, 2, 2, 36, 37, 7, 9, 2, 2, 37, 42, 7, 3, 2, 2, 38, 41, 5, 12, 7, 2, 39, 41, 5, 14, 8, 2, 40, 38, 3, 2, 2, 2, 40, 39, 3, 2, 2, 2, 41, 44, 3, 2, 2, 2, 42, 40, 3, 2, 2, 2, 42, 43, 3, 2, 2, 2, 43, 45, 3, 2, 2, 2, 44, 42, 3, 2, 2, 2, 45, 46, 7, 4, 2, 2, 46, 11, 3, 2, 2, 2, 47, 48, 9, 2, 2, 2, 48, 13, 3, 2, 2, 2, 49, 54, 7, 3, 2, 2, 50, 53, 5, 12, 7, 2, 51, 53, 5, 14, 8, 2, 52, 50, 3, 2, 2, 2, 52, 51, 3, 2, 2, 2, 53, 56, 3, 2, 2, 2, 54, 52, 3, 2, 2, 2, 54, 55, 3, 2, 2, 2, 55, 57, 3, 2, 2, 2, 56, 54, 3, 2, 2, 2, 57, 58, 7, 4, 2, 2, 58, 15, 3, 2, 2, 2, 9, 17, 22, 24, 40, 42, 52, 54]
+[4, 1, 15, 58, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 1, 0, 3, 0, 16, 8, 0, 1, 0, 1, 0, 1, 0, 5, 0, 21, 8, 0, 10, 0, 12, 0, 24, 9, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 5, 4, 39, 8, 4, 10, 4, 12, 4, 42, 9, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 5, 6, 51, 8, 6, 10, 6, 12, 6, 54, 9, 6, 1, 6, 1, 6, 1, 6, 0, 0, 7, 0, 2, 4, 6, 8, 10, 12, 0, 1, 2, 0, 7, 8, 10, 11, 58, 0, 15, 1, 0, 0, 0, 2, 27, 1, 0, 0, 0, 4, 30, 1, 0, 0, 0, 6, 32, 1, 0, 0, 0, 8, 34, 1, 0, 0, 0, 10, 45, 1, 0, 0, 0, 12, 47, 1, 0, 0, 0, 14, 16, 3, 4, 2, 0, 15, 14, 1, 0, 0, 0, 15, 16, 1, 0, 0, 0, 16, 22, 1, 0, 0, 0, 17, 21, 3, 2, 1, 0, 18, 21, 3, 8, 4, 0, 19, 21, 3, 6, 3, 0, 20, 17, 1, 0, 0, 0, 20, 18, 1, 0, 0, 0, 20, 19, 1, 0, 0, 0, 21, 24, 1, 0, 0, 0, 22, 20, 1, 0, 0, 0, 22, 23, 1, 0, 0, 0, 23, 25, 1, 0, 0, 0, 24, 22, 1, 0, 0, 0, 25, 26, 5, 0, 0, 1, 26, 1, 1, 0, 0, 0, 27, 28, 3, 6, 3, 0, 28, 29, 3, 8, 4, 0, 29, 3, 1, 0, 0, 0, 30, 31, 5, 3, 0, 0, 31, 5, 1, 0, 0, 0, 32, 33, 5, 4, 0, 0, 33, 7, 1, 0, 0, 0, 34, 35, 5, 7, 0, 0, 35, 40, 5, 1, 0, 0, 36, 39, 3, 10, 5, 0, 37, 39, 3, 12, 6, 0, 38, 36, 1, 0, 0, 0, 38, 37, 1, 0, 0, 0, 39, 42, 1, 0, 0, 0, 40, 38, 1, 0, 0, 0, 40, 41, 1, 0, 0, 0, 41, 43, 1, 0, 0, 0, 42, 40, 1, 0, 0, 0, 43, 44, 5, 2, 0, 0, 44, 9, 1, 0, 0, 0, 45, 46, 7, 0, 0, 0, 46, 11, 1, 0, 0, 0, 47, 52, 5, 1, 0, 0, 48, 51, 3, 10, 5, 0, 49, 51, 3, 12, 6, 0, 50, 48, 1, 0, 0, 0, 50, 49, 1, 0, 0, 0, 51, 54, 1, 0, 0, 0, 52, 50, 1, 0, 0, 0, 52, 53, 1, 0, 0, 0, 53, 55, 1, 0, 0, 0, 54, 52, 1, 0, 0, 0, 55, 56, 5, 2, 0, 0, 56, 13, 1, 0, 0, 0, 7, 15, 20, 22, 38, 40, 50, 52]