Date: Friday, May 14, 2021 @ 18:06:37 Author: dvzrv Revision: 934288 upgpkg: molecule 3.3.1-1: Upgrade to 3.3.1.
Remove now unnecessary patch for python-click. Modified: molecule/trunk/PKGBUILD Deleted: molecule/trunk/molecule-click-8.0.patch --------------------------+ PKGBUILD | 26 +++++++++++--------------- molecule-click-8.0.patch | 32 -------------------------------- 2 files changed, 11 insertions(+), 47 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-14 18:02:35 UTC (rev 934287) +++ PKGBUILD 2021-05-14 18:06:37 UTC (rev 934288) @@ -1,37 +1,33 @@ # Maintainer: David Runge <dv...@archlinux.org> pkgname=molecule -pkgver=3.3.0 -pkgrel=2 +pkgver=3.3.1 +pkgrel=1 pkgdesc="Aids in the development and testing of Ansible roles" arch=('any') url="https://github.com/ansible-community/molecule" license=('MIT') -depends=('ansible' 'python-cerberus' 'python-click' 'python-click-completion' -'python-click-help-colors' 'python-cookiecutter' 'python-enrich' 'python-jinja' -'python-packaging' 'python-paramiko' 'python-pluggy' 'python-rich' -'python-selinux' 'python-setuptools' 'python-subprocess-tee' 'python-yaml' -'yamllint' 'ansible-lint') +depends=('ansible' 'ansible-lint' 'python-cerberus' 'python-click' +'python-click-completion' 'python-click-help-colors' 'python-cookiecutter' +'python-enrich' 'python-jinja' 'python-packaging' 'python-paramiko' +'python-pluggy' 'python-rich' 'python-selinux' 'python-setuptools' +'python-subprocess-tee' 'python-yaml') makedepends=('python-setuptools-scm' 'python-simplejson' 'python-toml') checkdepends=('python-ansi2html' 'python-mock' 'python-pexpect' 'python-pytest' 'python-pytest-helpers-namespace' 'python-pytest-html' 'python-pytest-mock' 'python-pytest-testinfra' -'python-pytest-verbose-parametrize' 'python-pytest-xdist') +'python-pytest-verbose-parametrize' 'python-pytest-xdist' 'yamllint') optdepends=('molecule-docker: for the docker driver' 'molecule-podman: for the podman driver' 'molecule-vagrant: for the vagrant driver' 'python-pywinrm: for Windows support' 'python-pytest-testinfra: for the testinfra verifier') -source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz" - molecule-click-8.0.patch) -sha512sums=('2d72ad4da9c654adc62a9263593ed17c2ddb21ee5dfbe6479eaa5a71c52329098b2c5eec3a8995ce1016cf62c39cd48116d45c66eb2288622dbf24b1d9ba0423' - '5858631ebc5ca86fe3109abb4ca38d78431e2e81f565df7f3e7a3d99d9f982d4bde14497079a6461401a50f2fdca7b5252da30f05ad0302104cc0c11ffda6a9e') -b2sums=('fa94d9637a5262c307539e1ea2c46238effe388d50eca13eff22e71e40c537e872b75e0c75695c17358d4493360213ee4c15b395df226d5ae187bb6595fdc5a1' - 'e628017797a9b11a27bfffb0f6a2913eb28efd44275911f812de1796979ea57044cf41f741598c7d2b65fbca242fcb3d939eacb9b1628fc9380c4e24552e2e1a') +source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha512sums=('893f2594a3936ea1769aa9f3f6087790bd5a190a1bd272a8e6a73f1ebdd4fba81f43b8ef3fdd578bbf6be2d12a16abaf55cb9be21cd322b3e87e6150e878e0fa') +b2sums=('70702b2bce1711a1be2877a47d8dfbb4b26f6ae5ec1e1a0b68ff17e0b8d14b26c8ac9304a32ad1ee2df1eb001bcb7f70f535f49fc8a68af668938b050852d729') prepare() { cd "$pkgname-$pkgver" - patch -Np1 < ../molecule-click-8.0.patch # remove additional pytest options # remove fitler to raise warnings as errors: https://github.com/ansible-community/molecule/issues/3004 sed -e '/addopts/d' \ Deleted: molecule-click-8.0.patch =================================================================== --- molecule-click-8.0.patch 2021-05-14 18:02:35 UTC (rev 934287) +++ molecule-click-8.0.patch 2021-05-14 18:06:37 UTC (rev 934288) @@ -1,32 +0,0 @@ -From 13c880d5ac956fc2cabdae0b8481bcba9f4e7f8c Mon Sep 17 00:00:00 2001 -From: anthraxx <leve...@leventepolyak.net> -Date: Wed, 12 May 2021 20:02:14 +0200 -Subject: [PATCH] fix(deps): add compatibility for click 8.0 via - click-help-colors - -The incompatibility was marked in 0650abe7dd3bed5e477f91adefe26630cee22da0 -as click-help-colors was not compatible. In the meanwhile version 0.9 -added compatibility via https://github.com/click-contrib/click-help-colors/commit/00cdd2ca327624a8db4b5706d86b8e66da5c9dc6 ---- - setup.cfg | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index 0f26b262..910019ca 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -68,9 +68,9 @@ setup_requires = - install_requires = - ansible-lint >= 5.0.5 # only for the prerun functionality - cerberus >= 1.3.1 -- click >= 7.0, < 8.0 # https://github.com/click-contrib/click-help-colors/issues/12 -+ click >= 7.0 - click-completion >= 0.5.1 -- click-help-colors >= 0.6 -+ click-help-colors >= 0.9 - cookiecutter >= 1.6.0, != 1.7.1 - dataclasses; python_version<"3.7" - enrich >= 1.2.5 --- -2.31.1 -