From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- dev-python/pymysql/Manifest | 9 +- .../pymysql/files/pymysql-0.10.0-fix-tests.patch | 30 ----- dev-python/pymysql/pymysql-0.10.1.ebuild | 138 -------------------- dev-python/pymysql/pymysql-1.0.0.ebuild | 144 --------------------- dev-python/pymysql/pymysql-1.0.1.ebuild | 143 -------------------- dev-python/pymysql/pymysql-1.0.2.ebuild | 2 +- 6 files changed, 2 insertions(+), 464 deletions(-) delete mode 100644 dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch delete mode 100644 dev-python/pymysql/pymysql-0.10.1.ebuild delete mode 100644 dev-python/pymysql/pymysql-1.0.0.ebuild delete mode 100644 dev-python/pymysql/pymysql-1.0.1.ebuild (limited to 'dev-python/pymysql') diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest index 5730a06a9038..80f2e7539ca1 100644 --- a/dev-python/pymysql/Manifest +++ b/dev-python/pymysql/Manifest @@ -1,10 +1,3 @@ -AUX pymysql-0.10.0-fix-tests.patch 1471 BLAKE2B 058afeda49c45bbb2421301d2ad270a9de111e3d24322c268d2dcba2867d3dd169117e9af9d7d63bc8d3b59f6ef0e570febc0d3d2232531c91942c3d13dc119c SHA512 312e37ae1943bd1db3b44a28832a55dade62c38b8ff042b4ce4d7beb8bc2c74d87e61d7b1e44dc583072450a3951dc05c504cab15a0d9b9f0fa562efa276ae36 -DIST pymysql-0.10.1.tar.gz 86441 BLAKE2B 8e33fbba0544dad68c3eeb5bd538c4bce121222b4660ad06c3c0224b5db6a6c9f45d6697a98d5f0ba20429afa204d46c9ce57a4d9696dbc2a35649c6253a645b SHA512 edc702c54a33350f75648765c60d4cf455449e88818948b018585d557bea280e626d23b1279a410765f2de8e35b3c22ea5c8e0ef3dc72588b674c93a2124a224 -DIST pymysql-1.0.0.tar.gz 85033 BLAKE2B 792b472c2a230e823cca9deed5adc03a004e34b09594d998c1df332769b93dde3f0b84a11f1b1ac83b6be34fe661194d3c780d6a5bb0facf193d2f46a807a7b8 SHA512 52c4ad45f31725bcbb313d4d1bea52bb52c82ad9573a58dd8cca14e844ff9d7e3831debb3bd08d00a07cc32625b15692138947ccd9ad3bed7f869a7bd69357b3 -DIST pymysql-1.0.1.tar.gz 84902 BLAKE2B b6a84f288c016849897d05ce97b87e3d58dc7b08acc8f66df16142d645f70a990c8a0acae9f57ff9f00f5cb58ff77e72c7f2d7ccf76af1c12e694d54b0daa080 SHA512 0c8ca8e3ee3fd1515621875117884120d33e18b36c90b71a6923aa01f482423a47c55ea333169c77e3cceaa2577805f2ebe387acf7f80dc525f605f3b4328906 DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638 -EBUILD pymysql-0.10.1.ebuild 3575 BLAKE2B c684de808de2dca09235e4551390b798c43a0c7c03d5cd019941ac3ae59d4c68fbcc169a5c107f7efb19d14534fa9b4c2832cc38a7ff1e0c28814a49483b69be SHA512 c1939f1bd259cc2ba8c5797fdc65a346983b293cc40205c743a1ea5b130b5cfd4354bad546283699491436ac028780b70a590d95d0ab1f67c32f3ce57910326d -EBUILD pymysql-1.0.0.ebuild 3835 BLAKE2B 4ab8768cc3fd61836d9167a719a54410d309090c2397b9af21f445bcfc1c0ffc61ac0ab4bce584ec5d6e923ac13f273da685ede8442775415616054c8d03dc47 SHA512 130904df4d13e4c1df55769a7594c35e195ad126f72ac4b6f9a8bc1b9fab6b31f277c99ab2342b03418c2de0fe492deb265f04022da3f48eb383461ff4e5851d -EBUILD pymysql-1.0.1.ebuild 3799 BLAKE2B 23e3203c7f29d7573263252c45fa4b238bef0b2bbad425af5741fe3282f876fb948ca7941a942326b8447a6f5311f093d300699dd0e4d6491c5816740b17535a SHA512 7f3e558a3f0ee7694bb6bb569112d69dadc77cf788df1c91009dcb657d08a9204032cc2c76b54435c6e13a2a1737c59938a54928b742d737c67913fafc777842 -EBUILD pymysql-1.0.2.ebuild 3799 BLAKE2B 23e3203c7f29d7573263252c45fa4b238bef0b2bbad425af5741fe3282f876fb948ca7941a942326b8447a6f5311f093d300699dd0e4d6491c5816740b17535a SHA512 7f3e558a3f0ee7694bb6bb569112d69dadc77cf788df1c91009dcb657d08a9204032cc2c76b54435c6e13a2a1737c59938a54928b742d737c67913fafc777842 +EBUILD pymysql-1.0.2.ebuild 3797 BLAKE2B 9c57667606aee1eebba23f07b8ba84f0da467e3eca4cc7729cd4792bcfab5193a96d4fea95f48eca1650ba5c31dc0d9660825e308fe02a804184d69705dcc01a SHA512 be2a0dc58e51598b9f7acdcab0ee0b2d1db473a572e90df9bd772bb4c645bb1717009f35819624fd4e70b671c4e054427bdebc5f97a4443f37486d53b0e05a4f MISC metadata.xml 493 BLAKE2B df91299acd855c04a29b3c0cf33b450de6a9687b3c45a0c59cc55a69c544d561f107da1d90a1b52dffaa13fe218cef978edb4b7036eb62651da7de39568fdc00 SHA512 ae8cbe0ea29c8457dbbfd4cc21169fce54b868f93045f5ebbd9c8909b052c7efa2cedacc1ba5ec13d1ab9476b39cc595a52ee9ceb489b6aec3f824f2027fc4c6 diff --git a/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch b/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch deleted file mode 100644 index aa9bc53b0358..000000000000 --- a/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/pymysql/tests/test_connection.py -+++ b/pymysql/tests/test_connection.py -@@ -70,6 +70,9 @@ class TestAuthentication(base.PyMySQLTestCase): - for r in cur: - if (r[1], r[2]) != (u'ACTIVE', u'AUTHENTICATION'): - continue -+ if r[0] == u'unix_socket': -+ socket_plugin_name = r[0] -+ socket_found = True - if r[3] == u'auth_socket.so': - socket_plugin_name = r[0] - socket_found = True -@@ -188,7 +191,7 @@ class TestAuthentication(base.PyMySQLTestCase): - cur.execute("install plugin two_questions soname 'dialog_examples.so'") - TestAuthentication.two_questions_found = True - self.realTestDialogAuthTwoQuestions() -- except pymysql.err.InternalError: -+ except pymysql.err.OperationalError: - pytest.skip('we couldn\'t install the two_questions plugin') - finally: - if TestAuthentication.two_questions_found: -@@ -218,7 +221,7 @@ class TestAuthentication(base.PyMySQLTestCase): - cur.execute("install plugin three_attempts soname 'dialog_examples.so'") - TestAuthentication.three_attempts_found = True - self.realTestDialogAuthThreeAttempts() -- except pymysql.err.InternalError: -+ except pymysql.err.OperationalError: - pytest.skip('we couldn\'t install the three_attempts plugin') - finally: - if TestAuthentication.three_attempts_found: diff --git a/dev-python/pymysql/pymysql-0.10.1.ebuild b/dev-python/pymysql/pymysql-0.10.1.ebuild deleted file mode 100644 index 16fe5df53ccf..000000000000 --- a/dev-python/pymysql/pymysql-0.10.1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..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 -) - -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-1.0.0.ebuild b/dev-python/pymysql/pymysql-1.0.0.ebuild deleted file mode 100644 index eaf0ceedb45c..000000000000 --- a/dev-python/pymysql/pymysql-1.0.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..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" - -# TODO: support other mysql variants -BDEPEND=" - test? ( - dev-db/mariadb[server] - dev-python/mock[${PYTHON_USEDEP}] - )" - -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 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 "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}" -} diff --git a/dev-python/pymysql/pymysql-1.0.1.ebuild b/dev-python/pymysql/pymysql-1.0.1.ebuild deleted file mode 100644 index fb5e6f2df416..000000000000 --- a/dev-python/pymysql/pymysql-1.0.1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..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" - -# 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 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 "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}" -} diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild index fb5e6f2df416..dbbedb942643 100644 --- a/dev-python/pymysql/pymysql-1.0.2.ebuild +++ b/dev-python/pymysql/pymysql-1.0.2.ebuild @@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P} LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" # TODO: support other mysql variants BDEPEND=" -- cgit v1.2.3