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 E8B0E158003 for ; Sun, 6 Nov 2022 07:59:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59882E086F; Sun, 6 Nov 2022 07:59:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3CF71E086F for ; Sun, 6 Nov 2022 07:59:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A33F73412D9 for ; Sun, 6 Nov 2022 07:59:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 580C772F for ; Sun, 6 Nov 2022 07:59:27 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1667721560.90d05a13935b51b74e81be97c9ef796d1d55d904.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pymysql/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pymysql/Manifest dev-python/pymysql/pymysql-1.0.2.ebuild X-VCS-Directories: dev-python/pymysql/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 90d05a13935b51b74e81be97c9ef796d1d55d904 X-VCS-Branch: master Date: Sun, 6 Nov 2022 07:59:27 +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: b02a6ed6-f2d7-4b82-b57e-2a22a0c95edd X-Archives-Hash: 42eb538a498adf07f0424b0fc6360e09 commit: 90d05a13935b51b74e81be97c9ef796d1d55d904 Author: Michał Górny gentoo org> AuthorDate: Sun Nov 6 07:36:55 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Nov 6 07:59:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d05a13 dev-python/pymysql: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pymysql/Manifest | 1 - dev-python/pymysql/pymysql-1.0.2.ebuild | 150 -------------------------------- 2 files changed, 151 deletions(-) diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest index fa3a304e1d73..0382beded5ec 100644 --- a/dev-python/pymysql/Manifest +++ b/dev-python/pymysql/Manifest @@ -1,2 +1 @@ DIST pymysql-1.0.2.gh.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638 -DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638 diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild deleted file mode 100644 index 3b56a5306846..000000000000 --- a/dev-python/pymysql/pymysql-1.0.2.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) - -inherit distutils-r1 - -MY_PN="PyMySQL" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Pure-Python MySQL Driver" -HOMEPAGE="https://github.com/PyMySQL/PyMySQL" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86" - -# TODO: support other mysql variants -BDEPEND=" - test? ( - dev-db/mariadb[server] - )" - -distutils_enable_tests pytest - -src_prepare() { - # Auth tests don't support socket auth - find tests/ -name '*_auth.py' -delete || die - - distutils-r1_src_prepare -} - -src_test() { - if [[ -z "${USER}" ]] ; then - # Tests require system user - local -x USER="$(whoami)" - einfo "USER set to '${USER}'" - fi - - local mysql_install_db_cmd="${EPREFIX}/usr/share/mariadb/scripts/mysql_install_db" - [[ ! -x "${mysql_install_db_cmd}" ]] && mysql_install_db_cmd="${EPREFIX}/usr/bin/mysql_install_db" - [[ ! -x "${mysql_install_db_cmd}" ]] && die "mysql_install_db command not found!" - - local mysqld_cmd="${EPREFIX}/usr/sbin/mysqld" - [[ ! -x "${mysqld_cmd}" ]] && die "mysqld command not found!" - - local PIDFILE="${T}/mysqld.pid" - if pkill -0 -F "${PIDFILE}" &>/dev/null ; then - einfo "Killing already running mysqld process ..." - pkill -F "${PIDFILE}" - fi - - if [[ -d "${T}/mysql" ]] ; then - einfo "Removing already existing mysqld data dir ..." - rm -rf "${T}/mysql" || die - fi - - einfo "Creating mysql test instance ..." - mkdir -p "${T}"/mysql || die - "${mysql_install_db_cmd}" \ - --no-defaults \ - --auth-root-authentication-method=normal \ - --basedir="${EPREFIX}/usr" \ - --datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \ - || die - - einfo "Starting mysql test instance ..." - # TODO: random port - "${mysqld_cmd}" \ - --no-defaults \ - --character-set-server=utf8 \ - --bind-address=127.0.0.1 \ - --port=43306 \ - --pid-file="${T}"/mysqld.pid \ - --socket="${T}"/mysqld.sock \ - --datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 & - - # wait for it to start - local i - for (( i = 0; i < 10; i++)); do - [[ -S ${T}/mysqld.sock ]] && break - sleep 1 - done - [[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start" - - einfo "Configuring test mysql instance ..." - - # create test user for auth tests - mysql -uroot --socket="${T}"/mysqld.sock -s -e ' - INSTALL SONAME "auth_ed25519"; - CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so"; - ' || die "Failed to set up auth_ed25519" - - mysql -uroot --socket="${T}"/mysqld.sock -s -e " - SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";'); - SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";'); - " || die "Failed to create ed25519 test users" - - # create test databases - mysql -uroot --socket="${T}"/mysqld.sock -s -e ' - create database test1 DEFAULT CHARACTER SET utf8mb4; - create database test2 DEFAULT CHARACTER SET utf8mb4; - - create user test2 identified by "some password"; - grant all on test2.* to test2; - - create user test2@localhost identified by "some password"; - grant all on test2.* to test2@localhost; - ' || die "Failed to create test databases" - - cat > pymysql/tests/databases.json <<-EOF || die - [{ - "host": "localhost", - "user": "root", - "password": "", - "database": "test1", - "use_unicode": true, - "local_infile": true, - "unix_socket": "${T}/mysqld.sock" - }, { - "host": "localhost", - "user": "root", - "password": "", - "database": "test2", - "unix_socket": "${T}/mysqld.sock" - }] - EOF - - distutils-r1_src_test - - if pkill -0 -F "${PIDFILE}" &>/dev/null ; then - einfo "Stopping mysql test instance ..." - pkill -F "${PIDFILE}" - fi -} - -python_test() { - local excludes=( - # requires some dialog plugin - pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin - pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin - ) - - PYTHONPATH=. pytest -vv ${excludes[@]/#/--deselect } || - die "Tests failed with ${EPYTHON}" -}