git: 69b778db07d8 - main - devel/py-jsonschema: Fix build with setuptools 61.0.0+

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Fri, 03 Jun 2022 14:00:40 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=69b778db07d83c8dd7a95282aee72ff446da3220

commit 69b778db07d83c8dd7a95282aee72ff446da3220
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-06-03 13:57:49 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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,
++    )