From bf35cff020d11fa408559f7c8d39e18c20733839 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 8 Dec 2021 13:43:22 +0000 Subject: Adding metadata --- .../files/sqlalchemy-1.4.27-drop-greenlet.patch | 49 +++++++++++++++++ dev-python/sqlalchemy/metadata.xml | 3 ++ dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild | 53 ------------------- dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild | 61 ++++++++++++++++++++++ 4 files changed, 113 insertions(+), 53 deletions(-) create mode 100644 dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch delete mode 100644 dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild create mode 100644 dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild (limited to 'dev-python/sqlalchemy') 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/metadata.xml b/dev-python/sqlalchemy/metadata.xml index a497ade87b59..c20044017893 100644 --- a/dev-python/sqlalchemy/metadata.xml +++ b/dev-python/sqlalchemy/metadata.xml @@ -10,5 +10,8 @@ cpe:/a:sqlalchemy:sqlalchemy https://github.com/sqlalchemy/sqlalchemy/issues + + Depend on virtual/python-greenlet for asyncio capabilities + gentoo-staging \ No newline at end of file diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild deleted file mode 100644 index 444642038027..000000000000 --- a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) -PYTHON_REQ_USE="sqlite?" - -inherit distutils-r1 optfeature - -MY_PN="SQLAlchemy" -MY_P="${MY_PN}-${PV/_beta/b}" - -DESCRIPTION="Python SQL toolkit and Object Relational Mapper" -HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/" -SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" -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" - -# greenlet for bug #823794 -RDEPEND="virtual/python-greenlet[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - $(python_gen_impl_dep sqlite) - ) -" - -distutils_enable_tests pytest - -EPYTEST_IGNORE=( - # hardcode call counts specific to Python versions - test/aaa_profiling -) - -python_install_all() { - if use examples; then - docompress -x "/usr/share/doc/${PF}/examples" - dodoc -r examples - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \ - dev-python/mysql-connector-python - optfeature "mssql support" dev-python/pymssql - optfeature "postgresql support" dev-python/psycopg:2 -} diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild new file mode 100644 index 000000000000..6696f8cd8c39 --- /dev/null +++ b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) +PYTHON_REQ_USE="sqlite?" + +inherit distutils-r1 optfeature + +MY_PN="SQLAlchemy" +MY_P="${MY_PN}-${PV/_beta/b}" + +DESCRIPTION="Python SQL toolkit and Object Relational Mapper" +HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" +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="asyncio examples +sqlite test" + +# greenlet for bug #823794 +RDEPEND="asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )" +BDEPEND=" + test? ( + $(python_gen_impl_dep sqlite) + ) +" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # hardcode call counts specific to Python versions + 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" + dodoc -r examples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \ + dev-python/mysql-connector-python + optfeature "mssql support" dev-python/pymssql + optfeature "postgresql support" dev-python/psycopg:2 +} -- cgit v1.3