From nobody Wed Mar 15 11:04:03 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 4Pc6w343Bxz3yN38; Wed, 15 Mar 2023 11:04:03 +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 4Pc6w33WrWz45Xr; Wed, 15 Mar 2023 11:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678878243; 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=u03lKJYge8reYhuCMSJWxmDoMc5cNEMO1weFwz/kTN8=; b=s1GjKsF9De3QRh1pSbHnwJNPvUkDaUUJMqa1XhaB3bsJKyR273mA4sAn8KLo2rGHb0C4tz L+R9w42NojS9Jb2ke/FZbc+JwHN9qG7bEylzJC7DyBNY8Gz4MEHG27Icc99H32gkGUfS+R 8FUfpd8ijJiVlGyilgsZYyhcES0f89a3xQPrbuWDvlZvr4ZWSjFSerNClcmooAvAUWetIN cQbCkxv6Va4uZOTMwZqNZnqAI2pDXU/a47NLfxFS5vHdnv4xdT366ajbTf445A5WhpZ62Q xWYbX1ZW91lniShXjZApfZWWFzc1cQ6izkvsSolV29+XakErmRbusYt1zih1qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678878243; 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=u03lKJYge8reYhuCMSJWxmDoMc5cNEMO1weFwz/kTN8=; b=KhEDKO2UQiOmp8fpjsCI4U/cXqz28+vvijmvsoluURCaDc/e4w3GeQBTYh1pNERQDcJtwA W/GkGJqYFLuJD2X+DtLJ2akuCQVMxwi+io0PYskS6JzLtLSAhsTH7Sd1705L7Y/k7N/+Pl MKYBizKhAj/pCqT0/o8uqz/gVXoKbgko0H/+JRzPWwihLarwOGqT8AqChQ75UMtBum2dIP c6AZZIpmUEKo5iuLAU5FRdYWA1znL250Z37exzoFpEGkuY9CT3Ii7yQclNZ05TgSZjNVnb P/60WjIeId3wD3Q/i7fVeb/oD+RPlkW7gF2TOOm1BajOAEF+WZOgCm0splxJ7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678878243; a=rsa-sha256; cv=none; b=Yz4JkFlLwm/NzVXPtYHfpHxqaClsnoIAOb3q5CFj+y3GYgB86DllA3TXek+dQhjdpQ6fAF tQU7PeDBGHPpty5M9jO8921u1mKZNcsHi9r+C09tnrcCWy2JPTbGhyZMLJxktqZoCaO4lb BdNhFQvcpjRAaxdwkCvtiTKoK7mvZgrq+9EaWzMleM1HdHzAYJirFy6GV860VNQ6ICYikk HggG5VPoG97t6uXXp/E8qMJ9fRqJhKMLKf7fM9uRqcbq5wEYqEkOByA2GLKIuA1991bAFn +0xRdL4w0bln+Z0zll3HTg3pQz35xvawJu9068NAm6CegDOnKwoK1QQa4bMvcw== 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 4Pc6w32Zjgz1Dg4; Wed, 15 Mar 2023 11:04:03 +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 32FB433Z099736; Wed, 15 Mar 2023 11:04:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32FB43eb099735; Wed, 15 Mar 2023 11:04:03 GMT (envelope-from git) Date: Wed, 15 Mar 2023 11:04:03 GMT Message-Id: <202303151104.32FB43eb099735@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: 34cd65b8b111 - main - devel/py-jsonschema: Fix PLIST 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: 34cd65b8b1112bc99ed646166024ab624a3f4c0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=34cd65b8b1112bc99ed646166024ab624a3f4c0a commit 34cd65b8b1112bc99ed646166024ab624a3f4c0a Author: Kai Knoblich AuthorDate: 2023-03-15 11:02:24 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-03-15 11:03:55 +0000 devel/py-jsonschema: Fix PLIST - Switch to PEP517 and get rid of the setuptools workaround - Add a missing dependency for Python 3.8 packages - Simplify the test framework by using USE_PYTHON=pytest - Bump PORTREVISION due changed package content. PR: 270225 --- devel/py-jsonschema/Makefile | 17 ++++---- devel/py-jsonschema/files/patch-setup.py | 69 -------------------------------- 2 files changed, 10 insertions(+), 76 deletions(-) diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile index fe46c8436aff..c4e4f3c28c2f 100644 --- a/devel/py-jsonschema/Makefile +++ b/devel/py-jsonschema/Makefile @@ -1,5 +1,6 @@ PORTNAME= jsonschema PORTVERSION= 4.17.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,13 +12,17 @@ WWW= https://github.com/Julian/jsonschema LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>=0:devel/py-hatch-fancy-pypi-readme@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0:devel/py-hatch-vcs@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=17.4.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyrsistent>=0.14.0:devel/py-pyrsistent@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} USES= python:3.7+ -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent pep517 pytest + +TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} CONFLICTS_INSTALL= py*-jsonschema3 # bin/jsonschema @@ -26,7 +31,8 @@ NO_ARCH= yes .include .if ${PYTHON_REL} < 30900 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pkgutil-resolve-name>=0:devel/py-pkgutil-resolve-name@${PY_FLAVOR} .endif .if ${PYTHON_REL} < 30800 @@ -34,7 +40,4 @@ RUN_DEPEDNS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-me ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} .endif -do-test: - cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m tox - .include diff --git a/devel/py-jsonschema/files/patch-setup.py b/devel/py-jsonschema/files/patch-setup.py deleted file mode 100644 index 87d491aaca85..000000000000 --- a/devel/py-jsonschema/files/patch-setup.py +++ /dev/null @@ -1,69 +0,0 @@ ---- setup.py.orig 2022-07-20 21:49:12 UTC -+++ setup.py -@@ -0,0 +1,66 @@ -+# -*- coding: utf-8 -*- -+from setuptools import setup -+ -+setup( -+ name='jsonschema', -+ version='4.11.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', -+ ], -+ package_data={'': ['*']}, -+)