Date: Friday, January 6, 2023 @ 13:14:16 Author: dvzrv Revision: 1378600
upgpkg: molecule-vagrant 2.0.0-1: Upgrade to 2.0.0. Remove unneeded patch. Switch to git checkout of pinned commit as pypi sdist tarball is missing: https://github.com/ansible-community/molecule-vagrant/issues/208 Simplify test setup in check(). Modified: molecule-vagrant/trunk/PKGBUILD Deleted: molecule-vagrant/trunk/molecule-vagrant-1.0.0-dependencies.patch -------------------------------------------+ PKGBUILD | 46 ++++++++++------------------ molecule-vagrant-1.0.0-dependencies.patch | 16 --------- 2 files changed, 18 insertions(+), 44 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-01-06 13:07:00 UTC (rev 1378599) +++ PKGBUILD 2023-01-06 13:14:16 UTC (rev 1378600) @@ -3,52 +3,42 @@ # Contributor: Marc Straube <[email protected]> pkgname=molecule-vagrant -pkgver=1.0.0 -pkgrel=3 +pkgver=2.0.0 +_commit=36513e96191ae3ae26d2aefd2ff99fa54689fba6 # refs/tags/v2.0.0 +pkgrel=1 pkgdesc="Molecule Vagrant Driver" arch=(any) url="https://github.com/ansible-community/molecule-vagrant"; license=(MIT) -depends=(ansible-core molecule python-jinja python-selinux python-yaml python-vagrant) -makedepends=(python-build python-installer python-setuptools python-setuptools-scm python-toml python-wheel) +depends=(ansible-core molecule python-jinja python-pyyaml python-selinux python-vagrant) +makedepends=(git python-build python-installer python-setuptools python-setuptools-scm python-toml python-wheel) checkdepends=(python-filelock python-pytest) -source=( - https://files.pythonhosted.org/packages/source/${pkgname::1}/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-1.0.0-dependencies.patch -) -sha512sums=('de55cea15c5df876b21f91f7f27b6de88896ea301a9e7c240a82abfaaea44d09a6ea85941a5ff3a84cb28991c77e344f9c2aa27f852f652c98e70f51787c8ca5' - '9ffa61e4338240bf0d7c0e6149584d8ea2d3c2ad8b7c9f40173d16da250127181dcf1a15e4412e0691c0d4a4999a3444b28e83485d9f64dbf6405ffa8651bbaf') -b2sums=('6267554e55717ecde97b062867f4a72691ffd912155fe05d7f50f61682b46ed955c26789819af1e3c386dea4f89e606810c19a65212859ac6d75a491c3ef927d' - '66a19c9d2de3ead411aab50e94d83919db6a203be600ab4d9273c5ffdf214e870254c573ec98b3f0403947ca44a4538032e18baf2c30037a713e4060c7103965') +# sdist tarball not available on pypi.org: https://github.com/ansible-community/molecule-vagrant/issues/208 +# auto-generated tarball will not create a full wheel: https://github.com/ansible-community/molecule-vagrant/issues/209 +# source=(https://files.pythonhosted.org/packages/source/${pkgname::1}/$pkgname/$pkgname-$pkgver.tar.gz) +source=(git+https://github.com/ansible-community/molecule-vagrant#tag=$_commit) +sha512sums=('SKIP') +b2sums=('SKIP') -prepare() { - # remove setuptools-scm-git-archive from makedepends: https://github.com/ansible-community/molecule-vagrant/pull/198 - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.0.0-dependencies.patch -} - build() { - cd $pkgname-$pkgver - python -m build --wheel --skip-dependency-check --no-isolation + cd $pkgname + python -m build --wheel --no-isolation } check() { - cd $pkgname-$pkgver + cd $pkgname local _site_packages=$(python -c "import site; print(site.getsitepackages()[0])") - local _test_dir="$PWD/test_dir" + python -m installer --destdir="test_dir" dist/*.whl - # install to test location - mkdir -vp "$_test_dir" - python -m installer --destdir="$_test_dir" dist/*.whl - - export PYTHONPATH="$_test_dir/$_site_packages:$PYTHONPATH" + export PYTHONPATH="test_dir/$_site_packages:$PYTHONPATH" # ignore tests that require running molecule - pytest -v "$_test_dir/$_site_packages/molecule_vagrant/test/" --ignore "$_test_dir/$_site_packages/molecule_vagrant/test/functional/" -c /dev/null + pytest -v "test_dir/$_site_packages/molecule_vagrant/test/" --ignore "test_dir/$_site_packages/molecule_vagrant/test/functional/" -c /dev/null } package() { local _site_packages="$(python -c "import site; print(site.getsitepackages()[0])")" - cd $pkgname-$pkgver + cd $pkgname python -m installer --destdir="$pkgdir" dist/*.whl install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" # remove tests: https://github.com/ansible-community/molecule-vagrant/issues/199 Deleted: molecule-vagrant-1.0.0-dependencies.patch =================================================================== --- molecule-vagrant-1.0.0-dependencies.patch 2023-01-06 13:07:00 UTC (rev 1378599) +++ molecule-vagrant-1.0.0-dependencies.patch 2023-01-06 13:14:16 UTC (rev 1378600) @@ -1,16 +0,0 @@ -diff --git c/pyproject.toml w/pyproject.toml -index ce03cd2..9468b8c 100644 ---- c/pyproject.toml -+++ w/pyproject.toml -@@ -1,9 +1,7 @@ - [build-system] - requires = [ -- "setuptools >= 42.0.0", # required by pyproject+setuptools_scm integration -- "setuptools_scm[toml] >= 3.5.0", # required for "no-local-version" scheme -- "setuptools_scm_git_archive >= 1.0", -- "wheel", -+ "setuptools >= 45.0.0", # required by pyproject+setuptools_scm integration -+ "setuptools_scm[toml] >= 7.0.0", # required for "no-local-version" scheme - ] - build-backend = "setuptools.build_meta" -
