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 04F35158020 for ; Fri, 14 Oct 2022 15:09:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3E98E07D4; Fri, 14 Oct 2022 15:09:29 +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 BD5ABE07D1 for ; Fri, 14 Oct 2022 15:09:29 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 635D0340ED2 for ; Fri, 14 Oct 2022 15:09:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 810A160B for ; Fri, 14 Oct 2022 15:09:26 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1665760155.03fa8de2b160a86c65f9526cd836004f84ac5d06.andrewammerlaan@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-r1.ebuild X-VCS-Directories: dev-python/pymysql/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 03fa8de2b160a86c65f9526cd836004f84ac5d06 X-VCS-Branch: master Date: Fri, 14 Oct 2022 15:09:26 +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: 0deaebc9-6734-4533-a913-1df0697b062e X-Archives-Hash: d4ad978817b3e97bade373002e52dbd2 commit: 03fa8de2b160a86c65f9526cd836004f84ac5d06 Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri Oct 14 14:10:24 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Oct 14 15:09:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fa8de2 dev-python/pymysql: update EAPI 7 -> 8, pep517, enable py3_11 Signed-off-by: Andrew Ammerlaan gentoo.org> dev-python/pymysql/Manifest | 1 + dev-python/pymysql/pymysql-1.0.2-r1.ebuild | 150 +++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+) diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest index ef0f0ed67ad1..fa3a304e1d73 100644 --- a/dev-python/pymysql/Manifest +++ b/dev-python/pymysql/Manifest @@ -1 +1,2 @@ +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-r1.ebuild b/dev-python/pymysql/pymysql-1.0.2-r1.ebuild new file mode 100644 index 000000000000..dc541b68e6d9 --- /dev/null +++ b/dev-python/pymysql/pymysql-1.0.2-r1.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} pypy3 ) +DISTUTILS_USE_PEP517=setuptools +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}.gh.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}" +}