Date: Sunday, November 13, 2022 @ 13:46:18 Author: dvzrv Revision: 1347253
upgpkg: molecule-docker 2.1.0-3: Rebuild to remove use of unnecessary dependencies. Apply upstreamed patch to remove use of python-pip, python-wheel and python-setuptools-scm-git-archive in makedepends: https://github.com/ansible-community/molecule-docker/pull/195 Added: molecule-docker/trunk/molecule-docker-2.1.0-dependencies.patch Modified: molecule-docker/trunk/PKGBUILD ------------------------------------------+ PKGBUILD | 26 ++++++++++++++++---------- molecule-docker-2.1.0-dependencies.patch | 17 +++++++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-13 13:31:53 UTC (rev 1347252) +++ PKGBUILD 2022-11-13 13:46:18 UTC (rev 1347253) @@ -2,29 +2,35 @@ pkgname=molecule-docker pkgver=2.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Molecule Docker Driver" arch=(any) url="https://github.com/ansible-community/molecule-docker"; license=(MIT) depends=(molecule python-docker python-requests python-selinux) -makedepends=(python-build python-installer python-setuptools-scm python-setuptools-scm-git-archive python-wheel) +makedepends=(python-build python-installer python-setuptools python-setuptools-scm python-wheel) checkdepends=(ansible-core python-filelock python-pytest python-pytest-helpers-namespace) optdepends=( 'ansible-core: for Dockerfile validation' 'docker: for using a local docker setup' ) -source=(https://files.pythonhosted.org/packages/source/${pkgname::1}/$pkgname/$pkgname-$pkgver.tar.gz) -sha512sums=('3c3dc493eb183ab3acc01738d8fd2260718a44f2c1a15073dac7b9da0899a3672fc5f2bfae98aa27ea2472170ec83d049bf15943fdbccf6dc1e4efd39d833450') -b2sums=('c4c86520f779b52d15f7c5c0985f3b54edc9d19a39afd1afbe2610fbb733b12731c1f3dc16026c02680286904633dce74d5708495dffc03ac54fd59554300415') +source=( + https://files.pythonhosted.org/packages/source/${pkgname::1}/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-2.1.0-dependencies.patch +) +sha512sums=('3c3dc493eb183ab3acc01738d8fd2260718a44f2c1a15073dac7b9da0899a3672fc5f2bfae98aa27ea2472170ec83d049bf15943fdbccf6dc1e4efd39d833450' + '0772a5fe31d0275a3abc2133ef2797e6ceebf6a7d019bf7d680656e8f51cf7b71adb36768b86c9271b4d6cc0d24fd3dd6cda84923a7698d3f4cf9cce09a994bb') +b2sums=('c4c86520f779b52d15f7c5c0985f3b54edc9d19a39afd1afbe2610fbb733b12731c1f3dc16026c02680286904633dce74d5708495dffc03ac54fd59554300415' + 'dcf66b869bbcbc3a916e69109e986397975687f6f62f56090fb5d0afe49c68872140aac7f1edad51d36b4705980c2573d88472fd7f836697f574cb0b8e4b9fe2') +prepare() { + # remove the use of pip and setuptools-scm-git-archive from makedepends: + # https://github.com/ansible-community/molecule-docker/pull/195 + patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-2.1.0-dependencies.patch +} + build() { cd $pkgname-$pkgver - - # remove pip from build backends because it is in fact not required and just - # YOLO installs things - sed -e '/pip/d' -i pyproject.toml - export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver python -m build --wheel --no-isolation } Added: molecule-docker-2.1.0-dependencies.patch =================================================================== --- molecule-docker-2.1.0-dependencies.patch (rev 0) +++ molecule-docker-2.1.0-dependencies.patch 2022-11-13 13:46:18 UTC (rev 1347253) @@ -0,0 +1,17 @@ +diff --git c/pyproject.toml w/pyproject.toml +index 0d283d7..c79435a 100644 +--- c/pyproject.toml ++++ w/pyproject.toml +@@ -1,10 +1,7 @@ + [build-system] + requires = [ +- "pip >= 19.3.1", +- "setuptools >= 42", +- "setuptools_scm[toml] >= 3.5.0", +- "setuptools_scm_git_archive >= 1.1", +- "wheel >= 0.33.6", ++ "setuptools >= 45", ++ "setuptools_scm[toml] >= 7.0.0", + ] + build-backend = "setuptools.build_meta" +
