From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 64737158087 for ; Wed, 8 Dec 2021 00:39:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A3E22BC005; Wed, 8 Dec 2021 00:39:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F244C2BC005 for ; Wed, 8 Dec 2021 00:39:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CF14343376 for ; Wed, 8 Dec 2021 00:39:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CBE31FE for ; Wed, 8 Dec 2021 00:39:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638923953.20edee675a7688b6c022160112a098a0fe828b0d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sqlalchemy/files/, dev-python/sqlalchemy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild X-VCS-Directories: dev-python/sqlalchemy/ dev-python/sqlalchemy/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 20edee675a7688b6c022160112a098a0fe828b0d X-VCS-Branch: master Date: Wed, 8 Dec 2021 00:39:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 788cbb8e-f0b2-4c6c-9bc7-78b105879c4d X-Archives-Hash: 0c174f1d38ea1f828b0ca55205c0e222 commit: 20edee675a7688b6c022160112a098a0fe828b0d Author: Sam James gentoo org> AuthorDate: Wed Dec 8 00:35:08 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 8 00:39:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20edee67 dev-python/sqlalchemy: disable greenlet dependency conditionally We should try pull it in on arches where it's possible but we shouldn't hard require it given most things work fine without it. Some applications do need it though, so do this conditionally so they can depend on it rather than ending up being broken by depcleans or requiring people to put it in world files. Closes: https://bugs.gentoo.org/828482 Signed-off-by: Sam James gentoo.org> .../files/sqlalchemy-1.4.27-drop-greenlet.patch | 49 ++++++++++++++++++++++ ....4.27-r2.ebuild => sqlalchemy-1.4.27-r3.ebuild} | 12 +++++- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch b/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch new file mode 100644 index 000000000000..07184b843c9e --- /dev/null +++ b/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch @@ -0,0 +1,49 @@ +Not available on all arches we support and is only needed for +a few consumers. + +https://bugs.gentoo.org/828482 + +From: Sam James +Date: Wed, 8 Dec 2021 00:31:01 +0000 +Subject: [PATCH] Drop greenlet dependency + +--- a/setup.cfg ++++ b/setup.cfg +@@ -36,11 +36,8 @@ package_dir = + =lib + install_requires = + importlib-metadata;python_version<"3.8" +- greenlet != 0.4.17;python_version>='3' and (platform_machine=='aarch64' or (platform_machine=='ppc64le' or (platform_machine=='x86_64' or (platform_machine=='amd64' or (platform_machine=='AMD64' or (platform_machine=='win32' or platform_machine=='WIN32')))))) + + [options.extras_require] +-asyncio = +- greenlet!=0.4.17;python_version>="3" + mypy = + mypy >= 0.910;python_version>="3" + sqlalchemy2-stubs +diff --git a/setup.cfg b/setup.cfg +index b7f69e9..91993f7 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -57,7 +57,6 @@ oracle = + postgresql = psycopg2>=2.7 + postgresql_pg8000 = pg8000>=1.16.6 + postgresql_asyncpg = +- %(asyncio)s + asyncpg;python_version>="3" + postgresql_psycopg2binary = psycopg2-binary + postgresql_psycopg2cffi = psycopg2cffi +@@ -65,13 +64,10 @@ pymysql = + pymysql;python_version>="3" + pymysql<1;python_version<"3" + aiomysql = +- %(asyncio)s + aiomysql;python_version>="3" + asyncmy = +- %(asyncio)s + asyncmy>=0.2.3;python_version>="3" + aiosqlite = +- %(asyncio)s + aiosqlite;python_version>="3" + typing_extensions!=3.10.0.1 + sqlcipher = diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild similarity index 84% rename from dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild rename to dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild index 24bcfe77ce84..21f126d011c4 100644 --- a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild +++ b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild @@ -19,10 +19,10 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples +sqlite test" +IUSE="asyncio examples +sqlite test" # greenlet for bug #823794 -RDEPEND="virtual/python-greenlet[${PYTHON_USEDEP}]" +RDEPEND="asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )" BDEPEND=" test? ( $(python_gen_impl_dep sqlite) @@ -36,6 +36,14 @@ EPYTEST_IGNORE=( test/aaa_profiling ) +src_prepare() { + if ! use asyncio ; then + eapply "${FILESDIR}"/${PN}-1.4.27-drop-greenlet.patch + fi + + distutils-r1_src_prepare +} + python_install_all() { if use examples; then docompress -x "/usr/share/doc/${PF}/examples"