Test support for macos/arm

.github/workflows/docs-ci.yml

@@ -2,6 +2,7 @@ name: CI Documentation
 
 on: [push, pull_request]
 
+permissions: {}
 jobs:
   build:
     runs-on: ubuntu-24.04
@@ -13,10 +14,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        with:
+          persist-credentials: false
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/pypi-release.yml

@@ -18,15 +18,18 @@ on:
     tags:
       - "v*.*.*"
 
+permissions: {}
 jobs:
   build-pypi-distribs:
     name: Build and publish library to PyPI
     runs-on: ubuntu-24.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        with:
+          persist-credentials: false
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
         with:
           python-version: 3.12
 
@@ -40,27 +43,30 @@ jobs:
         run: python -m twine check dist/*
 
       - name: Upload built archives
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
         with:
           name: pypi_archives
           path: dist/*
 
 
   create-gh-release:
+    permissions:
+      contents: write # to create GitHub release (softprops/action-gh-release)
+
     name: Create GH release
     needs:
       - build-pypi-distribs
     runs-on: ubuntu-24.04
 
     steps:
       - name: Download built archives
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
         with:
           name: pypi_archives
           path: dist
 
       - name: Create GH release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
         with:
           draft: true
           files: dist/*
@@ -77,11 +83,11 @@ jobs:
 
     steps:
       - name: Download built archives
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
         with:
           name: pypi_archives
           path: dist
 
       - name: Publish to PyPI
         if: startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b

.github/workflows/zizmor.yml

@@ -0,0 +1,24 @@
+name: GitHub Actions Security Analysis with zizmor 🌈
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["**"]
+
+permissions: {}
+
+jobs:
+  zizmor:
+    name: Run zizmor 🌈
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write # Required for upload-sarif (used by zizmor-action) to upload SARIF files.
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Run zizmor 🌈
+        uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3

CHANGELOG.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v0.7.2
+------
+
+- Relax version constraints and update dependencies
+
+
 v0.7.1
 ------
 

azure-pipelines.yml

@@ -24,3 +24,13 @@ jobs:
               all: |
                  sudo apt-get install universal-ctags gettext
                  venv/bin/pytest -n 2 -vvs
+
+#    - template: etc/ci/azure-posix.yml
+#      parameters:
+#          job_name: macos15_cpython
+#          image_name: macos-14
+#          python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
+#          test_suites:
+#              all: |
+#                 brew install universal-ctags gettext
+#                 venv/bin/pytest -n 2 -vvs

configure

@@ -128,6 +128,10 @@ install_packages() {
     # be reinstalled a second time and reused from the virtualenv and this
     # speeds up the installation.
     # We always have the PEP517 build dependencies installed already.
+    "$CFG_BIN_DIR/pip" install \
+        --upgrade \
+        --no-build-isolation \
+        maturin
 
     "$CFG_BIN_DIR/pip" install \
         --upgrade \

etc/scripts/utils_requirements.py

@@ -15,7 +15,7 @@
 """
 Utilities to manage requirements files and call pip.
 NOTE: this should use ONLY the standard library and not import anything else
-because this is used for boostrapping with no requirements installed.
+because this is used for bootstrapping with no requirements installed.
 """
 
 
@@ -31,7 +31,7 @@ def load_requirements(requirements_file="requirements.txt", with_unpinned=False)
 
 def get_required_name_versions(requirement_lines, with_unpinned=False):
     """
-    Yield required (name, version) tuples given a`requirement_lines` iterable of
+    Yield required (name, version) tuples given a `requirement_lines` iterable of
     requirement text lines. Only accept requirements pinned to an exact version.
     """
 
@@ -47,7 +47,7 @@ def get_required_name_versions(requirement_lines, with_unpinned=False):
 
 def get_required_name_version(requirement, with_unpinned=False):
     """
-    Return a (name, version) tuple given a`requirement` specifier string.
+    Return a (name, version) tuple given a `requirement` specifier string.
     Requirement version must be pinned. If ``with_unpinned`` is True, unpinned
     requirements are accepted and only the name portion is returned.
 

requirements.txt

@@ -0,0 +1,12 @@
+tree-sitter==0.26.0
+tree-sitter-bash==0.25.1
+tree-sitter-c==0.24.2
+tree-sitter-cpp==0.23.4
+tree-sitter-c-sharp==0.23.5
+tree-sitter-go==0.25.0
+tree-sitter-java==0.23.5
+tree-sitter-javascript==0.25.0
+tree-sitter-objc==3.0.2
+tree-sitter-python==0.25.0
+tree-sitter-rust==0.24.2
+tree-sitter-swift==0.7.3

setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name = source-inspector
 license = Apache-2.0
-version = 0.7.1
+version = 0.7.2
 
 # description must be on ONE line https://github.com/pypa/setuptools/issues/1390
 description = source-inspector
@@ -43,18 +43,18 @@ install_requires =
     plugincode
     commoncode
     typecode
-    tree-sitter==0.23.2
-    tree-sitter-bash==0.21.0
-    tree-sitter-c==0.21.1
-    tree-sitter-cpp==0.22.0
-    tree-sitter-c-sharp==0.23.1
-    tree-sitter-go==0.21.0
-    tree-sitter-java==0.21.0
-    tree-sitter-javascript==0.21.2
-    tree-sitter-objc==3.0.2
-    tree-sitter-python==0.21.0
-    tree-sitter-rust==0.21.2
-    tree-sitter-swift==0.0.1
+    tree-sitter>=0.23.2
+    tree-sitter-bash>=0.21.0
+    tree-sitter-c>=0.21.1
+    tree-sitter-cpp>=0.22.0
+    tree-sitter-c-sharp>=0.23.1
+    tree-sitter-go>=0.21.0
+    tree-sitter-java>=0.21.0
+    tree-sitter-javascript>=0.21.2
+    tree-sitter-objc>=3.0.2
+    tree-sitter-python>=0.21.0
+    tree-sitter-rust>=0.21.2
+    tree-sitter-swift>=0.0.1
     pygments
 
 [options.packages.find]
@@ -82,4 +82,3 @@ dev =
     sphinx-autobuild
     sphinx-rtd-dark-mode>=1.3.0
     sphinx-copybutton
-

tests/data/strings_xgettext/lineedit.c-expected.json

@@ -69,7 +69,7 @@
           "line_numbers": [
             905
           ],
-          "string": "A"
+          "string": "e"
         },
         {
           "line_numbers": [

tests/data/symbols_tree_sitter/c/if_ath.c-expected.json

@@ -1634,6 +1634,7 @@
         "bf",
         "ATH_RXBUF_UNLOCK",
         "sc",
+        "irqreturn_t",
         "LINUX_VERSION_CODE",
         "KERNEL_VERSION",
         "ath_intr",
@@ -10374,13 +10375,6 @@
         "ATH_INTMIT",
         "ATH_MAXVAPS",
         "ATH_SYSCTL_DECL",
-        "ath_sysctl_halparam",
-        "ctl",
-        "write",
-        "filp",
-        "buffer",
-        "lenp",
-        "ppos",
         "sc",
         "ctl",
         "ah",
@@ -10818,10 +10812,12 @@
         "sc",
         "ath_static_sysctls",
         "AR_DEBUG",
+        "ctl_name",
         "CTL_AUTO",
         "ath_debug",
         "ath_debug",
         "proc_dointvec",
+        "ctl_name",
         "CTL_AUTO",
         "ath_countrycode",
         "ath_countrycode",