From dc37e238d688efd0297142c39aa188e9f40f5563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 26 Jun 2022 16:47:17 +0200 Subject: [PATCH 1/6] python3-jsonschema: update to 4.6.1. --- srcpkgs/python3-jsonschema/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template index 120392ad1be3..a1dd7ff5d073 100644 --- a/srcpkgs/python3-jsonschema/template +++ b/srcpkgs/python3-jsonschema/template @@ -1,20 +1,24 @@ # Template file for 'python3-jsonschema' pkgname=python3-jsonschema -version=4.4.0 +version=4.6.1 revision=1 wrksrc="jsonschema-${version}" build_style=python3-pep517 -make_check_args="--deselect jsonschema/tests/test_cli.py::TestCLIIntegration::test_license" -hostmakedepends="python3-setuptools_scm python3-wheel" +hostmakedepends="hatchling hatch-vcs" depends="python3-attrs python3-pyrsistent" -checkdepends="python3-pytest python3-Twisted $depends" short_desc="Implementation of JSON Schema for Python3" -maintainer="Orphaned " +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=636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83 +checksum=ec2802e6a37517f09d47d9ba107947589ae1d25ff557b925d83a321fc2aa5d3b +# Tests require jsonschema to be installed already. Setting PYTHONPATH doesn't seem to do trick +make_check=no + +pre_build() { + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" +} post_install() { vlicense COPYING LICENSE From 36762351157c025fc5f1c56be76f2cac5423d2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 1 Jul 2022 08:53:19 +0200 Subject: [PATCH 2/6] python3-bracex: update to 2.3.post1. --- srcpkgs/python3-bracex/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-bracex/template b/srcpkgs/python3-bracex/template index a88b1f66737c..89025d991378 100644 --- a/srcpkgs/python3-bracex/template +++ b/srcpkgs/python3-bracex/template @@ -1,10 +1,10 @@ # Template file for 'python3-bracex' pkgname=python3-bracex -version=2.2.1 +version=2.3.post1 revision=1 wrksrc="${pkgname/python3-/}-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" +build_style=python3-pep517 +hostmakedepends="hatchling" depends="python3" checkdepends="python3-pytest" short_desc="Bash style brace expansion for Python" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/facelessuser/bracex" changelog="https://raw.githubusercontent.com/facelessuser/bracex/master/docs/src/markdown/about/changelog.md" distfiles="${PYPI_SITE}/b/bracex/bracex-${version}.tar.gz" -checksum=1c8d1296e00ad9a91030ccb4c291f9e4dc7c054f12c707ba3c5ff3e9a81bcd21 +checksum=e7b23fc8b2cd06d3dec0692baabecb249dda94e06a617901ff03a6c56fd71693 post_install() { vlicense LICENSE.md From 3c8d94c9596a62725a3a2a6714bc6571946ce20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 1 Jul 2022 08:59:13 +0200 Subject: [PATCH 3/6] python3-wcmatch: update to 8.4. --- srcpkgs/python3-wcmatch/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-wcmatch/template b/srcpkgs/python3-wcmatch/template index d132c7721d80..60ad0128e422 100644 --- a/srcpkgs/python3-wcmatch/template +++ b/srcpkgs/python3-wcmatch/template @@ -1,12 +1,12 @@ # Template file for 'python3-wcmatch' pkgname=python3-wcmatch -version=8.3 +version=8.4 revision=1 wrksrc="${pkgname/python3-/}-${version}" -build_style=python3-module -make_check_args="--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_realpath ---deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_tilde" -hostmakedepends="python3-setuptools" +build_style=python3-pep517 +#make_check_args="--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_realpath +#--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_tilde" +hostmakedepends="hatchling" depends="python3-bracex" checkdepends="python3-pytest ${depends}" short_desc="Wilcard File Name matching library" @@ -15,7 +15,7 @@ license="MIT" homepage="https://github.com/facelessuser/wcmatch" changelog="https://raw.githubusercontent.com/facelessuser/wcmatch/main/docs/src/markdown/about/changelog.md" distfiles="${PYPI_SITE}/w/wcmatch/wcmatch-${version}.tar.gz" -checksum=371072912398af61d1e4e78609e18801c6faecd3cb36c54c82556a60abc965db +checksum=ba4fc5558f8946bf1ffc7034b05b814d825d694112499c86035e0e4d398b6a67 post_install() { vlicense LICENSE.md From 9ba6d297c81af1c8fe8b2fa17364e03e5ce60e52 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 24 Mar 2022 13:12:36 -0400 Subject: [PATCH 4/6] python3-ruamel.yaml: update to 0.17.21. --- srcpkgs/python3-ruamel.yaml/template | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-ruamel.yaml/template b/srcpkgs/python3-ruamel.yaml/template index b8ad65ed0883..4f9dadaa0006 100644 --- a/srcpkgs/python3-ruamel.yaml/template +++ b/srcpkgs/python3-ruamel.yaml/template @@ -1,25 +1,23 @@ # Template file for 'python3-ruamel.yaml' pkgname=python3-ruamel.yaml -version=0.16.12 -revision=4 +version=0.17.21 +revision=1 wrksrc="ruamel.yaml-${version}" build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" -depends="python3" +depends="python3-ruamel.yaml.clib" short_desc="YAML parser/emitter in Python 3" maintainer="Orphaned " license="MIT" homepage="http://yaml.readthedocs.io/" +changelog="https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/CHANGES" distfiles="${PYPI_SITE}/r/ruamel.yaml/ruamel.yaml-${version}.tar.gz" -checksum=076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e +checksum=8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af +make_check=no # no tests included in distfiles export RUAMEL_NO_PIP_INSTALL_CHECK=1 -do_check() { - : -} - post_install() { vlicense LICENSE } From 2cc32eabd7bcc35121a0d47a2c47ed297a0e25b7 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 24 Mar 2022 13:32:43 -0400 Subject: [PATCH 5/6] whipper: add patch to support ruamel.yaml>=0.17 --- .../patches/ruamel.yaml-0.17_compat.patch | 109 ++++++++++++++++++ srcpkgs/whipper/template | 2 +- 2 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch diff --git a/srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch b/srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch new file mode 100644 index 000000000000..206547e4b3e9 --- /dev/null +++ b/srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch @@ -0,0 +1,109 @@ +From e0942417a1c267781a8b676789730457dcb2e6fa Mon Sep 17 00:00:00 2001 +From: Martin Weinelt +Date: Sun, 20 Jun 2021 15:18:37 +0200 +Subject: [PATCH] Use custom YAML subclass to be compatible with + ruamel_yaml>=0.17 + +Signed-off-by: Martin Weinelt +--- + whipper/common/yaml.py | 18 ++++++++++++++++++ + whipper/result/logger.py | 11 ++++++----- + whipper/test/test_result_logger.py | 14 ++++++-------- + 3 files changed, 30 insertions(+), 13 deletions(-) + create mode 100644 whipper/common/yaml.py + +diff --git a/whipper/common/yaml.py b/whipper/common/yaml.py +new file mode 100644 +index 00000000..4edb0b36 +--- /dev/null ++++ b/whipper/common/yaml.py +@@ -0,0 +1,18 @@ ++from ruamel.yaml import YAML as ruamel_YAML ++from ruamel.yaml.compat import StringIO ++ ++# https://yaml.readthedocs.io/en/latest/example.html#output-of-dump-as-a-string ++class YAML(ruamel_YAML): ++ def __init__(self, *args, **kwargs): ++ super().__init__() ++ self.width = 4000 ++ self.default_flow_style = False ++ ++ def dump(self, data, stream=None, **kw): ++ inefficient = False ++ if stream is None: ++ inefficient = True ++ stream = StringIO() ++ ruamel_YAML.dump(self, data, stream, **kw) ++ if inefficient: ++ return stream.getvalue() +diff --git a/whipper/result/logger.py b/whipper/result/logger.py +index b7043adc..f4471a00 100644 +--- a/whipper/result/logger.py ++++ b/whipper/result/logger.py +@@ -1,12 +1,12 @@ + import time + import hashlib + import re +-import ruamel.yaml as yaml + from ruamel.yaml.comments import CommentedMap as OrderedDict + + import whipper + + from whipper.common import common ++from whipper.common.yaml import YAML + from whipper.result import result + + +@@ -148,11 +148,12 @@ def logRip(self, ripResult, epoch): + data["EOF"] = "End of status report" + riplog["Conclusive status report"] = data + ++ yaml = YAML( ++ typ="rt", ++ pure=True ++ ) + riplog = yaml.dump( +- riplog, +- default_flow_style=False, +- width=4000, +- Dumper=yaml.RoundTripDumper ++ riplog + ) + # Add a newline after the "Log creation date" line + riplog = re.sub( +diff --git a/whipper/test/test_result_logger.py b/whipper/test/test_result_logger.py +index 411b61af..98c89ab5 100644 +--- a/whipper/test/test_result_logger.py ++++ b/whipper/test/test_result_logger.py +@@ -3,8 +3,8 @@ + import os + import re + import unittest +-import ruamel.yaml + ++from whipper.common.yaml import YAML + from whipper.result.result import TrackResult, RipResult + from whipper.result.logger import WhipperLogger + +@@ -163,16 +163,14 @@ def testLogger(self): + )) + ) + +- yaml = ruamel.yaml.YAML() ++ yaml = YAML( ++ typ='rt', ++ pure=True ++ ) + parsedLog = yaml.load(actual) + self.assertEqual( + actual, +- ruamel.yaml.dump( +- parsedLog, +- default_flow_style=False, +- width=4000, +- Dumper=ruamel.yaml.RoundTripDumper +- ) ++ yaml.dump(parsedLog) + ) + log_body = "\n".join(actualLines[:-1]).encode() + self.assertEqual( diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template index c5bbd74cfacc..e0f5cf8b8026 100644 --- a/srcpkgs/whipper/template +++ b/srcpkgs/whipper/template @@ -1,7 +1,7 @@ # Template file for 'whipper' pkgname=whipper version=0.10.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="libsndfile-devel python3-devel" From d73c1fca136a57054975138081a689535b8fa662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 10 Jun 2022 17:30:55 +0200 Subject: [PATCH 6/6] python3-ansible-lint: update to 6.3.0. --- srcpkgs/python3-ansible-lint/template | 41 ++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template index 19b1453782e9..a2887ed6ad5c 100644 --- a/srcpkgs/python3-ansible-lint/template +++ b/srcpkgs/python3-ansible-lint/template @@ -1,13 +1,42 @@ # Template file for 'python3-ansible-lint' pkgname=python3-ansible-lint -version=6.2.2 +version=6.3.0 revision=1 wrksrc="${pkgname/python3-/}-${version}" build_style=python3-pep517 +# These require ansible-lint installed properly, or they are flaky +make_check_args="--deselect test/test_eco.py::test_eco + --deselect test/test_main.py::test_call_from_outside_venv + --deselect test/test_cli_role_paths.py::test_run_single_role_path_no_trailing_slash_script + --deselect test/test_cli_role_paths.py::test_run_multiple_role_path_with_trailing_slash + --deselect test/test_cli_role_paths.py::test_run_role_name_with_prefix + --deselect test/test_cli_role_paths.py::test_run_role_name_from_meta + --deselect test/test_cli_role_paths.py::test_run_invalid_role_name_from_meta + --deselect test/test_cli_role_paths.py::test_run_role_three_dir_deep + --deselect test/test_cli_role_paths.py::test_run_playbook + --deselect test/test_cli_role_paths.py::test_run_role_name_invalid + --deselect test/test_cli_role_paths.py::test_run_single_role_path_no_trailing_slash_module + --deselect test/test_cli_role_paths.py::test_run_inside_role_dir + --deselect test/test_cli_role_paths.py::test_run_single_role_path_with_trailing_slash + --deselect test/test_cli_role_paths.py::test_run_multiple_role_path_no_trailing_slash + --deselect test/test_cli_role_paths.py::test_run_single_role_path_with_roles_path_env + --deselect test/test_verbosity.py::test_default_verbosity + --deselect test/test_task_includes.py::test_included_tasks + --deselect test/test_utils.py::test_cli_auto_detect + --deselect test/test_list_rules.py::test_list_rules_includes_opt_in_rules + --deselect test/test_formatter_json.py::test_code_climate_parsable_ignored + --deselect test/test_examples.py::test_custom_kinds + --deselect src/ansiblelint/rules/only_builtins.py::test_only_builtin_fail + --deselect test/test_import_playbook.py::test_task_hook_import_playbook + --deselect test/test_rules_collection.py::test_rich_rule_listing" +make_install_target="ansible_lint-*-*-*-*.whl" hostmakedepends="python3-wheel python3-setuptools_scm" depends="ansible-core python3-yamllint python3-six python3-yaml python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch - python3-ansible-compat" + python3-ansible-compat python3-jsonschema" +checkdepends="${depends} python3-pytest black python3-flake8 python3-flaky + python3-mypy pylint python3-pytest-cov python3-pytest-xdist + python3-pytest-forked" short_desc="Linter for Ansible files" maintainer="Jan Christian Grünhage " # Note about licensing from upstream: @@ -18,12 +47,10 @@ maintainer="Jan Christian Grünhage " license="GPL-3.0-only" homepage="https://github.com/ansible-community/ansible-lint" distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz" -checksum=b8e2956fede90bd28150e97f209a8af787c6001f584bb6613112a1ce1aea311d -# Tests are currently broken for ansible on python 3.10 -# See https://github.com/ansible/ansible/issues/74658 -# and https://github.com/ansible/ansible/issues/74660 -make_check=no +checksum=f57f520ae5d810ce062157dc7d633990ad2fbec81bbbb34ccc4ce3a0c21fcd38 +make_check_pre="env PYTHONPATH=src" post_patch() { vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" }