* [gentoo-commits] repo/gentoo:master commit in: dev-python/tree-sitter/files/, dev-python/tree-sitter/
@ 2021-06-04 13:04 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-06-04 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 85c9426652e2495dbb3c6381d994f003aabad059
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 4 13:02:35 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 13:04:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c94266
dev-python/tree-sitter: Unbundle dev-libs/tree-sitter
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../tree-sitter-0.19.0_p20210506-unbundle.patch | 18 ++++++++
.../tree-sitter-0.19.0_p20210506-r1.ebuild | 50 ++++++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.19.0_p20210506-unbundle.patch b/dev-python/tree-sitter/files/tree-sitter-0.19.0_p20210506-unbundle.patch
new file mode 100644
index 00000000000..3eb9d103a0e
--- /dev/null
+++ b/dev-python/tree-sitter/files/tree-sitter-0.19.0_p20210506-unbundle.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 2528827..bb2a817 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,11 +33,11 @@ setup(
+ ext_modules=[
+ Extension(
+ "tree_sitter.binding",
+- ["tree_sitter/core/lib/src/lib.c", "tree_sitter/binding.c"],
+- include_dirs=["tree_sitter/core/lib/include", "tree_sitter/core/lib/src"],
++ ["tree_sitter/binding.c"],
+ extra_compile_args=(
+ ["-std=c99", "-Wno-unused-variable"] if system() != "Windows" else None
+ ),
++ libraries=["tree-sitter"],
+ )
+ ],
+ project_urls={"Source": "https://github.com/tree-sitter/py-tree-sitter"},
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
new file mode 100644
index 00000000000..a3ef55d401f
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+EGIT_COMMIT="b4db17e4d43f27a040b4bf087695cc200512e4ea"
+MY_P=py-tree-sitter-${EGIT_COMMIT}
+FIXTURE_PV=0.19.0
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter/"
+SRC_URI="
+ https://github.com/tree-sitter/py-tree-sitter/archive/${EGIT_COMMIT}.tar.gz
+ -> ${MY_P}.tar.gz
+ test? (
+ https://github.com/tree-sitter/tree-sitter-javascript/archive/v${FIXTURE_PV}.tar.gz
+ -> tree-sitter-javascript-${FIXTURE_PV}.tar.gz
+ https://github.com/tree-sitter/tree-sitter-python/archive/v${FIXTURE_PV}.tar.gz
+ -> tree-sitter-python-${FIXTURE_PV}.tar.gz
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/tree-sitter:="
+DEPEND=${RDEPEND}
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+ "${FILESDIR}"/${P}-unbundle.patch
+)
+
+src_unpack() {
+ default
+ rmdir "${S}/tree_sitter/core" || die
+
+ if use test; then
+ mkdir "${S}/tests/fixtures" || die
+ local f
+ for f in tree-sitter-{javascript,python}; do
+ mv "${f}-${FIXTURE_PV}" "${S}/tests/fixtures/${f}" || die
+ done
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/tree-sitter/files/, dev-python/tree-sitter/
@ 2024-03-23 8:28 Arthur Zamarin
0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2024-03-23 8:28 UTC (permalink / raw
To: gentoo-commits
commit: 2e2111d77d13ee7b85ba55e6a738b2bffaf6b3c2
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 11:13:51 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:27:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e2111d7
dev-python/tree-sitter: add 0.21.0
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-python/tree-sitter/Manifest | 7 ++
.../files/tree-sitter-0.21.0-unbundle.patch | 17 +++++
dev-python/tree-sitter/tree-sitter-0.21.0.ebuild | 75 ++++++++++++++++++++++
3 files changed, 99 insertions(+)
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index d5d65e02b92a..53cafe0a6813 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,10 +1,17 @@
DIST tree-sitter-0.20.1.gh.tar.gz 22013 BLAKE2B 961619ab28b71c4051708695f245246e9c9197987c3ce7f162c87af1cfeb2ae378301cce160c071d4df872124274c7984bcaf938c611a91f45515c44cea53e5a SHA512 d6db28fcfb0ea46840ae863a625ef1d8794015b147137e8ef1e113ea6d04e2b87a3bd44dcabe6e41a65230b8da09ce0563a5d9d5aeac30d279547a9085720da3
DIST tree-sitter-0.20.4.gh.tar.gz 36177 BLAKE2B 617b649c33c73b313034269db7adb7eaf7294195d7c7eaf91182db6844111877fc9745f31185af1c6f2406fad3d0379c4776f76bfb6c43037be918fd34cef12a SHA512 28a2042fa9f7ed43202548b9844126383b36796650e1eb815c138a25538dae12b16512c3cd45f02fa99b32a29c8c7257bb84d901da1e5ebbf6445e3778d7dfa1
+DIST tree-sitter-0.21.0.gh.tar.gz 38263 BLAKE2B 27c1b52c40e94368c66e222fbc1f5e64734d7d9243e0b76d9607edebaee80211f228323db23cd83c6bc338e7d933a28be8eff13f7ee49495c282d8e9afed4bfb SHA512 f62896edebcb305d1216e540d4a10a2622228b12b1f969dd9722e2d56615f05aea4e681b6d933beaeed52ce59d36641c80c9a4a1ac79b038fb2a75e079987231
DIST tree-sitter-embedded-template-0.20.0.tar.gz 11679 BLAKE2B 552c64a499b80f1648cd568fd87d5f2774a28cb3d2a61bfc0ec1f9a73910df41921e06c8f94ac5500a3a5b7668a2b8fe641b2ecf13a9b06b7a119daeef4e3b1a SHA512 1c4a63f85fae1ebb9fa90674a4c27d4402ae0957268faa08dd77c5ec6103720c80befd009d04090a80d994377676b103e2efcc25bd291186efc0c1f4962be086
+DIST tree-sitter-embedded-template-6d791b897ecda59baa0689a85a9906348a2a6414.tar.gz 12420 BLAKE2B 9b9c6dd135cef4490e145657c5eeeb1fd470faee3846007638d8247daf07227029c6e7e323a0ed30c5cf6d35602be6bfb62dc1c22076fd4a0e76b161d55cca38 SHA512 7744852711cb1659607298fa373ce3ef79de3212ff55c0fb4e9aebcb715548934065ee3b5b12e9d08169a6207879e154a94c9de8bff892c32729c35d49964736
DIST tree-sitter-html-0.20.0.tar.gz 26098 BLAKE2B 524aed631fa7a2e6da59fae05af99b74019222d7c93c44f294af5f36c7f2c8582c847324bcef3b6bdc719e5fde1d015bb2633a81d3123eb1120ba0909282af28 SHA512 fa688d8c5487d894ff9bfdd549095cc9bf01dbf667cc3f05c07a1d10343178666802deae79ad1040866ba74d26bf415814bb5324632ce0ea8c1b4c663252e649
+DIST tree-sitter-html-b5d9758e22b4d3d25704b72526670759a9e4d195.tar.gz 26609 BLAKE2B 223fe82ea18bf61b2b7ec664ad68ec1f324c9e0a1c78578db6063b9037c62be2bb762a9e47d0af81f7f244889f1f72683da3751c1d1c609c4a27fdcd0dc008b8 SHA512 15fd961c18d55a20487f48ef6a6f1822f9033baba8995f2e00cf8db1750036d69e19607f578fe90676aab30a173874969c69b91605b6073eb298f32f5f24f81d
DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
DIST tree-sitter-javascript-0.20.1.tar.gz 371027 BLAKE2B 5bd9b11f1e10ff37950b2142031bebd3b5f6111818a21bf5a7d97a8a27a5340bd09cd139d76846141ed64a824f82f1e1394b90d8622192524d7db9a02ed95223 SHA512 5341311b419cf763c0a6d23348eba0e38b417ba07c2def341027223347d850c28b86db6add136dbf73cd5296133823a4548493ee649e09247dfbe5bcbaaab76d
+DIST tree-sitter-javascript-de1e682289a417354df5b4437a3e4f92e0722a0f.tar.gz 396570 BLAKE2B d80cecb070bd1c82737ee1d38fff293ac4c96fde02563ecc910d30c920b902bd5c25a7ac50585f8cb7a26203d98f4a9e6feeebd4ac0d54bede9486ff642e03be SHA512 4a509a886ebeae0d960360113aff89fb56090f1fe4bb5a7866952736a04838a8b6421cc7d19473acc48b135bca4615325c59c0f0f7f3734f23a78fff9cc2050e
DIST tree-sitter-json-0.20.2.tar.gz 15647 BLAKE2B 524933bf7af4df87d78497912c7865c20b2cc3e9b099401aac612c8c6d382fbc8f8704515abcb1e579fbac7734d23545f91ac7600e978a2924567998e5166834 SHA512 511376b7be02c624bc48b0a46dd937f1a5d6def3d2a15a7b61cf71b846ecf98ef8af93f05f861152270ea0dcacc18940f8c25bfbad69e9d5c520485d25dab7f5
+DIST tree-sitter-json-3b129203f4b72d532f58e72c5310c0a7db3b8e6d.tar.gz 15580 BLAKE2B d31b38f959fed785e8f26782e7de3da94502cd3c65de2caf4ad0621287d80e95dcc317b4f224461fa70b59f7a8ca933a235bdffbbcc1d9ca8d7cc0b31b3b2862 SHA512 90dd3e757d384d1b95cec892c5b465a0413ba61df35669fd7afc47037596c8d6b72b4f0fd9a39512ebda0d5d078ce7a408455ae11e535591e1515740cdcf9f6f
DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38ac527b7b9676cafd8f53faaee3d10316f91decd30c02078b1bb785a474615ae58e6edba1b28bc3311e6ff094435e5f53d64cd6 SHA512 df7c72f988a62af0774df1b3a60c86397725aaeb1e2ffaa9b1295ab22eec09bffaf391cad20fb0d08a20914b22af430c2248c26cad179fd68c9f2b32419c0b60
DIST tree-sitter-python-0.20.4.tar.gz 249840 BLAKE2B 563895c46ca1de400d51168473cceaed61b3df486cbf9f33ae9f63acc16268b9147917f0bc0f18d3c8cad0ab0684b4c51900a7e1c6b898735621676353630650 SHA512 2cfd327a1c0033ebb5bc1a4efe4f8b7a776ad45da6b12ad3d496fe3500e2a99ac0ecefbc6eec81d724bcdb060a0ebb8a24496dee23c83c7802e0226f495751d3
+DIST tree-sitter-python-03e88c170cb23142559a406b6e7621c4af3128f5.tar.gz 272632 BLAKE2B 72f2e7f48456bad7b495605171c1c5ed3aa2790e832a4bc152ef522ee2ce210a922f7d38ad1154c58a8c621f81739071ab3404135dbb79a12ba28ca7c97ff3c7 SHA512 7ed72e6ad464935423aaca1a829c51eefd4a4b5651eeda4b7f1ed2a67ec4088f17267796872a1e1cf5666fc8a920c2b1763a9cb4cd82924ee7214e01d7fe8ab8
DIST tree-sitter-rust-0.20.4.tar.gz 358924 BLAKE2B 16c7918d352163ebb866f34865c68f5d9e19bbc3ffcec0f0c61ba38a8c828cee3eb50c97ddaea01d7575e23496bca18dc5161daee8bbdaa075ba75de608be999 SHA512 f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d
+DIST tree-sitter-rust-3a56481f8d13b6874a28752502a58520b9139dc7.tar.gz 419237 BLAKE2B 681b9656c872bcd15abbf11923d07df61b80b36b2972461a29f249dc53915e6d18a6dfdc65d71c863f7b38a27c8b3a47376f590d86afa44caa71f103e710fed5 SHA512 a8ce10080b984aa469d952ff8e862165676e10dc30c3d1762f7141d9fe83734aec3cb92c48552cb8f24575b538dd53fe0a80f1337f5d0d4c8767dd6bf564143e
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.21.0-unbundle.patch b/dev-python/tree-sitter/files/tree-sitter-0.21.0-unbundle.patch
new file mode 100644
index 000000000000..69b50897d3aa
--- /dev/null
+++ b/dev-python/tree-sitter/files/tree-sitter-0.21.0-unbundle.patch
@@ -0,0 +1,17 @@
+--- a/setup.py
++++ b/setup.py
+@@ -14,13 +14,9 @@ setup(
+ Extension(
+ name="tree_sitter._binding",
+ sources=[
+- "tree_sitter/core/lib/src/lib.c",
+ "tree_sitter/binding.c"
+ ],
+- include_dirs=[
+- "tree_sitter/core/lib/include",
+- "tree_sitter/core/lib/src"
+- ],
++ libraries=["tree-sitter"],
+ define_macros=[
+ ("PY_SSIZE_T_CLEAN", None),
+ ],
diff --git a/dev-python/tree-sitter/tree-sitter-0.21.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.21.0.ebuild
new file mode 100644
index 000000000000..a4bc832418e6
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.21.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+# Use the versions from the submodules under "tests/fixtures/"
+declare -A TEST_FIXTURES=(
+ ["embedded-template"]="6d791b897ecda59baa0689a85a9906348a2a6414"
+ ["html"]="b5d9758e22b4d3d25704b72526670759a9e4d195"
+ ["javascript"]="de1e682289a417354df5b4437a3e4f92e0722a0f"
+ ["json"]="3b129203f4b72d532f58e72c5310c0a7db3b8e6d"
+ ["python"]="03e88c170cb23142559a406b6e7621c4af3128f5"
+ ["rust"]="3a56481f8d13b6874a28752502a58520b9139dc7"
+)
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="
+ https://github.com/tree-sitter/py-tree-sitter/
+ https://pypi.org/project/tree-sitter/
+"
+SRC_URI="
+ https://github.com/tree-sitter/py-tree-sitter/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+SRC_URI+=" test? ("
+for fixture in "${!TEST_FIXTURES[@]}" ; do
+ SRC_URI+="
+ https://github.com/tree-sitter/tree-sitter-${fixture}/archive/${TEST_FIXTURES[${fixture}]}.tar.gz
+ -> tree-sitter-${fixture}-${TEST_FIXTURES[${fixture}]}.tar.gz
+ "
+done
+SRC_URI+=" )"
+S=${WORKDIR}/py-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# setuptools is needed for distutils import
+DEPEND=">=dev-libs/tree-sitter-0.22.1"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ' 3.12)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/tree-sitter-0.21.0-unbundle.patch
+)
+
+src_unpack() {
+ default
+ rmdir "${S}/tree_sitter/core" || die
+
+ if use test; then
+ mkdir -p "${S}/tests/fixtures" || die
+ local fixture
+ for fixture in "${!TEST_FIXTURES[@]}" ; do
+ mv -T "tree-sitter-${fixture}-${TEST_FIXTURES[${fixture}]}" "${S}/tests/fixtures/tree-sitter-${fixture}" || die
+ done
+ fi
+}
+
+src_test() {
+ rm -r tree_sitter || die
+ distutils-r1_src_test
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/tree-sitter/files/, dev-python/tree-sitter/
@ 2024-05-17 8:31 Arthur Zamarin
0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2024-05-17 8:31 UTC (permalink / raw
To: gentoo-commits
commit: b717034cac3e556c5038c49889326f5b3b242277
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 08:26:49 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May 17 08:30:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b717034c
dev-python/tree-sitter: add 0.22.2
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-python/tree-sitter/Manifest | 1 +
.../files/tree-sitter-0.22.2-unbundle.patch | 23 +++++++++
dev-python/tree-sitter/tree-sitter-0.22.2.ebuild | 58 ++++++++++++++++++++++
3 files changed, 82 insertions(+)
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index d6d4ea82788c..26aad7daa92c 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,6 +1,7 @@
DIST tree-sitter-0.20.1.gh.tar.gz 22013 BLAKE2B 961619ab28b71c4051708695f245246e9c9197987c3ce7f162c87af1cfeb2ae378301cce160c071d4df872124274c7984bcaf938c611a91f45515c44cea53e5a SHA512 d6db28fcfb0ea46840ae863a625ef1d8794015b147137e8ef1e113ea6d04e2b87a3bd44dcabe6e41a65230b8da09ce0563a5d9d5aeac30d279547a9085720da3
DIST tree-sitter-0.21.0.gh.tar.gz 38263 BLAKE2B 27c1b52c40e94368c66e222fbc1f5e64734d7d9243e0b76d9607edebaee80211f228323db23cd83c6bc338e7d933a28be8eff13f7ee49495c282d8e9afed4bfb SHA512 f62896edebcb305d1216e540d4a10a2622228b12b1f969dd9722e2d56615f05aea4e681b6d933beaeed52ce59d36641c80c9a4a1ac79b038fb2a75e079987231
DIST tree-sitter-0.21.3.gh.tar.gz 38504 BLAKE2B dd8ed0047763d92babbdb3fd34a6fe6b7a9299b99067600f473bf16b9754a98ada141d96f9b6b26abcb2ff178dd4ec34da547c9cdb7b3449f7b98a44ad10476e SHA512 61f3d4cb15a4106eb350be2adc6ad39de31bd5b2656f35acf2cdf828ababac37b6197d5565ee74b0b2c3a161619163bb98c38108ca3db616fee633e6e2a835a7
+DIST tree-sitter-0.22.2.gh.tar.gz 166150 BLAKE2B eac9a3fe75e56feffcf32e4bd59269c3e1adccaaf9127e9668bb65fef6eb1b1d1cd56ecb8bfb58810e0d9a0d182ce2844c7b350ebbe6b3d4a713a33dc64af953 SHA512 707a6d9f15ab9382e43341d6be68465f4f0bb6cbb9603bf6dfd51628e71db62cb365e1a0a6836250428fa5e8bc66b6cda5992083717778ccc06e825fb3f23728
DIST tree-sitter-embedded-template-6d791b897ecda59baa0689a85a9906348a2a6414.tar.gz 12420 BLAKE2B 9b9c6dd135cef4490e145657c5eeeb1fd470faee3846007638d8247daf07227029c6e7e323a0ed30c5cf6d35602be6bfb62dc1c22076fd4a0e76b161d55cca38 SHA512 7744852711cb1659607298fa373ce3ef79de3212ff55c0fb4e9aebcb715548934065ee3b5b12e9d08169a6207879e154a94c9de8bff892c32729c35d49964736
DIST tree-sitter-html-b5d9758e22b4d3d25704b72526670759a9e4d195.tar.gz 26609 BLAKE2B 223fe82ea18bf61b2b7ec664ad68ec1f324c9e0a1c78578db6063b9037c62be2bb762a9e47d0af81f7f244889f1f72683da3751c1d1c609c4a27fdcd0dc008b8 SHA512 15fd961c18d55a20487f48ef6a6f1822f9033baba8995f2e00cf8db1750036d69e19607f578fe90676aab30a173874969c69b91605b6073eb298f32f5f24f81d
DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.22.2-unbundle.patch b/dev-python/tree-sitter/files/tree-sitter-0.22.2-unbundle.patch
new file mode 100644
index 000000000000..d919b1abf008
--- /dev/null
+++ b/dev-python/tree-sitter/files/tree-sitter-0.22.2-unbundle.patch
@@ -0,0 +1,23 @@
+diff --git a/setup.py b/setup.py
+index 77ea76a..ab22ad3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -12,7 +12,6 @@ setup(
+ Extension(
+ name="tree_sitter._binding",
+ sources=[
+- "tree_sitter/core/lib/src/lib.c",
+ "tree_sitter/binding/language.c",
+ "tree_sitter/binding/lookahead_iterator.c",
+ "tree_sitter/binding/lookahead_names_iterator.c",
+@@ -26,9 +25,8 @@ setup(
+ ],
+ include_dirs=[
+ "tree_sitter/binding",
+- "tree_sitter/core/lib/include",
+- "tree_sitter/core/lib/src",
+ ],
++ libraries=["tree-sitter"],
+ define_macros=[
+ ("PY_SSIZE_T_CLEAN", None),
+ ("TREE_SITTER_HIDE_SYMBOLS", None),
diff --git a/dev-python/tree-sitter/tree-sitter-0.22.2.ebuild b/dev-python/tree-sitter/tree-sitter-0.22.2.ebuild
new file mode 100644
index 000000000000..0397519421bc
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.22.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="
+ https://github.com/tree-sitter/py-tree-sitter/
+ https://pypi.org/project/tree-sitter/
+"
+SRC_URI="
+ https://github.com/tree-sitter/py-tree-sitter/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/py-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# setuptools is needed for distutils import
+DEPEND=">=dev-libs/tree-sitter-0.22.1:="
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ' 3.12)
+"
+BDEPEND="
+ test? (
+ >=dev-libs/tree-sitter-html-0.20.3[python,${PYTHON_USEDEP}]
+ >=dev-libs/tree-sitter-javascript-0.21.0[python,${PYTHON_USEDEP}]
+ >=dev-libs/tree-sitter-json-0.20.3[python,${PYTHON_USEDEP}]
+ >=dev-libs/tree-sitter-python-0.21.0[python,${PYTHON_USEDEP}]
+ >=dev-libs/tree-sitter-rust-0.21.2[python,${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/tree-sitter-0.22.2-unbundle.patch
+)
+
+src_unpack() {
+ default
+ rmdir "${S}/tree_sitter/core" || die
+}
+
+src_test() {
+ rm -r tree_sitter || die
+ distutils-r1_src_test
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/tree-sitter/files/, dev-python/tree-sitter/
@ 2024-05-18 16:41 Arthur Zamarin
0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2024-05-18 16:41 UTC (permalink / raw
To: gentoo-commits
commit: 822c415662f1587768dd4c038f2019bae123c94b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 16:38:50 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May 18 16:40:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822c4156
dev-python/tree-sitter: fix 32 bit
We had issues loading any language on 32 bit systems, which was
fixed in this upstream commit.
Upstream: https://github.com/tree-sitter/py-tree-sitter/commit/85e49483b6d2b49953568d95cfa03e539bfb8179
Bug: https://bugs.gentoo.org/932078
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../files/tree-sitter-0.22.2-fix-32-bit.patch | 27 ++++++++++++++++++++++
...-0.22.2.ebuild => tree-sitter-0.22.2-r1.ebuild} | 4 +++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.22.2-fix-32-bit.patch b/dev-python/tree-sitter/files/tree-sitter-0.22.2-fix-32-bit.patch
new file mode 100644
index 000000000000..c7d86953fa21
--- /dev/null
+++ b/dev-python/tree-sitter/files/tree-sitter-0.22.2-fix-32-bit.patch
@@ -0,0 +1,27 @@
+https://github.com/tree-sitter/py-tree-sitter/commit/85e49483b6d2b49953568d95cfa03e539bfb8179
+From: ObserverOfTime <chronobserver@disroot.org>
+fix(language): use uintptr_t
+
+--- a/tests/test_language.py
++++ b/tests/test_language.py
+@@ -18,7 +18,6 @@ def setUp(self):
+ self.rust = tree_sitter_rust.language()
+
+ def test_init_invalid(self):
+- self.assertRaises(ValueError, Language, -1)
+ self.assertRaises(ValueError, Language, 42)
+
+ def test_properties(self):
+--- a/tree_sitter/binding/language.c
++++ b/tree_sitter/binding/language.c
+@@ -5,8 +5,8 @@ int language_init(Language *self, PyObject *args, PyObject *Py_UNUSED(kwargs)) {
+ if (!PyArg_ParseTuple(args, "O:__init__", &language)) {
+ return -1;
+ }
+- Py_ssize_t language_id = PyLong_AsSsize_t(language);
+- if (language_id < 1 || (language_id % sizeof(TSLanguage *)) != 0) {
++ Py_uintptr_t language_id = PyLong_AsSize_t(language);
++ if (language_id == 0 || (language_id % sizeof(TSLanguage *)) != 0) {
+ if (!PyErr_Occurred()) {
+ PyErr_SetString(PyExc_ValueError, "invalid language ID");
+ }
diff --git a/dev-python/tree-sitter/tree-sitter-0.22.2.ebuild b/dev-python/tree-sitter/tree-sitter-0.22.2-r1.ebuild
similarity index 90%
rename from dev-python/tree-sitter/tree-sitter-0.22.2.ebuild
rename to dev-python/tree-sitter/tree-sitter-0.22.2-r1.ebuild
index 85c88a0273ea..5560b9fb2c6f 100644
--- a/dev-python/tree-sitter/tree-sitter-0.22.2.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.22.2-r1.ebuild
@@ -44,7 +44,9 @@ BDEPEND="
distutils_enable_tests pytest
PATCHES=(
- "${FILESDIR}"/tree-sitter-0.22.2-unbundle.patch
+ "${FILESDIR}"/${PN}-0.22.2-unbundle.patch
+ # Fix 32-bit build, upstream, drop on next bump
+ "${FILESDIR}"/${P}-fix-32-bit.patch
)
src_unpack() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/tree-sitter/files/, dev-python/tree-sitter/
@ 2024-05-19 15:59 Arthur Zamarin
0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2024-05-19 15:59 UTC (permalink / raw
To: gentoo-commits
commit: d7f5be28d04652f90737d4aa76da140bc090b3b7
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 15:50:33 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun May 19 15:59:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f5be28
dev-python/tree-sitter: add 0.22.3
Fixes issues with 32 bit, and no more patches, so better to replace
the version
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-python/tree-sitter/Manifest | 2 +-
.../files/tree-sitter-0.22.2-fix-32-bit.patch | 27 ----------------------
...-0.22.2-r1.ebuild => tree-sitter-0.22.3.ebuild} | 2 --
3 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 26aad7daa92c..b59ddb591569 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,7 +1,7 @@
DIST tree-sitter-0.20.1.gh.tar.gz 22013 BLAKE2B 961619ab28b71c4051708695f245246e9c9197987c3ce7f162c87af1cfeb2ae378301cce160c071d4df872124274c7984bcaf938c611a91f45515c44cea53e5a SHA512 d6db28fcfb0ea46840ae863a625ef1d8794015b147137e8ef1e113ea6d04e2b87a3bd44dcabe6e41a65230b8da09ce0563a5d9d5aeac30d279547a9085720da3
DIST tree-sitter-0.21.0.gh.tar.gz 38263 BLAKE2B 27c1b52c40e94368c66e222fbc1f5e64734d7d9243e0b76d9607edebaee80211f228323db23cd83c6bc338e7d933a28be8eff13f7ee49495c282d8e9afed4bfb SHA512 f62896edebcb305d1216e540d4a10a2622228b12b1f969dd9722e2d56615f05aea4e681b6d933beaeed52ce59d36641c80c9a4a1ac79b038fb2a75e079987231
DIST tree-sitter-0.21.3.gh.tar.gz 38504 BLAKE2B dd8ed0047763d92babbdb3fd34a6fe6b7a9299b99067600f473bf16b9754a98ada141d96f9b6b26abcb2ff178dd4ec34da547c9cdb7b3449f7b98a44ad10476e SHA512 61f3d4cb15a4106eb350be2adc6ad39de31bd5b2656f35acf2cdf828ababac37b6197d5565ee74b0b2c3a161619163bb98c38108ca3db616fee633e6e2a835a7
-DIST tree-sitter-0.22.2.gh.tar.gz 166150 BLAKE2B eac9a3fe75e56feffcf32e4bd59269c3e1adccaaf9127e9668bb65fef6eb1b1d1cd56ecb8bfb58810e0d9a0d182ce2844c7b350ebbe6b3d4a713a33dc64af953 SHA512 707a6d9f15ab9382e43341d6be68465f4f0bb6cbb9603bf6dfd51628e71db62cb365e1a0a6836250428fa5e8bc66b6cda5992083717778ccc06e825fb3f23728
+DIST tree-sitter-0.22.3.gh.tar.gz 164914 BLAKE2B 7ab97203fed17fc8d18c40d5a24ff60cea4757353a4124c832cc52bff93ed8af913dbbab682225eac309762a26e90c216d2e1058dcaeb860ebd467b4c9655939 SHA512 8ac729b90f942eef07de97c4ebd070c1040f338c1f57a2203b6aa4f3f8db863fdb5183c9b27d5be2ec270d7eefba7665800d6cc4e9265cbd4b4715af4c4d3921
DIST tree-sitter-embedded-template-6d791b897ecda59baa0689a85a9906348a2a6414.tar.gz 12420 BLAKE2B 9b9c6dd135cef4490e145657c5eeeb1fd470faee3846007638d8247daf07227029c6e7e323a0ed30c5cf6d35602be6bfb62dc1c22076fd4a0e76b161d55cca38 SHA512 7744852711cb1659607298fa373ce3ef79de3212ff55c0fb4e9aebcb715548934065ee3b5b12e9d08169a6207879e154a94c9de8bff892c32729c35d49964736
DIST tree-sitter-html-b5d9758e22b4d3d25704b72526670759a9e4d195.tar.gz 26609 BLAKE2B 223fe82ea18bf61b2b7ec664ad68ec1f324c9e0a1c78578db6063b9037c62be2bb762a9e47d0af81f7f244889f1f72683da3751c1d1c609c4a27fdcd0dc008b8 SHA512 15fd961c18d55a20487f48ef6a6f1822f9033baba8995f2e00cf8db1750036d69e19607f578fe90676aab30a173874969c69b91605b6073eb298f32f5f24f81d
DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.22.2-fix-32-bit.patch b/dev-python/tree-sitter/files/tree-sitter-0.22.2-fix-32-bit.patch
deleted file mode 100644
index c7d86953fa21..000000000000
--- a/dev-python/tree-sitter/files/tree-sitter-0.22.2-fix-32-bit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/tree-sitter/py-tree-sitter/commit/85e49483b6d2b49953568d95cfa03e539bfb8179
-From: ObserverOfTime <chronobserver@disroot.org>
-fix(language): use uintptr_t
-
---- a/tests/test_language.py
-+++ b/tests/test_language.py
-@@ -18,7 +18,6 @@ def setUp(self):
- self.rust = tree_sitter_rust.language()
-
- def test_init_invalid(self):
-- self.assertRaises(ValueError, Language, -1)
- self.assertRaises(ValueError, Language, 42)
-
- def test_properties(self):
---- a/tree_sitter/binding/language.c
-+++ b/tree_sitter/binding/language.c
-@@ -5,8 +5,8 @@ int language_init(Language *self, PyObject *args, PyObject *Py_UNUSED(kwargs)) {
- if (!PyArg_ParseTuple(args, "O:__init__", &language)) {
- return -1;
- }
-- Py_ssize_t language_id = PyLong_AsSsize_t(language);
-- if (language_id < 1 || (language_id % sizeof(TSLanguage *)) != 0) {
-+ Py_uintptr_t language_id = PyLong_AsSize_t(language);
-+ if (language_id == 0 || (language_id % sizeof(TSLanguage *)) != 0) {
- if (!PyErr_Occurred()) {
- PyErr_SetString(PyExc_ValueError, "invalid language ID");
- }
diff --git a/dev-python/tree-sitter/tree-sitter-0.22.2-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.22.3.ebuild
similarity index 93%
rename from dev-python/tree-sitter/tree-sitter-0.22.2-r1.ebuild
rename to dev-python/tree-sitter/tree-sitter-0.22.3.ebuild
index 5560b9fb2c6f..26528ed86327 100644
--- a/dev-python/tree-sitter/tree-sitter-0.22.2-r1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.22.3.ebuild
@@ -45,8 +45,6 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}"/${PN}-0.22.2-unbundle.patch
- # Fix 32-bit build, upstream, drop on next bump
- "${FILESDIR}"/${P}-fix-32-bit.patch
)
src_unpack() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-19 15:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-23 8:28 [gentoo-commits] repo/gentoo:master commit in: dev-python/tree-sitter/files/, dev-python/tree-sitter/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2024-05-19 15:59 Arthur Zamarin
2024-05-18 16:41 Arthur Zamarin
2024-05-17 8:31 Arthur Zamarin
2021-06-04 13:04 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox