From 41c5dc61eb5a19ca552bb1013a5ee7be9bd220d9 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 9 Oct 2022 12:10:47 -0500 Subject: [PATCH 01/12] mmark: update to 2.2.28. --- srcpkgs/mmark/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template index e3200e95c32e..a0cea83f59d9 100644 --- a/srcpkgs/mmark/template +++ b/srcpkgs/mmark/template @@ -1,6 +1,6 @@ # Template file for 'mmark' pkgname=mmark -version=2.2.23 +version=2.2.28 revision=1 build_style=go go_import_path=github.com/mmarkdown/mmark/v2 @@ -9,7 +9,7 @@ maintainer="Robert Lowry " license="BSD-2-Clause" homepage="https://github.com/mmarkdown/mmark/" distfiles="https://github.com/mmarkdown/mmark/archive/v${version}.tar.gz" -checksum=8c4ebb780f86f17647de1d81532bf6900498ec48edcdf03de6ef6e68287ae510 +checksum=1797322e144bd914473bbe915c5b10a5d4eecf12792a4692471178687fe64a1f do_check() { go test ./... From 82733a105516daf7920514711e7cc81affe3b5ce Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 9 Oct 2022 12:42:04 -0500 Subject: [PATCH 02/12] New package: python3-google-i18n-address-2.5.2 --- srcpkgs/python3-google-i18n-address/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-google-i18n-address/template diff --git a/srcpkgs/python3-google-i18n-address/template b/srcpkgs/python3-google-i18n-address/template new file mode 100644 index 000000000000..aabbbb02be3f --- /dev/null +++ b/srcpkgs/python3-google-i18n-address/template @@ -0,0 +1,16 @@ +# Template file for 'python3-google-i18n-address' +pkgname=python3-google-i18n-address +version=2.5.2 +revision=1 +wrksrc="google-i18n-address-${version}" +build_style=python3-module +make_check_target="tests/" +hostmakedepends="python3-setuptools" +depends="python3-requests" +checkdepends="python3-pytest-cov python3-pytest-cov $depends" +short_desc="Address validation helpers for Google's i18n address database" +maintainer="Andrew Benson " +license="GPL-3.0-or-later" +homepage="https://github.com/mirumee/google-i18n-address" +distfiles="https://github.com/mirumee/google-i18n-address/archive/refs/tags/${version}.tar.gz" +checksum=5ec8e92d71ffe4d889c439f7f55f698553b6d731cc5177276045a5bb436a6029 From 3b1a19d997d148344be6deea81b51db99d06b57b Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 9 Oct 2022 13:50:36 -0500 Subject: [PATCH 03/12] New package: python3-pytest-isort-3.0.0 --- .../patches/fix-masonry-backend.patch | 24 +++++++++++++++++++ srcpkgs/python3-pytest-isort/template | 14 +++++++++++ 2 files changed, 38 insertions(+) create mode 100644 srcpkgs/python3-pytest-isort/patches/fix-masonry-backend.patch create mode 100644 srcpkgs/python3-pytest-isort/template diff --git a/srcpkgs/python3-pytest-isort/patches/fix-masonry-backend.patch b/srcpkgs/python3-pytest-isort/patches/fix-masonry-backend.patch new file mode 100644 index 000000000000..23589900491d --- /dev/null +++ b/srcpkgs/python3-pytest-isort/patches/fix-masonry-backend.patch @@ -0,0 +1,24 @@ +From a36c16ecbf454cc25f8564aa39fe652808f56d3f Mon Sep 17 00:00:00 2001 +From: Fabian Affolter +Date: Fri, 4 Mar 2022 08:42:48 +0100 +Subject: [PATCH] Switch to poetry-core (#44) + +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index e86b450..ecb092a 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -44,8 +44,8 @@ pytest-flake8 = ">=1.0" + pytest-black = ">=0.3" + + [build-system] +-requires = ["poetry>=1.1"] +-build-backend = "poetry.masonry.api" ++requires = ["poetry-core>=1.0.0"] ++build-backend = "poetry.core.masonry.api" + + [tool.black] + line-length = 96 diff --git a/srcpkgs/python3-pytest-isort/template b/srcpkgs/python3-pytest-isort/template new file mode 100644 index 000000000000..fb2081ef2eea --- /dev/null +++ b/srcpkgs/python3-pytest-isort/template @@ -0,0 +1,14 @@ +# Template file for 'python3-pytest-isort' +pkgname=python3-pytest-isort +version=3.0.0 +revision=1 +build_style=python3-pep517 +wrksrc="pytest-isort-${version}" +hostmakedepends="python3-poetry-core" +depends="python3-isort" +short_desc="Pytest plugin to check import ordering using isort" +maintainer="Andrew Benson " +license="MIT" +homepage="https://github.com/stephrdev/pytest-isort" +distfiles="https://github.com/stephrdev/pytest-isort/archive/refs/tags/${version}.tar.gz" +checksum=07ceeaaf0f3804132545d4d2f9af43cb1e41721573801838baf45fc75c95df32 From 2523251858277754c4d53bc6d3b3e292a36631c8 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 9 Oct 2022 13:50:59 -0500 Subject: [PATCH 04/12] New package: python3-tinycss2-1.1.1 --- srcpkgs/python3-tinycss2/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/python3-tinycss2/template diff --git a/srcpkgs/python3-tinycss2/template b/srcpkgs/python3-tinycss2/template new file mode 100644 index 000000000000..f66d3fa88c7c --- /dev/null +++ b/srcpkgs/python3-tinycss2/template @@ -0,0 +1,21 @@ +# Template file for 'python3-tinycss2' +pkgname=python3-tinycss2 +version=1.1.1 +revision=1 +build_style=python3-pep517 +wrksrc="tinycss2-${version}" +hostmakedepends="python3-poetry-core python3-flit_core python3-webencodings" +depends="python3-webencodings" +checkdepends="python3-pytest-cov python3-pytest-flake8 python3-toml + python3-pytest-isort" +short_desc="Tiny CSS parser" +maintainer="Andrew Benson " +license="BSD-3-Clause" +homepage="https://www.courtbouillon.org/tinycss2" +distfiles="${PYPI_SITE}/t/tinycss2/tinycss2-${version}.tar.gz" +checksum=b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf +make_check=no # tests broken with flake8 >= v5.x + +post_install() { + vlicense LICENSE +} From d9432884d3fd3e0daf883557fabbd1f4184d30bb Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 10 Oct 2022 10:04:52 -0500 Subject: [PATCH 05/12] New package: python3-cssselect2-0.7.0 --- srcpkgs/python3-cssselect2/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-cssselect2/template diff --git a/srcpkgs/python3-cssselect2/template b/srcpkgs/python3-cssselect2/template new file mode 100644 index 000000000000..3de38ab2a573 --- /dev/null +++ b/srcpkgs/python3-cssselect2/template @@ -0,0 +1,16 @@ +# Template file for 'python3-cssselect2' +pkgname=python3-cssselect2 +version=0.7.0 +revision=1 +build_style=python3-pep517 +wrksrc="cssselect2-${version}" +_runtime_deps="python3-tinycss2 python3-webencodings" +hostmakedepends="python3-poetry-core python3-flit_core ${_runtime_deps}" +depends="${_runtime_deps}" +checkdepends="python3-pytest $depends" +short_desc="CSS selectors for Python ElementTree" +maintainer="Andrew Benson " +license="BSD-3-Clause" +homepage="https://doc.courtbouillon.org/cssselect2/stable/" +distfiles="https://github.com/Kozea/cssselect2/archive/refs/tags/${version}.tar.gz" +checksum=4fffdffcb7d7e7784c337d75e14399a9af4d0b9d91addc66c869f9482aa6ceaf From a6d157ddf87d418a9c9c5c0eed4011be1c9f0f88 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 10 Oct 2022 10:58:03 -0500 Subject: [PATCH 06/12] New package: python3-Pyphen-0.13.0 --- srcpkgs/python3-Pyphen/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-Pyphen/template diff --git a/srcpkgs/python3-Pyphen/template b/srcpkgs/python3-Pyphen/template new file mode 100644 index 000000000000..1d478057c2b7 --- /dev/null +++ b/srcpkgs/python3-Pyphen/template @@ -0,0 +1,18 @@ +# Template file for 'python3-Pyphen' +pkgname=python3-Pyphen +version=0.13.0 +revision=1 +build_style=python3-pep517 +wrksrc="Pyphen-${version}" +make_install_target="pyphen-0.13.0-*-*-*.whl" +hostmakedepends="python3-poetry-core python3-flit_core" +checkdepends="python3-pytest-isort python3-pytest-cov python3-pytest-flake8 + python3-pytest-xdist" +short_desc="Hy-phen-ation made easy" +maintainer="Andrew Benson " +license="GPL-2.0-or-later; LGPL-2.1-or-later; MPL-1.1" +homepage="https://www.courtbouillon.org/pyphen" +distfiles="https://github.com/Kozea/Pyphen/archive/refs/tags/${version}.tar.gz" +checksum=e591d26b455fb207b3a7ed000176ae71a671a3955520806fcb05842e3b3228fe +make_check=no # Tests broken with flake8 v5.x and later + # https://github.com/Kozea/Pyphen/blob/master/pyproject.toml#L43 From fc10a3daf36217e444b77bb41f934598bbb78970 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 10 Oct 2022 11:15:06 -0500 Subject: [PATCH 07/12] New package: python3-pydyf-0.3.0 --- srcpkgs/python3-pydyf/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-pydyf/template diff --git a/srcpkgs/python3-pydyf/template b/srcpkgs/python3-pydyf/template new file mode 100644 index 000000000000..9480f3126c56 --- /dev/null +++ b/srcpkgs/python3-pydyf/template @@ -0,0 +1,20 @@ +# Template file for 'python3-pydyf' +pkgname=python3-pydyf +version=0.3.0 +revision=1 +build_style=python3-pep517 +wrksrc="pydyf-${version}" +hostmakedepends="python3-poetry-core python3-flit_core" +checkdepends="python3-pytest-cov python3-pytest-isort python3-pytest-flake8 + python3-pytest-xdist python3-Pillow ghostscript" +short_desc="Low-level PDF creator" +maintainer="Andrew Benson " +license="BSD-3-Clause" +homepage="https://courtbouillon.org/pydyf" +distfiles="https://github.com/CourtBouillon/pydyf/archive/refs/tags/v${version}.tar.gz" +checksum=a67fda91fc85e500ba49394ec7fa485239b5a21c28074e75cbfb70cdd8614aa9 +make_check=no # Tests do not work with flake8 > v5.x + +post_install() { + vlicense LICENSE +} From ca3f4ddec253a58e0c6280d517d8043c5192e09e Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 9 Oct 2022 13:52:23 -0500 Subject: [PATCH 08/12] New package: python3-WeasyPrint-56.1 --- srcpkgs/python3-WeasyPrint/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-WeasyPrint/template diff --git a/srcpkgs/python3-WeasyPrint/template b/srcpkgs/python3-WeasyPrint/template new file mode 100644 index 000000000000..781e348c64c4 --- /dev/null +++ b/srcpkgs/python3-WeasyPrint/template @@ -0,0 +1,20 @@ +# Template file for 'python3-WeasyPrint' +pkgname=python3-WeasyPrint +version=56.1 +revision=1 +build_style=python3-pep517 +wrksrc="WeasyPrint-${version}" +make_install_target="weasyprint-${version}-py3-none-any.whl" +_runtime_deps="fonttools python3-Pillow python3-cssselect2 python3-html5lib python3-cffi + python3-Pyphen python3-pydyf glib pango" +hostmakedepends="python3-poetry-core python3-flit_core ${_runtime_deps}" +depends="${_runtime_deps}" +checkdepends="python3-pytest-flake8 python3-pytest-xdist python3-pytest-isort + $depends" +short_desc="Awesome document factory" +maintainer="Andrew Benson " +license="GPL-3.0-or-later" +homepage="https://weasyprint.org " +distfiles="https://github.com/Kozea/WeasyPrint/archive/refs/tags/v${version}.tar.gz" +checksum=9abe105b149f52dc8569b0a409ced64cfb01aece1461ce13cfcf9c347834b7bc +make_check=no # Tests are broken on flake8 >= v5.x From 436b4250b3d482e6fab6110b9ca303ad82096f66 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 10 Oct 2022 13:23:54 -0500 Subject: [PATCH 09/12] python3-pycountry: update to 22.3.5. --- srcpkgs/python3-pycountry/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pycountry/template b/srcpkgs/python3-pycountry/template index ab364f365741..08bd13005995 100644 --- a/srcpkgs/python3-pycountry/template +++ b/srcpkgs/python3-pycountry/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycountry' pkgname=python3-pycountry -version=19.8.18 -revision=4 +version=22.3.5 +revision=1 wrksrc="pycountry-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,4 +11,4 @@ maintainer="Farhad Shahbazi " license="LGPL-2.1-or-later" homepage="https://pypi.org/project/pycountry/" distfiles="${PYPI_SITE}/p/pycountry/pycountry-${version}.tar.gz" -checksum=3c57aa40adcf293d59bebaffbe60d8c39976fba78d846a018dc0c2ec9c6cb3cb +checksum=b2163a246c585894d808f18783e19137cb70a0c18fb36748dc01fc6f109c1646 From 22b6e86f60ac132d6a971c50043f467a35b90c8d Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 10 Oct 2022 14:06:51 -0500 Subject: [PATCH 10/12] python3-Jinja2: update to 3.1.2. This will be dropped from the PR when #39346 is merged. --- srcpkgs/python3-Jinja2/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template index fb6d7e585a92..332159a4de42 100644 --- a/srcpkgs/python3-Jinja2/template +++ b/srcpkgs/python3-Jinja2/template @@ -1,8 +1,7 @@ # Template file for 'python3-Jinja2' pkgname=python3-Jinja2 -reverts="3.1.1_1 3.1.1_2" -version=3.0.3 -revision=3 +version=3.1.2 +revision=1 wrksrc="Jinja2-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,7 +13,7 @@ license="BSD-3-Clause" homepage="http://jinja.pocoo.org/" changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst" distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz" -checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 +checksum=31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 post_install() { vlicense LICENSE.rst From 6d981e53bb969f223a3a1fb4e7ccf02bfd28fb8a Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 10 Oct 2022 14:12:14 -0500 Subject: [PATCH 11/12] python3-lxml: update to 4.9.0. --- srcpkgs/python3-lxml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template index 0b2f369bd21d..162e9117e183 100644 --- a/srcpkgs/python3-lxml/template +++ b/srcpkgs/python3-lxml/template @@ -1,6 +1,6 @@ # Template file for 'python3-lxml' pkgname=python3-lxml -version=4.8.0 +version=4.9.0 revision=1 wrksrc="lxml-lxml-${version}" build_style=python3-module @@ -14,7 +14,7 @@ maintainer="Alessio Sergi " license="BSD-3-Clause, custom:ElementTree" homepage="https://lxml.de/" distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz" -checksum=8d2b999f5c8a8a70a28a3875e5d1bf27c0555c922bfa0af34dc46e07913f2a47 +checksum=9c7159b061c93e8658b4c4d9c4916ae493e771365512281c0e45ea4651262c7d do_check() { make test3 From 17e5d1d5076d22e69ac9c45f5998075d65dec2ca Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 9 Oct 2022 13:52:32 -0500 Subject: [PATCH 12/12] [WIP] New package: xml2rfc-3.15.0 This and all depedencies are currently works in progress. --- srcpkgs/xml2rfc-pdf | 1 + srcpkgs/xml2rfc/template | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 120000 srcpkgs/xml2rfc-pdf create mode 100644 srcpkgs/xml2rfc/template diff --git a/srcpkgs/xml2rfc-pdf b/srcpkgs/xml2rfc-pdf new file mode 120000 index 000000000000..2e02a96be870 --- /dev/null +++ b/srcpkgs/xml2rfc-pdf @@ -0,0 +1 @@ +xml2rfc \ No newline at end of file diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template new file mode 100644 index 000000000000..fa3cf1c6edbf --- /dev/null +++ b/srcpkgs/xml2rfc/template @@ -0,0 +1,29 @@ +# Template file for 'xml2rfc' +pkgname=xml2rfc +version=3.15.0 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools" +makedepends="" +depends="python3-appdirs python3-ConfigArgParse python3-html5lib + python3-intervaltree python3-Jinja2 python3-MarkupSafe python3-kitchen + python3-lxml python3-pycountry python3-yaml python3-requests python3-six + python3-google-i18n-address" +short_desc="Generate RFCs and IETF drafts from XML" +maintainer="Andrew Benson " +license="BSD-3-Clause" +homepage="https://ietf-tools.github.io/xml2rfc/" +distfiles="https://github.com/ietf-tools/xml2rfc/releases/download/v${version}/xml2rfc-${version}.tar.gz" +checksum=65dac6ad7e59cb296f00c53d5d18355d7cae23bc99706234f84d6c6c19ed61c5 +make_check=no # too many dependencies + +post_install() { + vlicense LICENSE +} + +xml2rfc-pdf_package() { + short_desc+=" - PDF Support" + depends="${sourcepkg}-${version}_${revision} python3-WeasyPrint pango + noto-fonts-ttf fonts-roboto-ttf" + build_style=meta +}