Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pymysql/
Date: Sun, 06 Nov 2022 07:59:33
Message-Id: 1667721560.90d05a13935b51b74e81be97c9ef796d1d55d904.mgorny@gentoo
1 commit: 90d05a13935b51b74e81be97c9ef796d1d55d904
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 6 07:36:55 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 6 07:59:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d05a13
7
8 dev-python/pymysql: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pymysql/Manifest | 1 -
13 dev-python/pymysql/pymysql-1.0.2.ebuild | 150 --------------------------------
14 2 files changed, 151 deletions(-)
15
16 diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
17 index fa3a304e1d73..0382beded5ec 100644
18 --- a/dev-python/pymysql/Manifest
19 +++ b/dev-python/pymysql/Manifest
20 @@ -1,2 +1 @@
21 DIST pymysql-1.0.2.gh.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
22 -DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
23
24 diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
25 deleted file mode 100644
26 index 3b56a5306846..000000000000
27 --- a/dev-python/pymysql/pymysql-1.0.2.ebuild
28 +++ /dev/null
29 @@ -1,150 +0,0 @@
30 -# Copyright 1999-2022 Gentoo Authors
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=7
34 -
35 -PYTHON_COMPAT=( python3_{8..10} pypy3 )
36 -
37 -inherit distutils-r1
38 -
39 -MY_PN="PyMySQL"
40 -MY_P="${MY_PN}-${PV}"
41 -
42 -DESCRIPTION="Pure-Python MySQL Driver"
43 -HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
44 -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
45 -S=${WORKDIR}/${MY_P}
46 -
47 -LICENSE="MIT"
48 -SLOT="0"
49 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
50 -
51 -# TODO: support other mysql variants
52 -BDEPEND="
53 - test? (
54 - dev-db/mariadb[server]
55 - )"
56 -
57 -distutils_enable_tests pytest
58 -
59 -src_prepare() {
60 - # Auth tests don't support socket auth
61 - find tests/ -name '*_auth.py' -delete || die
62 -
63 - distutils-r1_src_prepare
64 -}
65 -
66 -src_test() {
67 - if [[ -z "${USER}" ]] ; then
68 - # Tests require system user
69 - local -x USER="$(whoami)"
70 - einfo "USER set to '${USER}'"
71 - fi
72 -
73 - local mysql_install_db_cmd="${EPREFIX}/usr/share/mariadb/scripts/mysql_install_db"
74 - [[ ! -x "${mysql_install_db_cmd}" ]] && mysql_install_db_cmd="${EPREFIX}/usr/bin/mysql_install_db"
75 - [[ ! -x "${mysql_install_db_cmd}" ]] && die "mysql_install_db command not found!"
76 -
77 - local mysqld_cmd="${EPREFIX}/usr/sbin/mysqld"
78 - [[ ! -x "${mysqld_cmd}" ]] && die "mysqld command not found!"
79 -
80 - local PIDFILE="${T}/mysqld.pid"
81 - if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
82 - einfo "Killing already running mysqld process ..."
83 - pkill -F "${PIDFILE}"
84 - fi
85 -
86 - if [[ -d "${T}/mysql" ]] ; then
87 - einfo "Removing already existing mysqld data dir ..."
88 - rm -rf "${T}/mysql" || die
89 - fi
90 -
91 - einfo "Creating mysql test instance ..."
92 - mkdir -p "${T}"/mysql || die
93 - "${mysql_install_db_cmd}" \
94 - --no-defaults \
95 - --auth-root-authentication-method=normal \
96 - --basedir="${EPREFIX}/usr" \
97 - --datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
98 - || die
99 -
100 - einfo "Starting mysql test instance ..."
101 - # TODO: random port
102 - "${mysqld_cmd}" \
103 - --no-defaults \
104 - --character-set-server=utf8 \
105 - --bind-address=127.0.0.1 \
106 - --port=43306 \
107 - --pid-file="${T}"/mysqld.pid \
108 - --socket="${T}"/mysqld.sock \
109 - --datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
110 -
111 - # wait for it to start
112 - local i
113 - for (( i = 0; i < 10; i++)); do
114 - [[ -S ${T}/mysqld.sock ]] && break
115 - sleep 1
116 - done
117 - [[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
118 -
119 - einfo "Configuring test mysql instance ..."
120 -
121 - # create test user for auth tests
122 - mysql -uroot --socket="${T}"/mysqld.sock -s -e '
123 - INSTALL SONAME "auth_ed25519";
124 - CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so";
125 - ' || die "Failed to set up auth_ed25519"
126 -
127 - mysql -uroot --socket="${T}"/mysqld.sock -s -e "
128 - SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";');
129 - SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";');
130 - " || die "Failed to create ed25519 test users"
131 -
132 - # create test databases
133 - mysql -uroot --socket="${T}"/mysqld.sock -s -e '
134 - create database test1 DEFAULT CHARACTER SET utf8mb4;
135 - create database test2 DEFAULT CHARACTER SET utf8mb4;
136 -
137 - create user test2 identified by "some password";
138 - grant all on test2.* to test2;
139 -
140 - create user test2@localhost identified by "some password";
141 - grant all on test2.* to test2@localhost;
142 - ' || die "Failed to create test databases"
143 -
144 - cat > pymysql/tests/databases.json <<-EOF || die
145 - [{
146 - "host": "localhost",
147 - "user": "root",
148 - "password": "",
149 - "database": "test1",
150 - "use_unicode": true,
151 - "local_infile": true,
152 - "unix_socket": "${T}/mysqld.sock"
153 - }, {
154 - "host": "localhost",
155 - "user": "root",
156 - "password": "",
157 - "database": "test2",
158 - "unix_socket": "${T}/mysqld.sock"
159 - }]
160 - EOF
161 -
162 - distutils-r1_src_test
163 -
164 - if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
165 - einfo "Stopping mysql test instance ..."
166 - pkill -F "${PIDFILE}"
167 - fi
168 -}
169 -
170 -python_test() {
171 - local excludes=(
172 - # requires some dialog plugin
173 - pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin
174 - pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin
175 - )
176 -
177 - PYTHONPATH=. pytest -vv ${excludes[@]/#/--deselect } ||
178 - die "Tests failed with ${EPYTHON}"
179 -}