From 1f0488945f4222b1b78ef84e1aed9edcb2eec1ca Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Sat, 20 Nov 2021 16:33:07 +0100 Subject: [PATCH] re-add sqlalchemy-1.4.23-r1 from main --- dev-python/sqlalchemy/Manifest | 8 +-- .../sqlalchemy/sqlalchemy-1.3.23.ebuild | 67 ------------------- .../sqlalchemy/sqlalchemy-1.4.13.ebuild | 66 ------------------ ....17.ebuild => sqlalchemy-1.4.23-r1.ebuild} | 14 +--- 4 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild delete mode 100644 dev-python/sqlalchemy/sqlalchemy-1.4.13.ebuild rename dev-python/sqlalchemy/{sqlalchemy-1.4.17.ebuild => sqlalchemy-1.4.23-r1.ebuild} (73%) diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest index 43f85527e..dd98da3f2 100644 --- a/dev-python/sqlalchemy/Manifest +++ b/dev-python/sqlalchemy/Manifest @@ -1,7 +1,3 @@ -DIST SQLAlchemy-1.3.23.tar.gz 6313652 BLAKE2B e87f67ee7ee70036b94e1708c1a59f58b1f8abad23aa26c74e2a9a2172bee5a6411b2be95bff0f1c6e39d3a0de0839adc6b43f4cde597a18d4cf930e4c37b11e SHA512 dcd1a0878fd58ee49691bb7e8a2571cb40cc942380a4fe0e66d3abb1723830f178e7b3944c5c2d69bd3aaff04cd2ca171bbabbe34f59f54bcf4b9ee2782f9570 -DIST SQLAlchemy-1.4.13.tar.gz 7589942 BLAKE2B 08e9fb6112aa71738f27dc4ce86ebe2274dd2513f39ded7211a5617ecd677f37fe31de754a24ecd519b227b141287ad86d0d0337f3d278d4c4ca5b67e2a1a79d SHA512 fb81c71922a768221f6675686fb2696b5e6d1f2e72231611e9afd20b7659193247eef4191841799fb1fe6a51304629efb6d3fba5dc298fdf70f248010bce8bb3 -DIST SQLAlchemy-1.4.17.tar.gz 7630929 BLAKE2B 88b75c930caf674aa6d927336573f0e40fc89ae72735c11479eaa15de56754807b5412409d383857104a3027fcae346e747cc605525fe88c0a0f9d4ff39fcc7a SHA512 ff99a3a9c440fcdc10f6f43905672f72929fff430b3d9583b8e81693ff9d54ad5d9607b8041787074072cdf1ba03b31db9255cca1c50c8a43f275a0905e9f0bd -EBUILD sqlalchemy-1.3.23.ebuild 1888 BLAKE2B c0c3b163eac8670e27536ef6eada926abcc8d7ee40eface60d9e77caacabd213c52fd3d9ae7dad603c78d875177e9242f7906d4faa58cdbe13bb936bce671a40 SHA512 954e4c8446afa6acd4b6bf5c757630c0fb14d3dea523da7ba010f18c26a48403434d90c081124f9862c9f3c34cd84b3a14697af8e318d29f6024c84d69d71984 -EBUILD sqlalchemy-1.4.13.ebuild 1703 BLAKE2B 242156af368490ff081d1486f025de5c6e5e27fde44bfd128f76ad328d16fe2c820699d4d2e45d9b72e2b39d221c5c405b3a70f46134e26c82212b9bf438357f SHA512 34fe6a8c5b655415f9bb2119a9cc6e49f8b0f15ccf5f0dee48f0fd957d80f81e8b2909e3f37957a8a4761022b62d459b7f6ec393f59843d48a225498a29d8736 -EBUILD sqlalchemy-1.4.17.ebuild 1707 BLAKE2B a7684ddfa6247ec6733778e577dc5a2f9abae0153eaf70ea26c5fe1ffa85d5bfe95a7395274d5559070284835f4870a51f21c965774656c618e3e55a39874867 SHA512 0e3c08001ef7ebf8877f680d64a80475f0e12ea0bca76f74905a167737a1af9505593b725db06c425f2af0e97d47d1a41c436ecb8c5fd805ce4ae552e9e76d78 +DIST SQLAlchemy-1.4.23.tar.gz 7730769 BLAKE2B ad812a068beba3d55f629d4a3ee5eed6f61e46b19a7e1fcc717cfdd7a8d2cb759d894402a64550576b2cc28d82b53aa56ff4305d45433126a765909150a50450 SHA512 9e668b63487d0b9f9321a73bbf652aa82f31a90222429c4ba2f866edb0a313d8d10989febd456c87bdcde63ab595810232257fb011dce007538651426c1df0d1 +EBUILD sqlalchemy-1.4.23-r1.ebuild 1464 BLAKE2B 716051597209ab1ba07ce7a912eda584c742013847fa18e51d71329f65e573be8beace8ae7166481ee34519df1dbfdf1555a0fa8b6c5d2b61da3421a88bd3edf SHA512 35ca501c0bb90f382ef8f8f80bce6222fbf55e0acd508aca1a40becd9a99b1f9fde29304426348980f0cb603402c9511be3e1f4409c0e6f95c8f1d7cc6dbd341 MISC metadata.xml 457 BLAKE2B e4599b11f70da60c6b551ef67e5bfe628472f5ca86f4d2aaaf3c03dec502f52838081abedda0e7e8baf77778cc67282dd899ad709d411f72d5335f361e444c58 SHA512 e5e4a1cc64cd74767e2f85e12387d775173e691cdb4a020f94d7d7718e67d367d54b6f4e764fba4d68c45a1652c32832ff03d3d0e46aaf0d0b04255f466e61e5 diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild deleted file mode 100644 index 262f36e78..000000000 --- a/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{6..9} ) -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 hppa ia64 mips ppc ppc64 s390 sparc x86 amd64-linux x86-linux ppc-macos x64-macos x64-solaris" -IUSE="examples +sqlite test" - -# Use pytest-xdist to speed up tests -BDEPEND=" - test? ( - $(python_gen_impl_dep sqlite) - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -#PATCHES=( - # Ported part of those commits to fix failing tests: - # https://github.com/sqlalchemy/sqlalchemy/commit/c68f9fb87868c45fcadcc942ce4a35f10ff2f7ea - # https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0 - # https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45 - # "${FILESDIR}/sqlalchemy-1.3.20-pypy3.patch" -#) - -distutils_enable_tests pytest - -python_test() { - # Use all CPUs with pytest-xdist - pytest -n auto -vv || die "Tests failed with ${EPYTHON}" -} - -python_prepare_all() { - # Disable tests hardcoding function call counts specific to Python versions. - rm -r test/aaa_profiling || die - distutils-r1_python_prepare_all -} - -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.13.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.13.ebuild deleted file mode 100644 index d0214a063..000000000 --- a/dev-python/sqlalchemy/sqlalchemy-1.4.13.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="sqlite?" - -inherit distutils-r1 multiprocessing 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples +sqlite test" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/importlib_metadata[${PYTHON_USEDEP}] - ' python3_7 pypy3) -" -# Use pytest-xdist to speed up tests -BDEPEND=" - test? ( - $(python_gen_impl_dep sqlite) - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # remove optional/partial dep on greenlet, greenlet is not very portable - sed -i -e '/greenlet/d' setup.cfg || die - - distutils-r1_src_prepare -} - -python_test() { - # Disable tests hardcoding function call counts specific to Python versions. - epytest --ignore test/aaa_profiling \ - -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" -} - -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.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild similarity index 73% rename from dev-python/sqlalchemy/sqlalchemy-1.4.17.ebuild rename to dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild index 45569f2d9..ea00fb36c 100644 --- a/dev-python/sqlalchemy/sqlalchemy-1.4.17.ebuild +++ b/dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{7..10} ) +PYTHON_COMPAT=( pypy3 python3_{8..10} ) PYTHON_REQ_USE="sqlite?" inherit distutils-r1 multiprocessing optfeature @@ -18,19 +18,12 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples +sqlite test" -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/importlib_metadata[${PYTHON_USEDEP}] - ' python3_7 pypy3) -" -# Use pytest-xdist to speed up tests BDEPEND=" test? ( $(python_gen_impl_dep sqlite) - dev-python/pytest-xdist[${PYTHON_USEDEP}] ) " @@ -45,8 +38,7 @@ src_prepare() { python_test() { # Disable tests hardcoding function call counts specific to Python versions. - epytest --ignore test/aaa_profiling \ - -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" + epytest --ignore test/aaa_profiling } python_install_all() {