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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42864138359 for ; Fri, 9 Oct 2020 08:53:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73B99E0949; Fri, 9 Oct 2020 08:53:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D9DDE0949 for ; Fri, 9 Oct 2020 08:53:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49C4E340EE9 for ; Fri, 9 Oct 2020 08:53:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9EFC93A4 for ; Fri, 9 Oct 2020 08:53:19 +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: <1602233166.0694e24290f9ccf35063078d4e3e37ef5c00e2d2.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-0.10.0.ebuild dev-python/pymysql/pymysql-0.9.3.ebuild X-VCS-Directories: dev-python/pymysql/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0694e24290f9ccf35063078d4e3e37ef5c00e2d2 X-VCS-Branch: master Date: Fri, 9 Oct 2020 08:53:19 +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: d229d7b2-a5bc-4751-966a-70dfb9de2cba X-Archives-Hash: eb570788026f658080a24de1f4a11aa9 commit: 0694e24290f9ccf35063078d4e3e37ef5c00e2d2 Author: Michał Górny gentoo org> AuthorDate: Fri Oct 9 08:44:11 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Oct 9 08:46:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0694e242 dev-python/pymysql: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pymysql/Manifest | 2 - dev-python/pymysql/pymysql-0.10.0.ebuild | 139 ------------------------------- dev-python/pymysql/pymysql-0.9.3.ebuild | 96 --------------------- 3 files changed, 237 deletions(-) diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest index 130c1bfa548..8ff259cd603 100644 --- a/dev-python/pymysql/Manifest +++ b/dev-python/pymysql/Manifest @@ -1,3 +1 @@ -DIST pymysql-0.10.0.tar.gz 86137 BLAKE2B bcd4746d3e3947c2598b875d46678984beedfa0d9161a1aefb1f7f4b5314e084f5292206435b0a2621fb100744194fd1e2963228e37b41c289c5c4021f475371 SHA512 7d322c526634380cf4d3216f666a7d1f38e120390aab525cb8806bcea3f2fd7eab82e744a0be7270eae47ab1f79be5b5f7409e7e5dc9aaabf1e3c0c8853f578f DIST pymysql-0.10.1.tar.gz 86441 BLAKE2B 8e33fbba0544dad68c3eeb5bd538c4bce121222b4660ad06c3c0224b5db6a6c9f45d6697a98d5f0ba20429afa204d46c9ce57a4d9696dbc2a35649c6253a645b SHA512 edc702c54a33350f75648765c60d4cf455449e88818948b018585d557bea280e626d23b1279a410765f2de8e35b3c22ea5c8e0ef3dc72588b674c93a2124a224 -DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648 diff --git a/dev-python/pymysql/pymysql-0.10.0.ebuild b/dev-python/pymysql/pymysql-0.10.0.ebuild deleted file mode 100644 index 059a093ed9b..00000000000 --- a/dev-python/pymysql/pymysql-0.10.0.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} 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="~amd64 ~arm ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# TODO: support other mysql variants -BDEPEND=" - test? ( dev-db/mariadb[server] )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.10.0-fix-tests.patch - "${FILESDIR}"/${PN}-0.10.0-add-missing-import.patch -) - -src_prepare() { - find -name '*.py' -exec sed -i -e 's:unittest2:unittest:' {} + || die - - # 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 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 - "${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \ - --no-defaults \ - --auth-root-authentication-method=normal \ - --basedir="${BROOT}/usr" \ - --datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \ - || die - - einfo "Starting mysql test instance ..." - # TODO: random port - mysqld \ - --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 "Preparing 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", - "passwd": "", - "db": "test1", - "use_unicode": true, - "local_infile": true, - "unix_socket": "${T}/mysqld.sock" - }, { - "host": "localhost", - "user": "root", - "passwd": "", - "db": "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 -} - -distutils_enable_tests pytest diff --git a/dev-python/pymysql/pymysql-0.9.3.ebuild b/dev-python/pymysql/pymysql-0.9.3.ebuild deleted file mode 100644 index 7346a5ab5fb..00000000000 --- a/dev-python/pymysql/pymysql-0.9.3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} 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="amd64 ~arm64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# TODO: support other mysql variants -BDEPEND=" - test? ( dev-db/mariadb[server] )" - -src_prepare() { - find -name '*.py' -exec sed -i -e 's:unittest2:unittest:' {} + || die - distutils-r1_src_prepare -} - -src_test() { - mkdir -p "${T}"/mysql || die - "${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \ - --no-defaults \ - --auth-root-authentication-method=normal \ - --basedir="${BROOT}/usr" \ - --datadir="${T}"/mysql || die - # TODO: random port - mysqld \ - --no-defaults \ - --character-set-server=utf8 \ - --bind-address=127.0.0.1 \ - --port=43306 \ - --socket="${T}"/mysqld.sock \ - --datadir="${T}"/mysql & - local pid=${!} - - # 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" - - # create test databases - mysql -uroot --socket="${T}"/mysqld.sock -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 - - cat > pymysql/tests/databases.json <<-EOF || die - [{ - "host": "localhost", - "user": "root", - "passwd": "", - "db": "test1", - "use_unicode": true, - "local_infile": true, - "unix_socket": "${T}/mysqld.sock" - }, { - "host": "localhost", - "user": "root", - "passwd": "", - "db": "test2", - "unix_socket": "${T}/mysqld.sock" - }] - EOF - - distutils-r1_src_test - - kill "${pid}" - wait "${pid}" -} - -python_test() { - ${PYTHON} runtests.py || die -}