From a04250eac0033e0ced36206503978379ca04d339 Mon Sep 17 00:00:00 2001 From: Tan Le Date: Thu, 25 Jan 2024 02:35:40 +1100 Subject: [PATCH] Bump existing grammar versions (#39) * Deprecate Python 3.6 and 3.7 builds Both versions are already EOF. * Bump build dependencies * Bump grammar versions * Fall back to earlier PHP version PHP grammar has been split since https://github.com/tree-sitter/tree-sitter-php/pull/192 and 'vendor/tree-sitter-php/src/parser.c' no longer exists. * Move erlang grammar to a maintained fork * Increase build verbosity for easier debugging * Exclude some grammars from upgrade One the grammar is causing segmentation fault in the build. * Update grammar references on README * Add back support for Python 3.7 --- .github/workflows/release.yml | 7 ++-- README.rst | 5 +-- repos.txt | 62 +++++++++++++++++------------------ 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1813cfa..9691940 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,17 +29,18 @@ jobs: platforms: all - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.16.1 + run: python -m pip install cibuildwheel==2.16.2 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse env: - CIBW_BEFORE_BUILD: pip install cython==3.0.2 && pip install -e . && python build.py + CIBW_BEFORE_BUILD: pip install cython==3.0.8 && pip install -e . && python build.py CIBW_TEST_REQUIRES: pytest CIBW_TEST_COMMAND: pytest --showlocals {package}/tests - CIBW_SKIP: pp* + CIBW_SKIP: "{cp36**,pp*}" CIBW_ARCHS_MACOS: x86_64 arm64 CIBW_ARCHS_LINUX: auto aarch64 + CIBW_BUILD_VERBOSITY: 3 - uses: actions/upload-artifact@v4 with: diff --git a/README.rst b/README.rst index 98014b7..9890010 100644 --- a/README.rst +++ b/README.rst @@ -212,7 +212,7 @@ form: * https://github.com/tree-sitter/tree-sitter — licensed under the MIT License. -* https://github.com/AbstractMachinesLab/tree-sitter-erlang — licensed under +* https://github.com/WhatsApp/tree-sitter-erlang — licensed under the Apache License, Version 2.0. * https://github.com/Azganoth/tree-sitter-lua — licensed under the MIT @@ -342,7 +342,8 @@ form: * https://github.com/stsewd/tree-sitter-rst - licensed under the MIT License. -* https://github.com/mitchellh/tree-sitter-hcl - licensed under the MIT License. +* https://github.com/MichaHoffmann/tree-sitter-hcl - licensed under the + Apache License, Version 2.0. * https://github.com/stadelmanma/tree-sitter-fortran - licensed under the MIT License. diff --git a/repos.txt b/repos.txt index a7b1eac..15568e3 100644 --- a/repos.txt +++ b/repos.txt @@ -1,4 +1,4 @@ -https://github.com/AbstractMachinesLab/tree-sitter-erlang fab680273af1a8f5cc0c3a0c62cbf5b1bea71f39 +https://github.com/WhatsApp/tree-sitter-erlang 54b6f814f43c4eac81eeedefaa7cc8762fec6683 https://github.com/Azganoth/tree-sitter-lua 6b02dfd7f07f36c223270e97eb0adf84e15a4cef https://github.com/Wilfred/tree-sitter-elisp 4b0e4a3891337514126ec72c7af394c0ff2cf48c https://github.com/ZedThree/tree-sitter-fixed-form-fortran 3142d317c73de80882beb95cc431af7eb6c28c51 @@ -6,43 +6,43 @@ https://github.com/alemuller/tree-sitter-make a4b9187417d6be349ee5fd4b6e77b4172c https://github.com/camdencheek/tree-sitter-dockerfile 25c71d6a24cdba8f0c74ef40d4d2d93defd7e196 https://github.com/camdencheek/tree-sitter-go-mod 4a65743dbc2bb3094114dd2b43da03c820aa5234 https://github.com/dhcmrlchtdj/tree-sitter-sqlite 993be0a91c0c90b0cc7799e6ff65922390e2cefe -https://github.com/elixir-lang/tree-sitter-elixir 05e3631c6a0701c1fa518b0fee7be95a2ceef5e2 -https://github.com/elm-tooling/tree-sitter-elm 0aecfbf69f0c9bcdfada0f6f2c5398235c23949f -https://github.com/fwcd/tree-sitter-kotlin a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569 -https://github.com/ganezdragon/tree-sitter-perl ff5c3108083af6fcb7575e32a7558b8165a05bcd +https://github.com/elixir-lang/tree-sitter-elixir 11426c5fd20eef360d5ecaf10729191f6bc5d715 +https://github.com/elm-tooling/tree-sitter-elm c26afd7f2316f689410a1622f1780eff054994b1 +https://github.com/fwcd/tree-sitter-kotlin 0ef87892401bb01c84b40916e1f150197bc134b1 +https://github.com/ganezdragon/tree-sitter-perl 15a6914b9b891974c888ba7bf6c432665b920a3f https://github.com/ikatyang/tree-sitter-markdown 8b8b77af0493e26d378135a3e7f5ae25b555b375 https://github.com/ikatyang/tree-sitter-yaml 0e36bed171768908f331ff7dff9d956bae016efb https://github.com/jiyee/tree-sitter-objc afec0de5a32d5894070b67932d6ff09e4f7c5879 https://github.com/m-novikov/tree-sitter-sql 218b672499729ef71e4d66a949e4a1614488aeaa -https://github.com/mitchellh/tree-sitter-hcl bdc2ee0cbd19d22f8a1529e5c9d099029573c931 -https://github.com/r-lib/tree-sitter-r 205c2877af33a814386ff275031f88400a011397 +https://github.com/MichaHoffmann/tree-sitter-hcl e135399cb31b95fac0760b094556d1d5ce84acf0 +https://github.com/r-lib/tree-sitter-r c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57 https://github.com/rydesun/tree-sitter-dot 917230743aa10f45a408fea2ddb54bbbf5fbe7b7 -https://github.com/slackhq/tree-sitter-hack b7bd6928532ada34dddb1dece4a158ab62c6e783 +https://github.com/slackhq/tree-sitter-hack fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2 https://github.com/stadelmanma/tree-sitter-fortran f73d473e3530862dee7cbb38520f28824e7804f6 https://github.com/stsewd/tree-sitter-rst 25e6328872ac3a764ba8b926aea12719741103f1 https://github.com/theHamsta/tree-sitter-commonlisp c7e814975ab0d0d04333d1f32391c41180c58919 -https://github.com/tree-sitter/tree-sitter-bash 275effdfc0edce774acf7d481f9ea195c6c403cd -https://github.com/tree-sitter/tree-sitter-c 7175a6dd5fc1cee660dce6fe23f6043d75af424a -https://github.com/tree-sitter/tree-sitter-c-sharp 9c494a503c8e2044bfffce57f70b480c01a82f03 -https://github.com/tree-sitter/tree-sitter-cpp f40125503642845492d87fa56ece3ed26a4ef4db -https://github.com/tree-sitter/tree-sitter-css a03f1d2d1dfbf6f8e0fdca5f9ff030228241eb57 -https://github.com/tree-sitter/tree-sitter-embedded-template 1a538da253d73f896b9f6c0c7d79cda58791ac5c -https://github.com/tree-sitter/tree-sitter-go aeb2f33b366fd78d5789ff104956ce23508b85db -https://github.com/tree-sitter/tree-sitter-haskell cf394604ae2ec2a5e65b1afbc7dea21258ede403 -https://github.com/tree-sitter/tree-sitter-html 29f53d8f4f2335e61bf6418ab8958dac3282077a -https://github.com/tree-sitter/tree-sitter-java ac14b4b1884102839455d32543ab6d53ae089ab7 -https://github.com/tree-sitter/tree-sitter-javascript 35565430231d0c15b748b0c9de36b247d8780f75 -https://github.com/tree-sitter/tree-sitter-jsdoc 189a6a4829beb9cdbe837260653b4a3dfb0cc3db -https://github.com/tree-sitter/tree-sitter-json 368736a6137770f785e1e7479a6be29417eb13aa -https://github.com/tree-sitter/tree-sitter-julia fc60b7cce87da7a1b7f8cb0f9371c3dc8b684500 -https://github.com/tree-sitter/tree-sitter-ocaml cc26b1ef111100f26a137bcbcd39fd4e35be9a59 -https://github.com/tree-sitter/tree-sitter-php 670d1eb6822d8c7ade1c71232e0bef42757b9da7 -https://github.com/tree-sitter/tree-sitter-python de221eccf9a221f5b85474a553474a69b4b5784d -https://github.com/tree-sitter/tree-sitter-ql 24c72ad09f05982df4085c481d9b02ba9e79e7fc -https://github.com/tree-sitter/tree-sitter-regex e1cfca3c79896ff79842f057ea13e529b66af636 -https://github.com/tree-sitter/tree-sitter-ruby e75d04404c9dd71ad68850d5c672b226d5e694f3 -https://github.com/tree-sitter/tree-sitter-rust 41e23b454f503e6fe63ec4b6d9f7f2cf7788ab8e -https://github.com/tree-sitter/tree-sitter-scala 140c96cf398693189d4e50f76d19ddfcd8a018f8 +https://github.com/tree-sitter/tree-sitter-bash f7239f638d3dc16762563a9027faeee518ce1bd9 +https://github.com/tree-sitter/tree-sitter-c 34f4c7e751f4d661be3e23682fe2631d6615141d +https://github.com/tree-sitter/tree-sitter-c-sharp dd5e59721a5f8dae34604060833902b882023aaf +https://github.com/tree-sitter/tree-sitter-cpp a71474021410973b29bfe99440d57bcd750246b1 +https://github.com/tree-sitter/tree-sitter-css 98c7b3dceb24f1ee17f1322f3947e55638251c37 +https://github.com/tree-sitter/tree-sitter-embedded-template 203f7bd3c1bbfbd98fc19add4b8fcb213c059205 +https://github.com/tree-sitter/tree-sitter-go ff86c7f1734873c8c4874ca4dd95603695686d7a +https://github.com/tree-sitter/tree-sitter-haskell dd924b8df1eb76261f009e149fc6f3291c5081c2 +https://github.com/tree-sitter/tree-sitter-html 949b78051835564bca937565241e5e337d838502 +https://github.com/tree-sitter/tree-sitter-java 2b57cd9541f9fd3a89207d054ce8fbe72657c444 +https://github.com/tree-sitter/tree-sitter-javascript f1e5a09b8d02f8209a68249c93f0ad647b228e6e +https://github.com/tree-sitter/tree-sitter-jsdoc d01984de49927c979b46ea5c01b78c8ddd79baf9 +https://github.com/tree-sitter/tree-sitter-json 3fef30de8aee74600f25ec2e319b62a1a870d51e +https://github.com/tree-sitter/tree-sitter-julia 0c088d1ad270f02c4e84189247ac7001e86fe342 +https://github.com/tree-sitter/tree-sitter-ocaml 4abfdc1c7af2c6c77a370aee974627be1c285b3b +https://github.com/tree-sitter/tree-sitter-php 33e30169e6f9bb29845c80afaa62a4a87f23f6d6 +https://github.com/tree-sitter/tree-sitter-python 4bfdd9033a2225cc95032ce77066b7aeca9e2efc +https://github.com/tree-sitter/tree-sitter-ql bd087020f0d8c183080ca615d38de0ec827aeeaf +https://github.com/tree-sitter/tree-sitter-regex 2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96 +https://github.com/tree-sitter/tree-sitter-ruby 4d9ad3f010fdc47a8433adcf9ae30c8eb8475ae7 +https://github.com/tree-sitter/tree-sitter-rust e0e8b6de6e4aa354749c794f5f36a906dcccda74 +https://github.com/tree-sitter/tree-sitter-scala 45b5ba0e749a8477a8fd2666f082f352859bdc3c https://github.com/tree-sitter/tree-sitter-toml 342d9be207c2dba869b9967124c679b5e6fd0ebe https://github.com/tree-sitter/tree-sitter-tsq b665659d3238e6036e22ed0e24935e60efb39415 -https://github.com/tree-sitter/tree-sitter-typescript 49e82b1bce36d6046df911901684cd66b5345d58 +https://github.com/tree-sitter/tree-sitter-typescript d847898fec3fe596798c9fda55cb8c05a799001a