Date: Thursday, September 16, 2021 @ 17:37:27 Author: dvzrv Revision: 1016458
upgpkg: molecule-docker 1.0.2-1: Upgrade to 1.0.2. Update depends, makedepends and checkdepends to current requirements. Remove excessive error reporting from pytest configuration as it leads to test errors. Ignore tests that require the driver to be installed to the system version of molecule during testing. Simplify installation in package() to adhere to python package guidelines. Modified: molecule-docker/trunk/PKGBUILD ----------+ PKGBUILD | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-09-16 17:37:04 UTC (rev 1016457) +++ PKGBUILD 2021-09-16 17:37:27 UTC (rev 1016458) @@ -1,26 +1,27 @@ # Maintainer: David Runge <[email protected]> pkgname=molecule-docker -pkgver=0.3.3 -pkgrel=2 +pkgver=1.0.2 +pkgrel=1 pkgdesc="Molecule Docker Driver" arch=('any') url="https://github.com/ansible-community/molecule-docker"; license=('MIT') -depends=('molecule' 'python-docker' 'python-selinux') -makedepends=('python-setuptools_scm') +depends=('molecule' 'python-ansible-compat' 'python-docker' 'python-selinux') +makedepends=('python-setuptools-scm' 'python-setuptools-scm-git-archive') checkdepends=('python-pytest' 'python-pytest-helpers-namespace') optdepends=('docker: for using a local docker setup') -# 0.3.3a1 == 0.3.3 (CD pipeline mess): https://github.com/ansible-community/molecule-docker/issues/24 -source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}a1.tar.gz";) -sha512sums=('7a13e894f791d77f6ecadee1ebeea91ce368792a9526e14f5b5567d4de229266223f751637e46129deb0915e3446d7489595c98e91653291f17659ac8fe7d00b') -b2sums=('65dfef2f1c9f293ba97e342b6e61c4b9c2e2c40b1e2728b200b988b2d4645ac118b951bc862e36cf6aa13067a7a9c2fa9a711b1f2c7a8e41f89d31fe748657da') +source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz";) +sha512sums=('6e21ded1aba056e8cbe3696a598b6cf627bb62559a8d2d6595cf9822988c9a0f0861b9f6ea2955e65a41cc7e254813cacce1f44d4c4ce8d2d3828d7ef3e55c03') +b2sums=('f04ddd69e0097aebd7f2c1a52c73d7d708cf602621d78d37bfe809268246f2a05d69cb4b4ec5e2d19244a1b35c1edbfb82549c98e02f12f469745003888809cb') prepare() { - mv -v "${pkgname}-${pkgver}a1" "${pkgname}-${pkgver}" cd "$pkgname-$pkgver" + # remove additional pytest options + # remove fitler to raise warnings as errors: https://github.com/ansible-community/molecule/issues/3004 sed -e '/pre-commit/d' \ -e '/addopts/d' \ + -e '/error/d' \ -i setup.cfg } @@ -32,15 +33,14 @@ check() { cd "$pkgname-$pkgver" export PYTHONPATH="build:${PYTHONPATH}" - # NOTE: we can only run the detection test, as the other tests require running docker - pytest -v "${pkgname//-/_}/test/test_driver.py" + # disable tests that require the driver to be installed for the system + # version of molecule that we are testing with + pytest -v --ignore "src/molecule_docker/test/test_func.py" } package() { cd "$pkgname-$pkgver" - python setup.py install --skip-build \ - --optimize=1 \ - --root="${pkgdir}" + python setup.py install --optimize=1 --root="${pkgdir}" install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" install -vDm 644 README.rst \ -t "${pkgdir}/usr/share/doc/${pkgname}"
