From nobody Sun Jun 05 16:34:25 2022 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 BCCB11BDB60E; Sun, 5 Jun 2022 16:34:26 +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 4LGMdt3pj0z4m0k; Sun, 5 Jun 2022 16:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654446866; 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=QY8jP/H9luvm+05G5BZmeo26hD7LSNUP39anhbMRZGs=; b=vafIpQvHeWUdtrqqOQj7Wawnc1aFZkjFxk935sVp96upmn234zIFeX7j7FAH7kZ78tJJeR JdJbZRkwbqThDv6Z8ckx4btaUzevgOKeqxjGuOoVWGIJy1bvAUCuiNrpPod5m63KQgjtka cK7FkruYQ0/kRK3Gmpc6sT/69Qk47ILiW+jNKePSsY0R2e3AKncP2Tggxj5M1+sXSJ4dRy 05MquU0Pxo3LKEC/a/nP4c93+uY+G2D4Cf7Qo+Kl5Uyjp1fgX17E6KEMimhxrs7Sugn6/f +RKIyh2eUIKlOjS0rIY3arxSKQbnUGYsg1wZ01xc7rJgdESgR9lYBQTuUHOnGw== 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 CEBA815907; Sun, 5 Jun 2022 16:34:25 +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 255GYPHO004214; Sun, 5 Jun 2022 16:34:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 255GYPkN004213; Sun, 5 Jun 2022 16:34:25 GMT (envelope-from git) Date: Sun, 5 Jun 2022 16:34:25 GMT Message-Id: <202206051634.255GYPkN004213@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 924f4e5dfca0 - main - devel/py-jsonschema: Include schemas 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 924f4e5dfca078753a3b12db278625b7d5377857 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654446866; 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=QY8jP/H9luvm+05G5BZmeo26hD7LSNUP39anhbMRZGs=; b=JIOQgI3Gk3wWzBR19Xd5ESoHMtYrECIT+9yZFGpR15PWF1I0DrXvGfr5SHMJf0i/eS43fF boh/A+d46QPeU+Sm8cydPNfRwv82aymuZ1Es7PpyBpONSKH45lDNsNeLB1frTXthxKd/j6 g/qnCeZg3fhizcLwWxn+qcJluVYp5FJRabPajbqHdk67yeAMJOYo6t8wrBBxze/6mAWp4/ +4IoaXh4Wf/NMiPTUzpUjREaQVwphH8uP07sN+aKvzNcTMn1LS/emPtogR8RQQ4eMMVZxO BG9T7gawdl05IE//OGjQQiV//UNVw4m6zAd3LADX/fzG/NYBpFnK3wHb0OLYhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654446866; a=rsa-sha256; cv=none; b=exkeTOHcECS+3ewG+bD6fzG155cDTG/LLa5z2WJ4uq6Qj6h0HkLfJlzDXCtg4ATEzrSjgN XJ36+6LrBV+j+scvjF2zk06M7JMopUogGJQSTJKC9slStO/J8mdZ65rzcFtaulzuuPdAS0 R3R63wwp4qfVVOzNoTld0gSi+xWuvUYbsTQbFDtNnr4nhpVDe43VOveRhqKshenKWuzkJ+ nRQ//BEgUadhZ9D+y0LrQkHWDvEK1JI1MPPcbAvv/g0MQ/LD/X8uTufovNJL0B/EEdgWWO OVA1LbCmb/YVQc34c1VXRKJqhxcJvpeCjW3rvCgJm3RkryxJZpfR2anueXVeHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=924f4e5dfca078753a3b12db278625b7d5377857 commit 924f4e5dfca078753a3b12db278625b7d5377857 Author: Sascha Biberhofer AuthorDate: 2022-06-05 16:27:04 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-06-05 16:34:00 +0000 devel/py-jsonschema: Include schemas After the latest upgrade to 4.6.0 the pkg was missing the schemas file as the new hatch build system which doesn't create the full files as our building procedure requires dependency on a stub setup.py file. For future reference: The method I used for obtaining the setup.py file is to add [tool.hatch.build.targets.sdist] support-legacy = true to pyproject.toml. Afterwards, building an sdist with `python3 -m build -s` yields a corresponding archive in dist/jsonschema-4.6.0.tar.gz, from which the setup.py file can be extracted. The latter build still doesn't contain the subdirectory in MANIFEST.in though, so it didn't fix the issue entirely. While there are lots of dependent ports for now I am committing this but will look into a better solution to adapt the situation. PR: 264452 Reported by: stefan.haemmerl@gmx.de --- devel/py-jsonschema/Makefile | 1 + devel/py-jsonschema/files/patch-MANIFEST.in | 7 +++ devel/py-jsonschema/files/patch-setup.py | 76 +++++++++++++++++++++++++---- 3 files changed, 74 insertions(+), 10 deletions(-) diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile index ac0adc3c5989..6640344ef811 100644 --- a/devel/py-jsonschema/Makefile +++ b/devel/py-jsonschema/Makefile @@ -2,6 +2,7 @@ PORTNAME= jsonschema PORTVERSION= 4.6.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jsonschema/files/patch-MANIFEST.in b/devel/py-jsonschema/files/patch-MANIFEST.in new file mode 100644 index 000000000000..fb22f9988615 --- /dev/null +++ b/devel/py-jsonschema/files/patch-MANIFEST.in @@ -0,0 +1,7 @@ +--- MANIFEST.in.orig 2022-06-04 16:19:42 UTC ++++ MANIFEST.in +@@ -3,3 +3,4 @@ include *.rst + include COPYING + include pyproject.toml + include tox.ini ++graft jsonschema/schemas diff --git a/devel/py-jsonschema/files/patch-setup.py b/devel/py-jsonschema/files/patch-setup.py index aadc6f44df9f..34e2ea541b85 100644 --- a/devel/py-jsonschema/files/patch-setup.py +++ b/devel/py-jsonschema/files/patch-setup.py @@ -1,12 +1,68 @@ ---- setup.py.orig 2022-06-03 09:53:13 UTC +--- setup.py.orig 2022-06-05 15:48:47 UTC +++ setup.py -@@ -0,0 +1,9 @@ -+#!/usr/bin/env python +@@ -0,0 +1,65 @@ ++# -*- coding: utf-8 -*- ++from setuptools import setup + -+import setuptools -+ -+if __name__ == "__main__": -+ setuptools.setup( -+ packages=['jsonschema'], -+ use_scm_version=True, -+ ) ++setup( ++ name='jsonschema', ++ version='4.6.0', ++ description='An implementation of JSON Schema validation for Python', ++ long_description='==========\njsonschema\n==========\n\n|PyPI| |Pythons| |CI| |ReadTheDocs| |Precommit| |Zenodo|\n\n.. |PyPI| image:: https://img.shields.io/pypi/v/jsonschema.svg\n :alt: PyPI version\n :target: https://pypi.org/project/jsonschema/\n\n.. |Pythons| image:: https://img.shields.io/pypi/pyversions/jsonschema.svg\n :alt: Supported Python versions\n :target: https://pypi.org/project/jsonschema/\n\n.. |CI| image:: https://github.com/python-jsonschema/jsonschema/workflows/CI/badge.svg\n :alt: Build status\n :target: https://github.com/python-jsonschema/jsonschema/actions?query=workflow%3ACI\n\n.. |ReadTheDocs| image:: https://readthedocs.org/projects/python-jsonschema/badge/?version=stable&style=flat\n :alt: ReadTheDocs status\n :target: https://python-jsonschema.readthedocs.io/en/stable/\n\n.. |Precommit| image:: https://results.pre-commit.ci/badge/github/python-jsonschema/jsonschema/main.svg\n :alt: pre-commit.ci status\n :target: https://results.pre -commit.ci/latest/github/python-jsonschema/jsonschema/main\n\n.. |Zenodo| image:: https://zenodo.org/badge/3072629.svg\n :target: https://zenodo.org/badge/latestdoi/3072629\n\n\n``jsonschema`` is an implementation of the `JSON Schema\n`_ specification for Python.\n\n.. code-block:: python\n\n >>> from jsonschema import validate\n\n >>> # A sample schema, like what we\'d get from json.load()\n >>> schema = {\n ... "type" : "object",\n ... "properties" : {\n ... "price" : {"type" : "number"},\n ... "name" : {"type" : "string"},\n ... },\n ... }\n\n >>> # If no exception is raised by validate(), the instance is valid.\n >>> validate(instance={"name" : "Eggs", "price" : 34.99}, schema=schema)\n\n >>> validate(\n ... instance={"name" : "Eggs", "price" : "Invalid"}, schema=schema,\n ... ) # doctest: +IGNORE_EXCEPTION_DETAIL\n Traceback (most recent call last):\n ...\n ValidationError: \! 'Invalid\' is not of type \'number\'\n\nIt can also be used from console:\n\n.. code-block:: bash\n\n $ jsonschema --instance sample.json sample.schema\n\nFeatures\n--------\n\n* Partial support for\n `Draft 2020-12 `_ and\n `Draft 2019-09 `_,\n except for ``dynamicRef`` / ``recursiveRef`` and ``$vocabulary`` (in-progress).\n Full support for\n `Draft 7 `_,\n `Draft 6 `_,\n `Draft 4 `_\n and\n `Draft 3 `_\n\n* `Lazy validation `_\n that can iteratively report *all* validation errors.\n\n* `Programmatic querying `_\n of which properties or items failed validation.\n\n\nInstallation\n------------\n\n``jsonschema`` is available on `PyPI `_. You can install using `pip `_:\n\n.. code-block:: bash\n\n $ pip install jsonschema\n\n\nRunning the Test Suite\n----------------------\n\nIf you have ``tox`` installed (perhaps via ``pip install tox`` or your\npackage manager), running ``tox`` in the directory of your source\ncheckout will run ``jsonschema``\'s test suite on all of the versions\nof Python ``jsonschema`` supports. If you don\'t have all of the\nversions that ``jsonschema`` is tested under, you\'ll likely want to run\nusing ``tox``\'s ``--skip-missing-interpreters`` option.\n\nOf course you\'re also free to just run the tes! ts on a s! ingle version with your\nfavorite test runner. The tests live in the ``jsonschema.tests`` package.\n\n\nBenchmarks\n----------\n\n``jsonschema``\'s benchmarks make use of `pyperf\n`_. Running them can be done via::\n\n $ tox -e perf\n\n\nCommunity\n---------\n\nThe JSON Schema specification has `a Slack\n`_, with an `invite link on its home page\n`_. Many folks knowledgeable on authoring\nschemas can be found there.\n\nOtherwise, asking questions on Stack Overflow is another means of\ngetting help if you\'re stuck.\n\n\nAbout\n-----\n\nI\'m Julian Berman.\n\n``jsonschema`` is on `GitHub `_.\n\nGet in touch, via GitHub or otherwise, if you\'ve got something to contribute,\nit\'d be most welcome!\n\nYou can also generally find me on Libera (nick: ``Julian``) in various\nchannels, including ``#python``.\n\nIf you feel overwhelmingly grateful, you can also `sponsor me\n`_.\n\nAnd for companies who appreciate ``jsonschema`` and its continued support\nand growth, ``jsonschema`` is also now supportable via `TideLift\n`_.\n', ++ author='Julian Berman', ++ author_email='Julian+jsonschema@GrayVines.com', ++ classifiers=[ ++ 'Development Status :: 5 - Production/Stable', ++ 'Intended Audience :: Developers', ++ 'License :: OSI Approved :: MIT License', ++ 'Operating System :: OS Independent', ++ 'Programming Language :: Python', ++ 'Programming Language :: Python :: 3.10', ++ 'Programming Language :: Python :: 3.11', ++ 'Programming Language :: Python :: 3.7', ++ 'Programming Language :: Python :: 3.8', ++ 'Programming Language :: Python :: 3.9', ++ 'Programming Language :: Python :: Implementation :: CPython', ++ 'Programming Language :: Python :: Implementation :: PyPy', ++ ], ++ install_requires=[ ++ 'attrs>=17.4.0', ++ 'importlib-metadata; python_version < "3.8"', ++ 'importlib-resources>=1.4.0; python_version < "3.9"', ++ 'pyrsistent!=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0', ++ 'typing-extensions; python_version < "3.8"', ++ ], ++ extras_require={ ++ 'format': [ ++ 'fqdn', ++ 'idna', ++ 'isoduration', ++ 'jsonpointer>1.13', ++ 'rfc3339-validator', ++ 'rfc3987', ++ 'uri-template', ++ 'webcolors>=1.11', ++ ], ++ 'format-nongpl': [ ++ 'fqdn', ++ 'idna', ++ 'isoduration', ++ 'jsonpointer>1.13', ++ 'rfc3339-validator', ++ 'rfc3986-validator>0.1.0', ++ 'uri-template', ++ 'webcolors>=1.11', ++ ], ++ }, ++ entry_points={ ++ 'console_scripts': [ ++ 'jsonschema = jsonschema.cli:main', ++ ], ++ }, ++ packages=[ ++ 'jsonschema', ++ 'jsonschema.schemas', ++ 'jsonschema.benchmarks', ++ 'jsonschema.tests', ++ ], ++)