Date: Sunday, April 9, 2023 @ 20:35:28
  Author: dvzrv
Revision: 1443528

upgpkg: molecule 4.0.4-2: Rebuild to fix reproducibility.

Use bash arrays with one entry per line for better handling.
Add missing makedepends python-wheel.
Cleanup check() and package().

Modified:
  molecule/trunk/PKGBUILD

----------+
 PKGBUILD |   56 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-04-09 20:34:18 UTC (rev 1443527)
+++ PKGBUILD    2023-04-09 20:35:28 UTC (rev 1443528)
@@ -2,18 +2,43 @@
 
 pkgname=molecule
 pkgver=4.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Aids in the development and testing of Ansible roles"
 arch=(any)
 url="https://github.com/ansible-community/molecule";
 license=(MIT)
-depends=(python-ansible-compat python-click
-python-click-help-colors python-cookiecutter python-enrich python-jinja
-python-jsonschema python-packaging python-pluggy python-pyyaml python-rich)
-makedepends=(python-build python-installer python-setuptools 
python-setuptools-scm)
-checkdepends=(ansible python-ansi2html python-filelock python-pexpect
-python-pytest python-pytest-mock python-pytest-testinfra python-pytest-xdist
-yamllint)
+depends=(
+  python
+  python-ansible-compat
+  python-click
+  python-click-help-colors
+  python-cookiecutter
+  python-enrich
+  python-jinja
+  python-jsonschema
+  python-packaging
+  python-pluggy
+  python-pyyaml
+  python-rich
+)
+makedepends=(
+  python-build
+  python-installer
+  python-setuptools
+  python-setuptools-scm
+  python-wheel
+)
+checkdepends=(
+  ansible
+  python-ansi2html
+  python-filelock
+  python-pexpect
+  python-pytest
+  python-pytest-mock
+  python-pytest-testinfra
+  python-pytest-xdist
+  yamllint
+)
 optdepends=(
   'ansible: for the ansible verifier'
   'molecule-docker: for the docker driver'
@@ -32,22 +57,17 @@
 }
 
 check() {
+  local site_packages=$(python -c "import site; 
print(site.getsitepackages()[0])")
   cd $pkgname-$pkgver
-  local _site_packages=$(python -c "import site; 
print(site.getsitepackages()[0])")
-  local _test_dir="$PWD/test_dir"
 
   # install into test location
-  mkdir -vp "$_test_dir"
-  python -m installer --destdir="$_test_dir" dist/*.whl
-
-  export PYTHONPATH="$_test_dir/$_site_packages:$PYTHONPATH"
-  export PATH="$_test_dir/usr/bin:$PATH"
-  pytest -v "$_test_dir/$_site_packages/molecule/test/unit/" -c /dev/null
+  python -m installer --destdir=test_dir dist/*.whl
+  export PYTHONPATH="test_dir/$site_packages:$PYTHONPATH"
+  export PATH="test_dir/usr/bin:$PATH"
+  pytest -v "test_dir/$site_packages/molecule/test/unit/" -c /dev/null
 }
 
 package() {
-  local _site_packages=$(python -c "import site; 
print(site.getsitepackages()[0])")
-
   cd $pkgname-$pkgver
   python -m installer --destdir="$pkgdir" dist/*.whl
   install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"

Reply via email to