From a61e86e982e1704641730a0dce30f8d5eaec715e Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Sat, 18 Feb 2023 02:48:03 +0800 Subject: [PATCH] python-jsonschema: Remove previous build workaround With proper support for pyproject.toml-based builds in place, this is no longer necessary. Signed-off-by: Jeffery To (cherry picked from commit 107e0377637ba8ef6e46c0368b0df8f7c96a5a70) --- lang/python/python-jsonschema/Makefile | 4 +- .../python-jsonschema/patches/001-setup.patch | 104 ------------------ 2 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 lang/python/python-jsonschema/patches/001-setup.patch diff --git a/lang/python/python-jsonschema/Makefile b/lang/python/python-jsonschema/Makefile index e6c2f4c986..4c6e44d468 100644 --- a/lang/python/python-jsonschema/Makefile +++ b/lang/python/python-jsonschema/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-jsonschema PKG_VERSION:=4.17.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PYPI_NAME:=jsonschema PKG_HASH:=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d @@ -11,7 +11,7 @@ PKG_MAINTAINER:=Javier Marcet PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DEPENDS:=python-hatchling/host python-hatch-vcs/host python-hatch-fancy-pypi-readme/host python-setuptools-scm/host +PKG_BUILD_DEPENDS:=python-hatchling/host python-hatch-vcs/host python-hatch-fancy-pypi-readme/host include ../pypi.mk include $(INCLUDE_DIR)/package.mk diff --git a/lang/python/python-jsonschema/patches/001-setup.patch b/lang/python/python-jsonschema/patches/001-setup.patch deleted file mode 100644 index 0451315df7..0000000000 --- a/lang/python/python-jsonschema/patches/001-setup.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- /dev/null -+++ b/setup.py -@@ -0,0 +1,2 @@ -+from setuptools import setup -+setup(use_scm_version=True) ---- /dev/null -+++ b/setup.cfg -@@ -0,0 +1,96 @@ -+[metadata] -+name = jsonschema -+url = https://github.com/python-jsonschema/jsonschema -+project_urls = -+ Funding = https://github.com/sponsors/Julian -+ Tidelift = https://tidelift.com/subscription/pkg/pypi-jsonschema?utm_source=pypi-jsonschema&utm_medium=referral&utm_campaign=pypi-link -+ Documentation = https://python-jsonschema.readthedocs.io/ -+ Changelog = https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst -+ Source = https://github.com/python-jsonschema/jsonschema -+ Issues = https://github.com/python-jsonschema/jsonschema/issues/ -+description = An implementation of JSON Schema validation for Python -+long_description = file: README.rst -+long_description_content_type = text/x-rst -+author = Julian Berman -+author_email = Julian+jsonschema@GrayVines.com -+license = MIT -+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.7 -+ Programming Language :: Python :: 3.8 -+ Programming Language :: Python :: 3.9 -+ Programming Language :: Python :: 3.10 -+ Programming Language :: Python :: 3.11 -+ Programming Language :: Python :: Implementation :: CPython -+ Programming Language :: Python :: Implementation :: PyPy -+ -+[options] -+packages = find: -+python_requires = >=3.7 -+install_requires = -+ attrs>=17.4.0 -+ importlib_metadata;python_version<'3.8' -+ importlib_resources>=1.4.0;python_version<'3.9' -+ pyrsistent>=0.14.0,!=0.17.0,!=0.17.1,!=0.17.2 -+ typing_extensions;python_version<'3.8' -+ -+[options.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 -+ -+[options.entry_points] -+console_scripts = -+ jsonschema = jsonschema.cli:main -+ -+[options.package_data] -+jsonschema = schemas/*.json, schemas/*/*.json -+ -+[flake8] -+ban-relative-imports = true -+inline-quotes = " -+exclude = -+ jsonschema/__init__.py -+ jsonschema/_reflect.py -+ignore = -+ B008, # Barring function calls in default args. Ha, no. -+ B306, # See https://github.com/PyCQA/flake8-bugbear/issues/131 -+ W503, # (flake8 default) old PEP8 boolean operator line breaks -+ -+[mypy] -+ignore_missing_imports = true -+ -+[pydocstyle] -+match = (?!(test_|_|compat|cli)).*\.py # see PyCQA/pydocstyle#323 -+add-select = -+ D410, # Trailing whitespace plz -+add-ignore = -+ D107, # Hah, no -+ D200, # 1-line docstrings don't need to be on one line -+ D202, # One line is fine. -+ D412, # Trailing whitespace plz -+ D413, # No trailing whitespace plz -+ -+[egg_info] -+tag_build = -+tag_date = 0 -+ -- 2.30.2