From nobody Fri Jun 3 14:00:40 2022 X-Original-To: dev-commits-ports-all@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 E032F1B5B15F; Fri, 3 Jun 2022 14:00:41 +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 4LF4KN51JDz3FFp; Fri, 3 Jun 2022 14:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654264840; 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=OY3qCYoXM2FmMHnpAZVUai1AgU+Bag5DDig01DoNc1U=; b=RPkQ30jOQHYYrBy61Pvbd2SP3pA1ZlArsnZ2XDMdm1LsZE08G9Qnf/+ir/79W9wDPpxkZ1 jKvqbbgVTYl0RTzp1/6pkTi/xbDpdnSKCOmNE6sI/jARmGh7iSiC1JLiCaTxnSy4ML6V3P A/vyo0+f0P3BL86hczq3bxLUvmJ6ukMAALckA8DE7n/qYICvbXG5pqmr455YqIc142S+hh PGBW2D4DwlWzla0i1aCTL8rDcKSKN+peJSRTnpFhp8HsrB7UaHCdluQpcG7gxyq1SHl1zm 9itsaKVceCoaK+QQmdrjR9q0AIQF2mLW0oPhTmOeBWwlRI4pWEydxgKNr5eV9Q== 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 7586B24A9; Fri, 3 Jun 2022 14:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 253E0ePv098825; Fri, 3 Jun 2022 14:00:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 253E0eDt098824; Fri, 3 Jun 2022 14:00:40 GMT (envelope-from git) Date: Fri, 3 Jun 2022 14:00:40 GMT Message-Id: <202206031400.253E0eDt098824@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: 69b778db07d8 - main - devel/py-jsonschema: Fix build with setuptools 61.0.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 69b778db07d83c8dd7a95282aee72ff446da3220 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654264840; 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=OY3qCYoXM2FmMHnpAZVUai1AgU+Bag5DDig01DoNc1U=; b=adCJw1K0nR46FQbs2qN+/+G7eBCVNZdyu++RMrtipzKEUtz10lKhLKh59S2twf4/fKwy+l wxLLTzMKISsNX1dPQB0pCVNS7kfrMIISrYxJkD0gmm3CLTS8Fxo2UjfbC5LWW6OmPiC14e BeeERSNBjW8u8bboMFygwgHTHk9uGsdJlLl11bMMX4humXA2zzyY+fxYwSNMmR1shqwb/U oT9JrTl0rE+YdSysqmBK2LBBnDaF8FyICqhe6c+pFqGHfvibJIywpJoFw/oCIBYTZKoNGZ DsBqR4MK+/faQZwgL/00FemGdlqeM5DxTyml8J7t+2EIVGRYYRZtDGRglUfxpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654264840; a=rsa-sha256; cv=none; b=Fnn8pqGSgSenAj6OKn7OP927Tntdcp4FXHf5hONvAolHG8skNePMgsadJIOUwpaYwuSaLc 8YHc8LmwyitI9kLq0KQlOJpIuxFuIXttTJk5wFX+/s7DdL3P8ACUZEMV1fsowrh4KSAIuf RIq6h2VYOq+B8wIyyH4m+RvBpl0ugbgDxhGI+Uq8E/oHEmgvbdO9GGMtU+trOH1OSV3ha4 vwlARONK6aWr8lhrmGdNI6qPrlnK/SWaTX6U4OM17rLB15kUBpgq9Ty6E37gAdgQd1JGKH yIMX1+XVVqIcwwrRb1uSOEKzriLFRecVeM6OtFPUDmQ7T5uTp5RY8TzZCI5Eww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=69b778db07d83c8dd7a95282aee72ff446da3220 commit 69b778db07d83c8dd7a95282aee72ff446da3220 Author: Po-Chuan Hsieh AuthorDate: 2022-06-03 13:57:49 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-06-03 13:59:14 +0000 devel/py-jsonschema: Fix build with setuptools 61.0.0+ error: Multiple top-level packages discovered in a flat-layout: ['json', 'jsonschema']. To avoid accidental inclusion of unwanted files or directories, setuptools will not proceed with this build. If you are trying to create a single distribution with multiple packages on purpose, you should not rely on automatic discovery. Instead, consider the following options: 1. set up custom discovery (`find` directive with `include` or `exclude`) 2. use a `src-layout` 3. explicitly set `py_modules` or `packages` with a list of names To find more information, look for "package discovery" on setuptools docs. *** Error code 1 With hat: python --- devel/py-jsonschema/files/patch-setup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/devel/py-jsonschema/files/patch-setup.py b/devel/py-jsonschema/files/patch-setup.py index 227f59f8fe78..aadc6f44df9f 100644 --- a/devel/py-jsonschema/files/patch-setup.py +++ b/devel/py-jsonschema/files/patch-setup.py @@ -1,9 +1,12 @@ ---- setup.py.orig 2021-10-29 19:19:35 UTC +--- setup.py.orig 2022-06-03 09:53:13 UTC +++ setup.py -@@ -0,0 +1,6 @@ +@@ -0,0 +1,9 @@ +#!/usr/bin/env python + +import setuptools + +if __name__ == "__main__": -+ setuptools.setup() ++ setuptools.setup( ++ packages=['jsonschema'], ++ use_scm_version=True, ++ )