From 017b0d7960a32ed5ddfc65e36b0c3c4654804ea3 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Thu, 28 Mar 2024 04:40:38 +0100 Subject: [PATCH 1/3] dev-util/prysk: add 0.19.0, drop 0.18.0 Signed-off-by: Haelwenn (lanodan) Monnier --- dev-util/prysk/Manifest | 2 +- ...prysk-0.18.0-fix-stray-site-packages.patch | 52 ------------------- ...rysk-0.18.0.ebuild => prysk-0.19.0.ebuild} | 5 +- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 dev-util/prysk/files/prysk-0.18.0-fix-stray-site-packages.patch rename dev-util/prysk/{prysk-0.18.0.ebuild => prysk-0.19.0.ebuild} (91%) diff --git a/dev-util/prysk/Manifest b/dev-util/prysk/Manifest index 65636bf99b..790df769b8 100644 --- a/dev-util/prysk/Manifest +++ b/dev-util/prysk/Manifest @@ -1 +1 @@ -DIST prysk-0.18.0.gh.tar.gz 78512 BLAKE2B 0fa715ebdf8202e689abf08029dd0f73863ad6bcc37a156b65e486722351404d1f17b09d4c1661980161292590a69ca0dcf37533088a63489585cd19ffaab074 SHA512 2e1c82dcfc3f85dbed2572d1e238a93f1932c9dbf7c79d65189a1584dc6265652f60d8c060a75363ecbd660318874cf01875eff78d387c5be8f29c6599fc8d69 +DIST prysk-0.19.0.gh.tar.gz 78659 BLAKE2B 772c1e79e8db826435f8324c437769b0a149b33909b64459ea7a6d8db18e1d35bd76abe225b635eab654bb8a9bc21c3d6bac05ae8de631bf294a3ea293852794 SHA512 14b0ab8f0592833f32a168d8bfb7342f1339d34054ccb976ac89e17966c8728959d3a9f201bce3d992198118e3c5023e9fbaac6d2b7638bc0d16b57442a1f81c diff --git a/dev-util/prysk/files/prysk-0.18.0-fix-stray-site-packages.patch b/dev-util/prysk/files/prysk-0.18.0-fix-stray-site-packages.patch deleted file mode 100644 index f1ffa0c63d..0000000000 --- a/dev-util/prysk/files/prysk-0.18.0-fix-stray-site-packages.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d7728b04f59b5e9df52f5df1c6f51fbce4dd0977 Mon Sep 17 00:00:00 2001 -From: "Haelwenn (lanodan) Monnier" -Date: Thu, 15 Feb 2024 09:50:41 +0100 -Part-of: https://github.com/prysk/prysk/pull/239 -Subject: [PATCH] pyproject.toml: Only include in sdist - -https://projects.gentoo.org/python/guide/qawarn.html#stray-top-level-files-in-site-packages - -For example, this is bogus and would mean project overwriting each others: - /usr/lib/python3.11/site-packages/pyproject.toml - /usr/lib/python3.11/site-packages/poetry.lock - /usr/lib/python3.11/site-packages/README.rst - /usr/lib/python3.11/site-packages/COPYING.txt - /usr/lib/python3.11/site-packages/examples ---- - pyproject.toml | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 6683ab5..3d65573 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -40,16 +40,16 @@ keywords = [ - repository = "https://github.com/Nicoretti/prysk" - homepage = "https://www.prysk.net/" - include = [ -- ".coveragerc", -- "noxfile.py", -- "poetry.lock", -- "*.rst", -- "*.txt", -- "*.toml", -- "docs/*", -- "contrib/*", -- "scripts/*", -- "examples/*", -+ { path = ".coveragerc", format = "sdist" }, -+ { path = "noxfile.py", format = "sdist" }, -+ { path = "poetry.lock", format = "sdist" }, -+ { path = "*.rst", format = "sdist" }, -+ { path = "*.txt", format = "sdist" }, -+ { path = "*.toml", format = "sdist" }, -+ { path = "docs/*", format = "sdist" }, -+ { path = "contrib/*", format = "sdist" }, -+ { path = "scripts/*", format = "sdist" }, -+ { path = "examples/*", format = "sdist" }, - ] - exclude = [ - "contrib/PKGBUILD", --- -2.43.0 - diff --git a/dev-util/prysk/prysk-0.18.0.ebuild b/dev-util/prysk/prysk-0.19.0.ebuild similarity index 91% rename from dev-util/prysk/prysk-0.18.0.ebuild rename to dev-util/prysk/prysk-0.19.0.ebuild index df08f93c65..964221966e 100644 --- a/dev-util/prysk/prysk-0.18.0.ebuild +++ b/dev-util/prysk/prysk-0.19.0.ebuild @@ -5,6 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} pypy3 ) DISTUTILS_USE_PEP517=poetry +DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 @@ -23,10 +24,6 @@ RDEPEND=" $(python_gen_cond_dep '>=dev-python/rich-13.3.1[${PYTHON_USEDEP}]') " -PATCHES=( - "${FILESDIR}/prysk-0.18.0-fix-stray-site-packages.patch" -) - DOCS=( README.rst docs examples ) python_test() { From c214897395197728070f0958d72ffbf5bbab880b Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Thu, 28 Mar 2024 08:16:08 +0200 Subject: [PATCH 2/3] dev-python/stone: add 3.3.2 Signed-off-by: Viorel Munteanu --- dev-python/stone/Manifest | 1 + dev-python/stone/stone-3.3.2.ebuild | 35 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 dev-python/stone/stone-3.3.2.ebuild diff --git a/dev-python/stone/Manifest b/dev-python/stone/Manifest index 8a0159f953..6d258c1a51 100644 --- a/dev-python/stone/Manifest +++ b/dev-python/stone/Manifest @@ -1 +1,2 @@ DIST stone-3.3.1.gh.tar.gz 282831 BLAKE2B b9a866e43feedea28cd33b89f78100be520a2756fa78888e9a786ae27942a5c19df51010c0af952de70c782d3fc3588de1ae0f58450d807053989bb91d285f15 SHA512 ee07f01b6f10e771afbe6ca6f07d7efa24a5460e5c163f339ae84a8b7742a659f5cb535e674a2f315d1bfa95b7c02e56f46db1f397188b5b6705f6c00c1e9d73 +DIST stone-3.3.2.gh.tar.gz 280813 BLAKE2B f7e9d5c6a35074a88d4650105af336c43e85f9c1bda0cde010985f5b538dc8cb9371e1ab2ee8c12d520d42d192bf1a4134d6227c5f5ba85effa30b2cc5bc2a7e SHA512 7bccaf8b2a70edfebf7458447a4ad9121b9cca10dc8b7d151c6763ac7ead9c6c531cbb3c1b56b77ca6eea205dcc0f6e8fa20f0776897a8c40652ef7b9c8830c8 diff --git a/dev-python/stone/stone-3.3.2.ebuild b/dev-python/stone/stone-3.3.2.ebuild new file mode 100644 index 0000000000..1e46f73150 --- /dev/null +++ b/dev-python/stone/stone-3.3.2.ebuild @@ -0,0 +1,35 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="The Official Api Spec Language for Dropbox" +HOMEPAGE=" + https://www.dropbox.com/developers + https://github.com/dropbox/stone + https://pypi.org/project/stone/ +" +SRC_URI="https://github.com/dropbox/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/ply-3.4[${PYTHON_USEDEP}] + >=dev-python/six-1.3.0[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +python_prepare_all() { + # Don't run tests via setup.py pytest + sed -i -e "/'pytest-runner .*',/d" setup.py || die + + distutils-r1_python_prepare_all +} From 63d4b67256ccf7219717d1045013b5c0f517b53c Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Thu, 28 Mar 2024 08:16:24 +0200 Subject: [PATCH 3/3] dev-python/stone: drop 3.3.1 Signed-off-by: Viorel Munteanu --- dev-python/stone/Manifest | 1 - .../stone/files/stone-3.3.1-python3_11.patch | 15 -------- dev-python/stone/stone-3.3.1.ebuild | 37 ------------------- 3 files changed, 53 deletions(-) delete mode 100644 dev-python/stone/files/stone-3.3.1-python3_11.patch delete mode 100644 dev-python/stone/stone-3.3.1.ebuild diff --git a/dev-python/stone/Manifest b/dev-python/stone/Manifest index 6d258c1a51..66e7ad1393 100644 --- a/dev-python/stone/Manifest +++ b/dev-python/stone/Manifest @@ -1,2 +1 @@ -DIST stone-3.3.1.gh.tar.gz 282831 BLAKE2B b9a866e43feedea28cd33b89f78100be520a2756fa78888e9a786ae27942a5c19df51010c0af952de70c782d3fc3588de1ae0f58450d807053989bb91d285f15 SHA512 ee07f01b6f10e771afbe6ca6f07d7efa24a5460e5c163f339ae84a8b7742a659f5cb535e674a2f315d1bfa95b7c02e56f46db1f397188b5b6705f6c00c1e9d73 DIST stone-3.3.2.gh.tar.gz 280813 BLAKE2B f7e9d5c6a35074a88d4650105af336c43e85f9c1bda0cde010985f5b538dc8cb9371e1ab2ee8c12d520d42d192bf1a4134d6227c5f5ba85effa30b2cc5bc2a7e SHA512 7bccaf8b2a70edfebf7458447a4ad9121b9cca10dc8b7d151c6763ac7ead9c6c531cbb3c1b56b77ca6eea205dcc0f6e8fa20f0776897a8c40652ef7b9c8830c8 diff --git a/dev-python/stone/files/stone-3.3.1-python3_11.patch b/dev-python/stone/files/stone-3.3.1-python3_11.patch deleted file mode 100644 index f2826fdc52..0000000000 --- a/dev-python/stone/files/stone-3.3.1-python3_11.patch +++ /dev/null @@ -1,15 +0,0 @@ -Replace method deprecated in 3.10 and removed in 3.11. Upstream is slow to release a fix. - -See also: https://github.com/dropbox/stone/issues/288 - ---- a/stone/frontend/ir_generator.py -+++ b/stone/frontend/ir_generator.py -@@ -1074,7 +1074,7 @@ - assert issubclass(data_type_class, DataType), \ - 'Expected stone.data_type.DataType, got %r' % data_type_class - -- argspec = inspect.getargspec(data_type_class.__init__) # noqa: E501 # pylint: disable=deprecated-method,useless-suppression -+ argspec = inspect.getfullargspec(data_type_class.__init__) - argspec.args.remove('self') - num_args = len(argspec.args) - # Unfortunately, argspec.defaults is None if there are no defaults diff --git a/dev-python/stone/stone-3.3.1.ebuild b/dev-python/stone/stone-3.3.1.ebuild deleted file mode 100644 index 99d5fdf1eb..0000000000 --- a/dev-python/stone/stone-3.3.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 - -DESCRIPTION="The Official Api Spec Language for Dropbox" -HOMEPAGE=" - https://www.dropbox.com/developers - https://github.com/dropbox/stone - https://pypi.org/project/stone/ -" -SRC_URI="https://github.com/dropbox/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=dev-python/ply-3.4[${PYTHON_USEDEP}] - >=dev-python/six-1.3.0[${PYTHON_USEDEP}] -" - -PATCHES=( "${FILESDIR}"/${P}-python3_11.patch ) - -distutils_enable_tests pytest - -python_prepare_all() { - # Don't run tests via setup.py pytest - sed -i -e "/'pytest-runner .*',/d" setup.py || die - - distutils-r1_python_prepare_all -}