From 6d580319af1eca0056b5aac207efd9544503eb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 11:49:40 -0300 Subject: [PATCH 01/10] common/build-helper/rust.sh: fix cross for pyo3 --- common/build-helper/rust.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh index f689f7c7f9d96..96ec351d545d9 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -33,6 +33,10 @@ fi # For cross-compiling rust -sys crates export PKG_CONFIG_ALLOW_CROSS=1 +# For cross-compiling pyo3 bindings +export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib" +export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" + # gettext-rs export GETTEXT_BIN_DIR=/usr/bin export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext" From b93f69688844c1e7e7bbf9b3411b9fbccb7b8711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Fri, 15 Sep 2023 23:01:52 -0300 Subject: [PATCH 02/10] New package: python3-rpds-py-0.10.3 --- srcpkgs/python3-rpds-py/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/python3-rpds-py/template diff --git a/srcpkgs/python3-rpds-py/template b/srcpkgs/python3-rpds-py/template new file mode 100644 index 0000000000000..aaa7859603339 --- /dev/null +++ b/srcpkgs/python3-rpds-py/template @@ -0,0 +1,21 @@ +# Template file for 'python3-rpds-py' +pkgname=python3-rpds-py +version=0.10.3 +revision=1 +build_style=python3-pep517 +build_helper=rust +hostmakedepends="cargo maturin" +makedepends="python3 rust-std" +depends="python3" +checkdepends="python3-pytest" +short_desc="Python bindings to Rust's persistent data structures (rpds)" +maintainer="Gonzalo Tornaría " +license="MIT" +homepage="https://github.com/crate-py/rpds" +changelog="https://github.com/crate-py/rpds/releases" +distfiles="${PYPI_SITE}/r/rpds-py/rpds_py-${version}.tar.gz" +checksum=fcc1ebb7561a3e24a6588f7c6ded15d80aec22c66a070c757559b57b17ffd1cb + +post_install() { + vlicense LICENSE +} From 5c693f4bf5573dad43ed0e6604ee8d46d95076fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 16 Aug 2023 21:22:53 -0300 Subject: [PATCH 03/10] New package: python3-referencing-0.30.2 --- srcpkgs/python3-referencing/template | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 srcpkgs/python3-referencing/template diff --git a/srcpkgs/python3-referencing/template b/srcpkgs/python3-referencing/template new file mode 100644 index 0000000000000..44ea2d6cf46e9 --- /dev/null +++ b/srcpkgs/python3-referencing/template @@ -0,0 +1,27 @@ +# Template file for 'python3-referencing' +pkgname=python3-referencing +version=0.30.2 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling hatch-vcs" +depends="python3-rpds-py" +checkdepends="$depends python3-pytest-subtests" +short_desc="Cross-specification JSON Referencing" +maintainer="Gonzalo Tornaría " +license="MIT" +homepage="https://github.com/python-jsonschema/referencing" +changelog="https://raw.githubusercontent.com/python-jsonschema/referencing/main/docs/changes.rst" +distfiles="${PYPI_SITE}/r/referencing/referencing-${version}.tar.gz" +checksum=794ad8003c65938edcdbc027f1933215e0d0ccc0291e3ce20a4d87432b59efc0 + +if [ "$XBPS_CHECK_PKGS" = full ]; then + # cyclic dependency + checkdepends+=" python3-jsonschema" +else + # needs python3-jsonschema + make_check_args+=" --ignore=suite/test_sanity.py" +fi + +post_install() { + vlicense COPYING +} From f8ae3fa51a45b6e666aee2448e81aca161a68c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 16 Aug 2023 21:26:32 -0300 Subject: [PATCH 04/10] python3-jsonschema-spec: update to 0.2.4. --- srcpkgs/python3-jsonschema-spec/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-jsonschema-spec/template b/srcpkgs/python3-jsonschema-spec/template index 6caba5a29370c..725ba5a68a785 100644 --- a/srcpkgs/python3-jsonschema-spec/template +++ b/srcpkgs/python3-jsonschema-spec/template @@ -1,15 +1,15 @@ # Template file for 'python3-jsonschema-spec' pkgname=python3-jsonschema-spec -version=0.1.6 +version=0.2.4 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" -depends="python3-jsonschema python3-pathable python3-yaml" -checkdepends="$depends python3-pytest-cov python3-toml" +depends="python3-pathable python3-referencing python3-yaml" +checkdepends="$depends python3-pytest-cov python3-responses" short_desc="JSONSchema Spec with object-oriented paths" maintainer="Gonzalo Tornaría " license="Apache-2.0" homepage="https://github.com/p1c2u/jsonschema-spec" changelog="https://github.com/p1c2u/jsonschema-spec/releases" distfiles="https://github.com/p1c2u/jsonschema-spec/archive/refs/tags/${version}.tar.gz" -checksum=ab1d01d3ed40f83c3e272ffc86505830085a5306ad43db04a6e8edf560fedd1d +checksum=291e898786587e8d370fd419b8d9e9a9eb34e95862a14c5f03261688c0b25bf6 From fc26da5643173f15538e180e45ad2f85ce05669d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Fri, 15 Sep 2023 23:24:55 -0300 Subject: [PATCH 05/10] New package: python3-jsonschema-specifications-2023.7.1 --- .../python3-jsonschema-specifications/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-jsonschema-specifications/template diff --git a/srcpkgs/python3-jsonschema-specifications/template b/srcpkgs/python3-jsonschema-specifications/template new file mode 100644 index 0000000000000..9761f5f5c26ff --- /dev/null +++ b/srcpkgs/python3-jsonschema-specifications/template @@ -0,0 +1,18 @@ +# Template file for 'python3-jsonschema-specifications' +pkgname=python3-jsonschema-specifications +version=2023.7.1 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling hatch-vcs" +depends="python3-referencing" +checkdepends="$depends python3-pytest" +short_desc="JSON Schema specifications, exposed as a Registry" +maintainer="Gonzalo Tornaría " +license="MIT" +homepage="https://github.com/python-jsonschema/jsonschema-specifications" +distfiles="${PYPI_SITE}/j/jsonschema-specifications/jsonschema_specifications-${version}.tar.gz" +checksum=c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb + +post_install() { + vlicense COPYING +} From 57581d6608993286ababf30b4745a59ab13d63d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 16 Aug 2023 20:24:02 -0300 Subject: [PATCH 06/10] python3-jsonpointer: update to 2.4, adopt. --- srcpkgs/python3-jsonpointer/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template index 59b38c2228d6d..fba9a8ae4a447 100644 --- a/srcpkgs/python3-jsonpointer/template +++ b/srcpkgs/python3-jsonpointer/template @@ -1,21 +1,21 @@ # Template file for 'python3-jsonpointer' pkgname=python3-jsonpointer -version=2.3 +version=2.4 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" short_desc="Resolve JSON Pointers according to RFC 6901 (Python3)" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/stefankoegl/python-json-pointer" distfiles="${PYPI_SITE}/j/jsonpointer/jsonpointer-${version}.tar.gz" -checksum=97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a +checksum=585cee82b70211fa9e6043b7bb89db6e1aa49524340dde8ad6b63206ea689d88 conflicts="python-jsonpointer>=0" do_check() { # pytest is not supported - python3 tests.py + python3 -m unittest } post_install() { From 1259151ee12d67821b6b460ecf8cf1c23feceda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 16 Aug 2023 21:06:42 -0300 Subject: [PATCH 07/10] python3-jsonschema: update to 4.19.1. --- .../0001-patch-out-hatch-fancy-pypi-readme.patch | 6 +++--- srcpkgs/python3-jsonschema/template | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/python3-jsonschema/patches/0001-patch-out-hatch-fancy-pypi-readme.patch b/srcpkgs/python3-jsonschema/patches/0001-patch-out-hatch-fancy-pypi-readme.patch index 2f10a5f7f6d33..6c33f9ec5373c 100644 --- a/srcpkgs/python3-jsonschema/patches/0001-patch-out-hatch-fancy-pypi-readme.patch +++ b/srcpkgs/python3-jsonschema/patches/0001-patch-out-hatch-fancy-pypi-readme.patch @@ -47,9 +47,9 @@ index f5fe8db..7ae8318 100644 -path = "CHANGELOG.rst" -pattern = "(^v.+?)\nv" - - [tool.isort] - from_first = true - include_trailing_comma = true + [tool.coverage.html] + branch = true + source = ["jsonschema"] -- 2.37.3 diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template index 272eb06edbdd6..44faf389e7d0d 100644 --- a/srcpkgs/python3-jsonschema/template +++ b/srcpkgs/python3-jsonschema/template @@ -1,19 +1,19 @@ # Template file for 'python3-jsonschema' pkgname=python3-jsonschema -version=4.17.3 -revision=2 +version=4.19.1 +revision=1 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" -depends="python3-attrs python3-idna python3-jsonpointer python3-pyrsistent - python3-rfc3339-validator python3-rfc3986-validator" -checkdepends="${depends} python3-pytest python3-pip" +depends="python3-attrs python3-jsonschema-specifications" +checkdepends="${depends} python3-pytest python3-idna python3-jsonpointer + python3-pip python3-rfc3339-validator python3-rfc3987" short_desc="Implementation of JSON Schema for Python3" maintainer="Jan Christian Grünhage " license="MIT" homepage="https://github.com/Julian/jsonschema" changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz" -checksum=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d +checksum=ec84cc37cfa703ef7cd4928db24f9cb31428a5d0fa77747b8b51a847458e0bbf post_install() { vlicense COPYING LICENSE From 751fd608d39ec1a2dfb600a4ae9d297e01d8e16d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 01:04:50 -0300 Subject: [PATCH 08/10] python3-openapi-spec-validator: update to 0.6.0. --- srcpkgs/python3-openapi-spec-validator/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-openapi-spec-validator/template b/srcpkgs/python3-openapi-spec-validator/template index f75c24694c30b..f123e954f6f2d 100644 --- a/srcpkgs/python3-openapi-spec-validator/template +++ b/srcpkgs/python3-openapi-spec-validator/template @@ -1,16 +1,16 @@ # Template file for 'python3-openapi-spec-validator' pkgname=python3-openapi-spec-validator -version=0.5.7 +version=0.6.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-jsonschema-spec python3-lazy-object-proxy python3-openapi-schema-validator" -checkdepends="$depends python3-pytest-cov python3-toml" +checkdepends="$depends python3-pytest-cov" short_desc="OpenAPI spec validator" maintainer="Gonzalo Tornaría " license="Apache-2.0" homepage="https://github.com/python-openapi/openapi-spec-validator" changelog="https://github.com/python-openapi/openapi-spec-validator/releases" distfiles="${PYPI_SITE}/o/openapi-spec-validator/openapi_spec_validator-${version}.tar.gz" -checksum=6c2d42180045a80fd6314de848b94310bdb0fa4949f4b099578b69f79d9fa5ac +checksum=68c4c212c88ef14c6b1a591b895bf742c455783c7ebba2507abd7dbc1365a616 From fbba635285be37b410fe4fa3031e2189a9b212f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 01:05:07 -0300 Subject: [PATCH 09/10] python3-openapi-schema-validator: update to 0.6.1. --- srcpkgs/python3-openapi-schema-validator/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-openapi-schema-validator/template b/srcpkgs/python3-openapi-schema-validator/template index bb26e4a7d6034..77139da12b350 100644 --- a/srcpkgs/python3-openapi-schema-validator/template +++ b/srcpkgs/python3-openapi-schema-validator/template @@ -1,18 +1,18 @@ # Template file for 'python3-openapi-schema-validator' pkgname=python3-openapi-schema-validator -version=0.4.4 +version=0.6.1 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" -depends="python3-jsonschema" -checkdepends="$depends python3-pytest-cov python3-toml" +depends="python3-jsonschema python3-rfc3339-validator" +checkdepends="$depends python3-pytest-cov" short_desc="OpenAPI schema validation for Python" maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/python-openapi/openapi-schema-validator" changelog="https://github.com/python-openapi/openapi-schema-validator/releases" distfiles="${PYPI_SITE}/o/openapi-schema-validator/openapi_schema_validator-${version}.tar.gz" -checksum=c573e2be2c783abae56c5a1486ab716ca96e09d1c3eab56020d1dc680aa57bf8 +checksum=b8b25e2cb600a0ed18452e675b5dd8cbb99009909c2641c973a4b02c93e33ca2 post_install() { vlicense LICENSE From a65f1efaebd8d1c2a207e9588662b1653d1f7682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 01:05:23 -0300 Subject: [PATCH 10/10] python3-openapi-core: update to 0.18.1. --- srcpkgs/python3-openapi-core/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-openapi-core/template b/srcpkgs/python3-openapi-core/template index 2dd5dceab1d6a..19bb7af32a364 100644 --- a/srcpkgs/python3-openapi-core/template +++ b/srcpkgs/python3-openapi-core/template @@ -1,6 +1,6 @@ # Template file for 'python3-openapi-core' pkgname=python3-openapi-core -version=0.17.1 +version=0.18.1 revision=1 build_style=python3-pep517 # disable tests requiring unpackaged dependencies @@ -11,17 +11,17 @@ make_check_args=" --ignore=tests/integration/contrib/starlette " hostmakedepends="python3-poetry-core" -depends="python3-isodate python3-more-itertools python3-openapi-spec-validator - python3-parse python3-Werkzeug" -checkdepends="$depends python3-pytest-cov python3-Flask python3-requests - python3-responses python3-toml python3-WebOb" +depends="python3-asgiref python3-isodate python3-more-itertools + python3-openapi-spec-validator python3-parse python3-Werkzeug" +checkdepends="$depends python3-pytest-cov python3-pytest-aiohttp + python3-Flask python3-requests python3-responses python3-WebOb" short_desc="Support for the OpenAPI Specification v3" maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/python-openapi/openapi-core" changelog="https://github.com/python-openapi/openapi-core/releases" distfiles="${PYPI_SITE}/o/openapi-core/openapi_core-${version}.tar.gz" -checksum=561b7e2b37b336e9c62d4634b9059d12d9bb2e1859062a39d3a0fa6afc8c9de6 +checksum=63fa13d9af226ac00119b0531ac9929e3dbb4cbe00216770784473fa6a03bc27 post_install() { vlicense LICENSE