From 384b923a37d1be325c507734418188fd2fe4d4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 14 Oct 2021 22:11:37 +0200 Subject: [PATCH 1/9] ansible-core: explain make_check=no --- srcpkgs/ansible-core/template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template index 5a5b546ed033..2ed2c1fe21d7 100644 --- a/srcpkgs/ansible-core/template +++ b/srcpkgs/ansible-core/template @@ -14,6 +14,9 @@ distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz" checksum=93d50283c7c5b476debf83dc089b3f679b939a8b9a7b5d628d28daafbb3d303a conflicts="ansible<2.10.1_1" replaces="ansible-base<2.11.0_1" +# 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 post_install() { From f1da1466c9a4dab059adc9eb1b55c2a9923aab92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 14 Oct 2021 22:11:14 +0200 Subject: [PATCH 2/9] ansible: explain make_check=no --- srcpkgs/ansible/template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 42cbc79a1809..47981ea3e8aa 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -11,4 +11,7 @@ license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz" checksum=2955fcbf51367f8bd88c38a86f8be83d4fcd05f778afb4feed31abfe8dcff639 +# 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 From b9c53b905d20d666a73fae1cca31d3ae17757685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 16 Jul 2021 12:35:13 +0200 Subject: [PATCH 3/9] New package: python3-enrich-1.2.6 --- srcpkgs/python3-enrich/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-enrich/template diff --git a/srcpkgs/python3-enrich/template b/srcpkgs/python3-enrich/template new file mode 100644 index 000000000000..67c7cc53c45f --- /dev/null +++ b/srcpkgs/python3-enrich/template @@ -0,0 +1,19 @@ +# Template file for 'python3-enrich' +pkgname=python3-enrich +version=1.2.6 +revision=1 +wrksrc="${pkgname/python3-/}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools_scm python3-wheel python3-rich" +depends="python3-rich" +checkdepends="python3-pytest python3-pytest-mock ${depends}" +short_desc="Extended variant of the rich library for python" +maintainer="Jan Christian Grünhage " +license="MIT" +homepage="https://github.com/pycontribs/enrich" +distfiles="${PYPI_SITE}/e/enrich/enrich-${version}.tar.gz" +checksum=0e99ff57d87f7b5def0ca79917e88fb9351aa0d52e228ee38bff7cd858315fe4 + +post_install() { + vlicense LICENSE +} From d0f8d4f917cc95725f71e1f239e5d957b5450408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 16 Jul 2021 12:35:21 +0200 Subject: [PATCH 4/9] New package: python3-bracex-2.1.1 --- srcpkgs/python3-bracex/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-bracex/template diff --git a/srcpkgs/python3-bracex/template b/srcpkgs/python3-bracex/template new file mode 100644 index 000000000000..8735c7f9d5bd --- /dev/null +++ b/srcpkgs/python3-bracex/template @@ -0,0 +1,20 @@ +# Template file for 'python3-bracex' +pkgname=python3-bracex +version=2.1.1 +revision=1 +wrksrc="${pkgname/python3-/}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +checkdepends="python3-pytest" +depends="python3" +short_desc="Bash style brace expansion for Python" +changelog="https://raw.githubusercontent.com/facelessuser/bracex/master/docs/src/markdown/about/changelog.md" +maintainer="Jan Christian Grünhage " +license="MIT" +homepage="https://github.com/facelessuser/bracex" +distfiles="${PYPI_SITE}/b/bracex/bracex-${version}.tar.gz" +checksum=01f715cd0ed7a622ec8b32322e715813f7574de531f09b70f6f3b2c10f682425 + +post_install() { + vlicense LICENSE.md +} From dd0d4803745e3eafbf4a1169a7f7475009a96f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 16 Jul 2021 12:36:07 +0200 Subject: [PATCH 5/9] New package: python3-wcmatch-8.2 --- srcpkgs/python3-wcmatch/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/python3-wcmatch/template diff --git a/srcpkgs/python3-wcmatch/template b/srcpkgs/python3-wcmatch/template new file mode 100644 index 000000000000..332e17443096 --- /dev/null +++ b/srcpkgs/python3-wcmatch/template @@ -0,0 +1,22 @@ +# Template file for 'python3-wcmatch' +pkgname=python3-wcmatch +version=8.2 +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" +depends="python3-bracex" +checkdepends="python3-pytest ${depends}" +short_desc="Wilcard File Name matching library" +changelog="https://raw.githubusercontent.com/facelessuser/wcmatch/main/docs/src/markdown/about/changelog.md" +maintainer="Jan Christian Grünhage " +license="MIT" +homepage="https://github.com/facelessuser/wcmatch" +distfiles="${PYPI_SITE}/w/wcmatch/wcmatch-${version}.tar.gz" +checksum=4d54ddb506c90b5a5bba3a96a1cfb0bb07127909e19046a71d689ddfb18c3617 + +post_install() { + vlicense LICENSE.md +} From 03a35732ef632c7b29d33edee57f1eb2249caf78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 16 Jul 2021 12:37:00 +0200 Subject: [PATCH 6/9] New package: python3-typeguard-2.13.0 --- srcpkgs/python3-typeguard/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-typeguard/template diff --git a/srcpkgs/python3-typeguard/template b/srcpkgs/python3-typeguard/template new file mode 100644 index 000000000000..23083f04f3a4 --- /dev/null +++ b/srcpkgs/python3-typeguard/template @@ -0,0 +1,18 @@ +# Template file for 'python3-typeguard' +pkgname=python3-typeguard +version=2.13.0 +revision=1 +wrksrc="${pkgname/python3-/}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3" +short_desc="Run-time type checker for python" +maintainer="Jan Christian Grünhage " +license="MIT" +homepage="https://github.com/agronholm/typeguard" +distfiles="${PYPI_SITE}/t/typeguard/typeguard-${version}.tar.gz" +checksum=04e38f92eb59410c9375d3be23df65e0a7643f2e8bcbd421423d808d2f9e99df + +post_install() { + vlicense LICENSE +} From 209d5dc1c03d4b9578fa63c653ecd79228304fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 16 Jul 2021 12:38:15 +0200 Subject: [PATCH 7/9] New package: python3-tenacity-8.0.1 --- srcpkgs/python3-tenacity/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-tenacity/template diff --git a/srcpkgs/python3-tenacity/template b/srcpkgs/python3-tenacity/template new file mode 100644 index 000000000000..f7b22da098f7 --- /dev/null +++ b/srcpkgs/python3-tenacity/template @@ -0,0 +1,16 @@ +# Template file for 'python3-tenacity' +pkgname=python3-tenacity +version=8.0.1 +revision=1 +wrksrc="${pkgname/python3-/}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools_scm python3-wheel" +depends="python3-Sphinx python3-tornado python3-typeguard" +checkdepends="python3-pytest ${depends}" +short_desc="General-purpose retrying library for Python" +changelog="https://tenacity.readthedocs.io/en/latest/changelog.html" +maintainer="Jan Christian Grünhage " +license="Apache-2.0" +homepage="https://github.com/jd/tenacity" +distfiles="${PYPI_SITE}/t/tenacity/tenacity-${version}.tar.gz" +checksum=43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f From d062f75ce3bf292425496024c25776c2e6a7f275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 12 Oct 2021 19:29:34 +0200 Subject: [PATCH 8/9] python3-yamllint: rename to yamllint, update to 1.26.3. --- srcpkgs/python3-yamllint | 1 + srcpkgs/python3-yamllint/template | 20 -------------------- srcpkgs/yamllint/template | 30 ++++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 20 deletions(-) create mode 120000 srcpkgs/python3-yamllint delete mode 100644 srcpkgs/python3-yamllint/template create mode 100644 srcpkgs/yamllint/template diff --git a/srcpkgs/python3-yamllint b/srcpkgs/python3-yamllint new file mode 120000 index 000000000000..c0085f7fd2f7 --- /dev/null +++ b/srcpkgs/python3-yamllint @@ -0,0 +1 @@ +yamllint \ No newline at end of file diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template deleted file mode 100644 index 201a7b34423a..000000000000 --- a/srcpkgs/python3-yamllint/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'python3-yamllint' -pkgname=python3-yamllint -version=1.15.0 -revision=5 -wrksrc="yamllint-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-pathspec python3-setuptools python3-yaml" -checkdepends="python3-pathspec python3-yaml" -short_desc="Python3 linter for YAML files" -maintainer="Jan Christian Grünhage " -license="GPL-3.0-or-later" -homepage="https://github.com/adrienverge/yamllint" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=9c27608ec61777f83c2cb29158b247a02079ad2aebb86522dd941397e3e78f6a -conflicts="python-yamllint>=0" - -do_check() { - python3 setup.py test -} diff --git a/srcpkgs/yamllint/template b/srcpkgs/yamllint/template new file mode 100644 index 000000000000..fea6d55baced --- /dev/null +++ b/srcpkgs/yamllint/template @@ -0,0 +1,30 @@ +# Template file for 'yamllint' +pkgname=yamllint +version=1.26.3 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-pathspec python3-setuptools python3-yaml" +checkdepends="python3-pytest python3-pathspec python3-yaml" +short_desc="Python 3 linter for YAML files" +maintainer="Jan Christian Grünhage " +license="GPL-3.0-or-later" +homepage="https://github.com/adrienverge/yamllint" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=a12b134d360c8655c831c018162fd058dac308f62462b14c24125171c5822610 +conflicts="python-yamllint>=0" + +case "$XBPS_TARGET_MACHINE" in + # See CI failure in https://github.com/void-linux/void-packages/runs/3882770805?check_suite_focus=true + *-musl) + make_check_args="--deselect tests/test_cli.py::CommandLineTestCase::test_run_with_locale + --deselect tests/rules/test_key_ordering.py::KeyOrderingTestCase::test_locale_accents + --deselect tests/rules/test_key_ordering.py::KeyOrderingTestCase::test_locale_case" + ;; +esac + +python3-yamllint_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} From bd6cbc9039ff05f9331958c6b8f592e796700028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 16 Jul 2021 12:39:28 +0200 Subject: [PATCH 9/9] python3-ansible-lint: rename to ansible-lint, update to 5.2.0. --- srcpkgs/ansible-lint/template | 32 +++++++++++++++++++++++++++ srcpkgs/python3-ansible-lint | 1 + srcpkgs/python3-ansible-lint/template | 24 -------------------- srcpkgs/python3-ansible-lint/update | 1 - 4 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 srcpkgs/ansible-lint/template create mode 120000 srcpkgs/python3-ansible-lint delete mode 100644 srcpkgs/python3-ansible-lint/template delete mode 100644 srcpkgs/python3-ansible-lint/update diff --git a/srcpkgs/ansible-lint/template b/srcpkgs/ansible-lint/template new file mode 100644 index 000000000000..208443d67f79 --- /dev/null +++ b/srcpkgs/ansible-lint/template @@ -0,0 +1,32 @@ +# Template file for 'ansible-lint' +pkgname=ansible-lint +version=5.2.0 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools_scm python3-wheel" +depends="ansible-core yamllint python3-six python3-yaml python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch" +short_desc="Linter for Ansible files" +maintainer="Jan Christian Grünhage " +license="MIT" +homepage="https://github.com/ansible-community/ansible-lint" +distfiles="${PYPI_SITE}/a/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=79020356d93f503d2cc869a7270e3c04316d510e33b6264edc08c7d0db0e8061 +# 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 + +post_patch() { + # scm versioning is broken in this release + vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg +} + +post_install() { + vlicense LICENSE +} + +python3-ansible-lint_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} diff --git a/srcpkgs/python3-ansible-lint b/srcpkgs/python3-ansible-lint new file mode 120000 index 000000000000..09ee8035c500 --- /dev/null +++ b/srcpkgs/python3-ansible-lint @@ -0,0 +1 @@ +ansible-lint \ No newline at end of file diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template deleted file mode 100644 index 93f631fa6a17..000000000000 --- a/srcpkgs/python3-ansible-lint/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'python3-ansible-lint' -pkgname=python3-ansible-lint -version=4.3.5 -revision=3 -wrksrc="ansible-lint-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="ansible python3-six python3-yaml python3-ruamel.yaml" -short_desc="Linter for Ansible files" -maintainer="Jan Christian Grünhage " -license="MIT" -homepage="https://github.com/willthames/ansible-lint" -changelog="https://raw.githubusercontent.com/willthames/ansible-lint/master/CHANGELOG.md" -distfiles="${PYPI_SITE}/a/ansible-lint/ansible-lint-${version}.tar.gz" -checksum=bec230cf5fcc4d976246d4170da3ae289715f99185529ca8bba4b3c173035656 - -post_patch() { - # scm versioning is broken in this release - vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg -} - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/python3-ansible-lint/update b/srcpkgs/python3-ansible-lint/update deleted file mode 100644 index deb78f510de5..000000000000 --- a/srcpkgs/python3-ansible-lint/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*a[0-9] *a[0-9].dev* *rc[0-9]"