From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1551572-garchives=archives.gentoo.org@lists.gentoo.org> 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 9EDA015800A for <garchives@archives.gentoo.org>; Sat, 2 Sep 2023 14:11:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C59B2BC02D; Sat, 2 Sep 2023 14:11:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65B162BC02B for <gentoo-commits@lists.gentoo.org>; Sat, 2 Sep 2023 14:11:06 +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 4F80C340DB8 for <gentoo-commits@lists.gentoo.org>; Sat, 2 Sep 2023 14:11:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E117B110B for <gentoo-commits@lists.gentoo.org>; Sat, 2 Sep 2023 14:11:02 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> 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" <mgorny@gentoo.org> Message-ID: <1693663854.6163b8f165559df6e58a8ebcb7d88a3956e45db4.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/peewee/, dev-python/peewee/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/peewee/Manifest dev-python/peewee/files/peewee-3.16.2-cython3.patch dev-python/peewee/peewee-3.16.2-r1.ebuild dev-python/peewee/peewee-3.16.2.ebuild X-VCS-Directories: dev-python/peewee/files/ dev-python/peewee/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6163b8f165559df6e58a8ebcb7d88a3956e45db4 X-VCS-Branch: master Date: Sat, 2 Sep 2023 14:11:02 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 24e6a0fa-71d7-4c9f-94e9-1ae6f520ad96 X-Archives-Hash: b0197a794e0dcd02df0e028e139a50c7 commit: 6163b8f165559df6e58a8ebcb7d88a3956e45db4 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Sep 2 13:56:09 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Sep 2 14:10:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6163b8f1 dev-python/peewee: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/peewee/Manifest | 1 - .../peewee/files/peewee-3.16.2-cython3.patch | 102 --------------------- dev-python/peewee/peewee-3.16.2-r1.ebuild | 62 ------------- dev-python/peewee/peewee-3.16.2.ebuild | 57 ------------ 4 files changed, 222 deletions(-) diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest index c71a992f9a73..adb8e22e753e 100644 --- a/dev-python/peewee/Manifest +++ b/dev-python/peewee/Manifest @@ -1,2 +1 @@ -DIST peewee-3.16.2.gh.tar.gz 912162 BLAKE2B d865a63fb0eeff064b6655029741291ebd002ffa428fe98f87b319874713064eed9500fb45e3710b7e1223ea2537408d51dc4a6f40b525467f074f225c05bf20 SHA512 7e507d9f2ace45c5ec482d657e7722812fae10eea9a23b12caf2611d3739bc6dc70800f21d606d5e854e3209dd6d2ff73b93f004515f6549c3bbc423bce650d8 DIST peewee-3.16.3.gh.tar.gz 913271 BLAKE2B c243eaa0baa1289030f294141a0fa469682272b87aa9cf89cc2ff628c0f35e6824ee6215c11c12dbc992f210afbd2c9e5efebbc9efa402d92cc2de77dd574e5f SHA512 e940c0fc78c736477b2550379912587f2129bf6c11252a04188a70d260410539ef90879dcf4145466c3276130b33c85b53db80afb5503b7b76693155d5f8abbe diff --git a/dev-python/peewee/files/peewee-3.16.2-cython3.patch b/dev-python/peewee/files/peewee-3.16.2-cython3.patch deleted file mode 100644 index 5ddbd7ae9377..000000000000 --- a/dev-python/peewee/files/peewee-3.16.2-cython3.patch +++ /dev/null @@ -1,102 +0,0 @@ -https://github.com/coleifer/peewee/commit/83c6b78bd5df2c8c942f4fc32c4daedde01e8a63 - -From 83c6b78bd5df2c8c942f4fc32c4daedde01e8a63 Mon Sep 17 00:00:00 2001 -From: Charles Leifer <coleifer@gmail.com> -Date: Tue, 18 Jul 2023 17:37:27 -0500 -Subject: [PATCH] Changes for Cython 3.0 - ---- a/playhouse/_sqlite_ext.pyx -+++ b/playhouse/_sqlite_ext.pyx -@@ -386,7 +386,7 @@ ctypedef struct peewee_cursor: - # We define an xConnect function, but leave xCreate NULL so that the - # table-function can be called eponymously. - cdef int pwConnect(sqlite3 *db, void *pAux, int argc, const char *const*argv, -- sqlite3_vtab **ppVtab, char **pzErr) with gil: -+ sqlite3_vtab **ppVtab, char **pzErr) noexcept with gil: - cdef: - int rc - object table_func_cls = <object>pAux -@@ -407,7 +407,7 @@ cdef int pwConnect(sqlite3 *db, void *pAux, int argc, const char *const*argv, - return rc - - --cdef int pwDisconnect(sqlite3_vtab *pBase) with gil: -+cdef int pwDisconnect(sqlite3_vtab *pBase) noexcept with gil: - cdef: - peewee_vtab *pVtab = <peewee_vtab *>pBase - object table_func_cls = <object>(pVtab.table_func_cls) -@@ -419,7 +419,8 @@ cdef int pwDisconnect(sqlite3_vtab *pBase) with gil: - - # The xOpen method is used to initialize a cursor. In this method we - # instantiate the TableFunction class and zero out a new cursor for iteration. --cdef int pwOpen(sqlite3_vtab *pBase, sqlite3_vtab_cursor **ppCursor) with gil: -+cdef int pwOpen(sqlite3_vtab *pBase, sqlite3_vtab_cursor **ppCursor) \ -+ noexcept with gil: - cdef: - peewee_vtab *pVtab = <peewee_vtab *>pBase - peewee_cursor *pCur = <peewee_cursor *>0 -@@ -443,7 +444,7 @@ cdef int pwOpen(sqlite3_vtab *pBase, sqlite3_vtab_cursor **ppCursor) with gil: - return SQLITE_OK - - --cdef int pwClose(sqlite3_vtab_cursor *pBase) with gil: -+cdef int pwClose(sqlite3_vtab_cursor *pBase) noexcept with gil: - cdef: - peewee_cursor *pCur = <peewee_cursor *>pBase - object table_func = <object>pCur.table_func -@@ -454,7 +455,7 @@ cdef int pwClose(sqlite3_vtab_cursor *pBase) with gil: - - # Iterate once, advancing the cursor's index and assigning the row data to the - # `row_data` field on the peewee_cursor struct. --cdef int pwNext(sqlite3_vtab_cursor *pBase) with gil: -+cdef int pwNext(sqlite3_vtab_cursor *pBase) noexcept with gil: - cdef: - peewee_cursor *pCur = <peewee_cursor *>pBase - object table_func = <object>pCur.table_func -@@ -483,7 +484,7 @@ cdef int pwNext(sqlite3_vtab_cursor *pBase) with gil: - - # Return the requested column from the current row. - cdef int pwColumn(sqlite3_vtab_cursor *pBase, sqlite3_context *ctx, -- int iCol) with gil: -+ int iCol) noexcept with gil: - cdef: - bytes bval - peewee_cursor *pCur = <peewee_cursor *>pBase -@@ -502,7 +503,7 @@ cdef int pwColumn(sqlite3_vtab_cursor *pBase, sqlite3_context *ctx, - return python_to_sqlite(ctx, row_data[iCol]) - - --cdef int pwRowid(sqlite3_vtab_cursor *pBase, sqlite3_int64 *pRowid): -+cdef int pwRowid(sqlite3_vtab_cursor *pBase, sqlite3_int64 *pRowid) noexcept: - cdef: - peewee_cursor *pCur = <peewee_cursor *>pBase - pRowid[0] = <sqlite3_int64>pCur.idx -@@ -510,7 +511,7 @@ cdef int pwRowid(sqlite3_vtab_cursor *pBase, sqlite3_int64 *pRowid): - - - # Return a boolean indicating whether the cursor has been consumed. --cdef int pwEof(sqlite3_vtab_cursor *pBase): -+cdef int pwEof(sqlite3_vtab_cursor *pBase) noexcept: - cdef: - peewee_cursor *pCur = <peewee_cursor *>pBase - return 1 if pCur.stopped else 0 -@@ -520,7 +521,8 @@ cdef int pwEof(sqlite3_vtab_cursor *pBase): - # get access to the parameters that the function was called with, and call the - # TableFunction's `initialize()` function. - cdef int pwFilter(sqlite3_vtab_cursor *pBase, int idxNum, -- const char *idxStr, int argc, sqlite3_value **argv) with gil: -+ const char *idxStr, int argc, sqlite3_value **argv) \ -+ noexcept with gil: - cdef: - peewee_cursor *pCur = <peewee_cursor *>pBase - object table_func = <object>pCur.table_func -@@ -572,7 +574,7 @@ cdef int pwFilter(sqlite3_vtab_cursor *pBase, int idxNum, - # SQLite will (in some cases, repeatedly) call the xBestIndex method to try and - # find the best query plan. - cdef int pwBestIndex(sqlite3_vtab *pBase, sqlite3_index_info *pIdxInfo) \ -- with gil: -+ noexcept with gil: - cdef: - int i - int col_idx - diff --git a/dev-python/peewee/peewee-3.16.2-r1.ebuild b/dev-python/peewee/peewee-3.16.2-r1.ebuild deleted file mode 100644 index d3b5361362fb..000000000000 --- a/dev-python/peewee/peewee-3.16.2-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -DESCRIPTION="Small Python ORM" -HOMEPAGE=" - https://github.com/coleifer/peewee/ - https://pypi.org/project/peewee/ -" -SRC_URI=" - https://github.com/coleifer/${PN}/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" -IUSE="examples +native-extensions test" -RESTRICT="!test? ( test )" - -DEPEND=" - native-extensions? ( dev-db/sqlite:3= ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}"/${P}-cython3.patch -) - -distutils_enable_sphinx docs - -src_compile() { - # native-extensions are always disabled on PyPy - # https://github.com/coleifer/peewee/blob/master/setup.py#L35..L37 - if ! use native-extensions; then - local -x NO_SQLITE=1 - fi - - distutils-r1_src_compile -} - -python_test() { - "${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - use examples && DOCS=( examples/ ) - distutils-r1_python_install_all -} diff --git a/dev-python/peewee/peewee-3.16.2.ebuild b/dev-python/peewee/peewee-3.16.2.ebuild deleted file mode 100644 index 5899a2ffb369..000000000000 --- a/dev-python/peewee/peewee-3.16.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -DESCRIPTION="Small Python ORM" -HOMEPAGE=" - https://github.com/coleifer/peewee/ - https://pypi.org/project/peewee/ -" -SRC_URI=" - https://github.com/coleifer/${PN}/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="examples +native-extensions test" -RESTRICT="!test? ( test )" - -DEPEND=" - native-extensions? ( dev-db/sqlite:3= ) -" -RDEPEND=" - ${DEPEND} -" -# <cython-3 for bug #911412 -BDEPEND=" - <dev-python/cython-3[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs - -src_compile() { - if ! use native-extensions; then - local -x NO_SQLITE=1 - fi - - distutils-r1_src_compile -} - -python_test() { - "${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - use examples && DOCS=( examples/ ) - distutils-r1_python_install_all -}