releng-tool 0.13-1

- Version bump.
- Dropped Python 2 variant (recommended by MarsSeed).

Signed-off-by: James Knight <james.d.knight@live.com>

2 files changed, 22 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d2db1ec6907..f70801c962c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = releng-tool
-	pkgdesc = Tool to assist in the release engineering of a project
-	pkgver = 0.12.0
+	pkgdesc = A tool to manage the building of packages
+	pkgver = 0.13.0
 	pkgrel = 1
 	url = https://releng.io/
 	arch = any
 	license = BSD
 	makedepends = git
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	makedepends = sed
+	makedepends = python
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
 	optdepends = autoconf: support for autotools package management
 	optdepends = bash-completion: shell completion for bash
 	optdepends = bzr: supporting for Bazaar cloning
@@ -21,13 +22,10 @@ pkgbase = releng-tool
 	optdepends = mercurial: support for Mercurial cloning
 	optdepends = openssh: support for secure-copy fetching of sources
 	optdepends = patch: support for patching package sources
+	optdepends = scons: support for building scons-dependent packages
 	optdepends = subversion: supporting for Subversion checkouts
 	optdepends = zsh-completions: shell completion for zsh
-	source = releng-tool-0.12.0::git+https://github.com/releng-tool/releng-tool.git#tag=v0.12
+	source = releng-tool-0.13.0::git+https://github.com/releng-tool/releng-tool.git#tag=v0.13
 	sha512sums = SKIP
 
 pkgname = releng-tool
-	depends = python
-
-pkgname = python2-releng-tool
-	depends = python2
diff --git a/PKGBUILD b/PKGBUILD
index 80566cc8cec7..f26b153536e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: James Knight <james.d.knight@live.com>
 
-pkgbase=releng-tool
-pkgname=(releng-tool python2-releng-tool)
-pkgver=0.12.0
-_pkgtarget=tag=v0.12
+pkgname=releng-tool
+pkgver=0.13.0
+_pkgtarget=tag=v0.13
 pkgrel=1
-pkgdesc='Tool to assist in the release engineering of a project'
+pkgdesc='A tool to manage the building of packages'
 url=https://releng.io/
 arch=(any)
 license=(BSD)
 makedepends=(
   git
-  python-setuptools
-  python2-setuptools
-  sed
+  python
+  python-build
+  python-installer
+  python-wheel
 )
 optdepends=(
   'autoconf: support for autotools package management'
@@ -28,61 +28,21 @@ optdepends=(
   'mercurial: support for Mercurial cloning'
   'openssh: support for secure-copy fetching of sources'
   'patch: support for patching package sources'
+  'scons: support for building scons-dependent packages'
   'subversion: supporting for Subversion checkouts'
   'zsh-completions: shell completion for zsh'
 )
 source=($pkgname-$pkgver::git+https://github.com/releng-tool/releng-tool.git#$_pkgtarget)
 sha512sums=(SKIP)
 
-prepare() {
-  cp -a $pkgbase-$pkgver{,-py2}
-
-  cd $pkgbase-$pkgver-py2/releng
-  sed 's_#!/usr/bin/env python_#!/usr/bin/env python2_' \
-      -i $(find . -name '*.py')
-}
-
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  python setup.py build
-
-  cd "$srcdir/$pkgbase-$pkgver-py2"
-  python2 setup.py build
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  PYTHONDONTWRITEBYTECODE=1 python -m tests || warning "python tests failed"
-
-  cd "$srcdir/$pkgbase-$pkgver-py2"
-  TOX_INI_DIR="$srcdir/$pkgbase-$pkgver-py2" \
-  PYTHONDONTWRITEBYTECODE=1 python2 -m tests || warning "python2 tests failed"
-}
-
-package_releng-tool() {
-  depends=(python)
-  cd $pkgbase-$pkgver
-
-  export PYTHONHASHSEED=0
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build --verbose
-
-  install -vDm644 scripts/completion/bash \
-    "$pkgdir/usr/share/bash-completion/completions/$pkgname"
-  install -vDm644 scripts/completion/fish \
-    "$pkgdir/usr/share/fish/completions/$pkgname.fish"
-  install -vDm644 scripts/completion/zsh \
-    "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
-  install -vDm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  cd $pkgname-$pkgver
+  python -m build --wheel --no-isolation
 }
 
-package_python2-releng-tool() {
-  depends=(python2)
-  cd $pkgbase-$pkgver-py2
-
-  export PYTHONHASHSEED=0
-  python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build --verbose
-
-  mv "$pkgdir/usr/bin/releng-tool" "$pkgdir/usr/bin/$pkgname"
+package() {
+  cd $pkgname-$pkgver
+  python -m installer --destdir="$pkgdir" dist/*.whl
 
   install -vDm644 scripts/completion/bash \
     "$pkgdir/usr/share/bash-completion/completions/$pkgname"
@@ -91,15 +51,4 @@ package_python2-releng-tool() {
   install -vDm644 scripts/completion/zsh \
     "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
   install -vDm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  local _completion_script
-  local _completion_scripts=(
-    "$pkgdir/usr/share/bash-completion/completions/$pkgname"
-    "$pkgdir/usr/share/fish/completions/$pkgname.fish"
-    "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
-  )
-  for _completion_script in ${_completion_scripts[*]}; do
-      sed -i s/releng-tool/$pkgname/ "$_completion_script"
-      sed -i s/_releng_tool/_releng_tool_py2/ "$_completion_script"
-  done
 }