From nobody Tue Nov 14 17:19:22 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SVChW1lyHz51Yd7; Tue, 14 Nov 2023 17:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SVChW19Dsz4YD5; Tue, 14 Nov 2023 17:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OK7sIQGvhFy/Wv+oR+RAaIIyz/E1ti8fXxZHt6lHaxA=; b=MKnwhYkAey3YyCjp+M20711m05Z+AmAvApSdhzrN5+AwrtboffTSc6H+StaUMGQMq+BX8+ Lmur/0BWWpNyO9MV+VzRVrvDqWmRYsSWITY5QplMzkGPMf7RIyOOGJquVNBEnda/qpbPUC zieogOuBjU/LLPE7RytYS0tQKsqm9GoOJw3c9sCgPtuhSeHRCwIsQrtef8nuH0s74ohLNR zrWcM/GaP9Mh/rXdLlk9QcA+WohygbDAk2FznUZB91ceVpCyivLxFz+FDUHiahoc3nh+Sb PEbtxKwx3adKCycOGa+6qMjk+EFWgtTm0Z31ZybBV74MjpkwgKC0pAT0ux/p6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OK7sIQGvhFy/Wv+oR+RAaIIyz/E1ti8fXxZHt6lHaxA=; b=drFaQX32njsF1y+QhxO6qonGuiZoVN4BDuMgUBPt7qaDjO6PaAcgCS+XkeMKQ0gvLiwBVC LF5IbuNV4zlY0lPc/SF8qbNFtBfuWk8wkmmqje3XRNtu95rwaKisE7jW70EX9TCkT6gm1c HkxTeRb5/wKQwDl+3Sl2u9of8S3bzbE0dEVRPA6nkKseJtXmZahbEjuk2/dB58f8TXtc1M 4wApsxXEXvcbpbtTH06t2uTqD+JFiWRf55+krg9rC3baewnjcCMZm1DGRurYmz6u8S6OlU JzJCA47euzQUMLgOrqcWfwCMy0FMyVFLGQLTcpRXfzlKCHb+LZOSGkvfdWI9qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699982363; a=rsa-sha256; cv=none; b=fhJQbp8yYtzKEqS42vC7z5rwKWxSjLLzBE6tZG4sjoNSSeRoIqcV58va+ynPXrk3TjIeco pif/aTMEBjGjlTCLYZonguw3WVD3Qd5pe+OVDF/dm5A+w9AEGs1HsReUSNY6VKzrNAH2F8 7UdKjv0io+aHbeHq/coq5ZKps+DrX5UNgCZo8cf+4EvQ4p72RDMAwo9ILg9CYu+oN92BgA ceZCvN0rnxF2ZJGOhnXojm318bO4wWYfHktIjpG+NxnTzmRYnjZ8sh207lNEVhLD60cdTW f+i8eK2dgWKYyWH1ILC8rukOTZNxm3ExEd4OwyUCMtFP5/x/9feJFsuWSi/k+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SVChW0CvXzxMT; Tue, 14 Nov 2023 17:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AEHJMOs060585; Tue, 14 Nov 2023 17:19:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEHJMZL060582; Tue, 14 Nov 2023 17:19:22 GMT (envelope-from git) Date: Tue, 14 Nov 2023 17:19:22 GMT Message-Id: <202311141719.3AEHJMZL060582@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: efa2ecc8cb2d - main - databases/py-apsw: Convert to USE_PYTHON=pep517 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efa2ecc8cb2df32980ee1ab1780811958941ee57 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=efa2ecc8cb2df32980ee1ab1780811958941ee57 commit efa2ecc8cb2df32980ee1ab1780811958941ee57 Author: Po-Chuan Hsieh AuthorDate: 2023-11-14 16:40:18 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-14 17:15:51 +0000 databases/py-apsw: Convert to USE_PYTHON=pep517 - Remove EXTENSION option - Remove patch-setup.py The patch to avoid downloading sqlite is no longer needed after we changed to use sqlite from ports tree in 1f3518399e2a82b37713b6b1c74101028e2873f4. - Bump PORTREVISION for package change Helped by: Roger Binns (author, via private mail) --- databases/py-apsw/Makefile | 13 ++++------ databases/py-apsw/files/patch-setup.py | 47 ---------------------------------- 2 files changed, 5 insertions(+), 55 deletions(-) diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile index d287dcc1a4a8..32ea37d81722 100644 --- a/databases/py-apsw/Makefile +++ b/databases/py-apsw/Makefile @@ -1,5 +1,6 @@ PORTNAME= apsw PORTVERSION= 3.43.2.0 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,18 +13,14 @@ WWW= https://rogerbinns.github.io/apsw/ \ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} + USES= localbase python sqlite -USE_PYTHON= autoplist concurrent distutils unittest +USE_PYTHON= autoplist concurrent pep517 unittest TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} -OPTIONS_DEFINE= EXTENSION -OPTIONS_DEFAULT=EXTENSION -EXTENSION_DESC= Allow loadable extensions - -EXTENSION_VARS= PYDISTUTILS_BUILDARGS+=--enable=load_extension -EXTENSION_VARS_OFF= PYDISTUTILS_BUILDARGS+=--omit=load_extension - post-patch: @${PRINTF} '[build_ext]\nuse_system_sqlite_config = True\n' > ${WRKSRC}/setup.apsw diff --git a/databases/py-apsw/files/patch-setup.py b/databases/py-apsw/files/patch-setup.py deleted file mode 100644 index a0438d426cc6..000000000000 --- a/databases/py-apsw/files/patch-setup.py +++ /dev/null @@ -1,47 +0,0 @@ ---- setup.py.orig 2023-07-25 19:42:08 UTC -+++ setup.py -@@ -260,43 +260,7 @@ class fetch(Command): - if self.sqlite: - write(" Getting the SQLite amalgamation") - -- AURL = "https://sqlite.org/sqlite-autoconf-%s.tar.gz" % (self.webversion, ) -- -- AURL = fixup_download_url(AURL) -- -- data = self.download(AURL, checksum=True) -- -- # we need to run configure to get various -DHAVE_foo flags on non-windows platforms -- # delete existing sqlite3 directory if it exists, but save sqlite3config.h if it exists -- sqlite3config_h = None -- if os.path.exists("sqlite3/sqlite3config.h"): -- sqlite3config_h = read_whole_file("sqlite3/sqlite3config.h", "rt") -- if os.path.exists('sqlite3'): -- for dirpath, dirnames, filenames in os.walk('sqlite3', topdown=False): -- for file in filenames: -- os.remove(os.path.join(dirpath, file)) -- for dir in dirnames: -- os.rmdir(os.path.join(dirpath, dir)) -- os.rmdir('sqlite3') -- # if you get an exception here it is likely that you don't have the python zlib module -- import zlib -- tar = tarfile.open("nonexistentname to keep old python happy", 'r', data) -- configmember = None -- kwargs = {} -- if sys.version_info >= (3, 11, 4): -- kwargs["filter"] = "tar" -- for member in tar.getmembers(): -- tar.extract(member, **kwargs) -- # find first file named configure -- if not configmember and member.name.endswith("/configure"): -- configmember = member -- tar.close() -- # the directory name has changed a bit with each release so try to work out what it is -- if not configmember: -- write("Unable to determine directory it extracted to.", dest=sys.stderr) -- sys.exit(19) -- dirname = configmember.name.split('/')[0] -- os.rename(dirname, 'sqlite3') -+ dirname = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sqlite3') - if sys.platform != "win32": - os.chdir('sqlite3') - write(" Running configure to work out SQLite compilation flags")