update to 4.1

2 files changed, 46 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6bffabc250c..5aa3adb2cce4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
 pkgbase = python-pyscaffold
 	pkgdesc = Python project template generator with batteries included
-	pkgver = 3.3.1
+	pkgver = 4.1
 	pkgrel = 1
 	url = https://pyscaffold.org/
 	arch = any
 	license = MIT
-	makedepends = git
-	makedepends = python-wheel
-	depends = python
-	depends = python-setuptools-scm
-	depends = git
+	makedepends = python-setuptools
+	makedepends = python-setuptools-scm
+	depends = python-appdirs>=1.4.4
+	depends = python-appdirs<2
+	depends = python-configupdater>=3.0
+	depends = python-configupdater<4
+	depends = python-tomlkit>=0.7.0
+	depends = python-tomlkit<2
+	depends = python-packaging>=20.7
 	optdepends = python-django: Scaffold Django projects.
 	optdepends = python-cookiecutter: Create custom scaffold templates.
 	optdepends = python-pre-commit: Use Git pre-commit hooks.
@@ -17,8 +21,7 @@ pkgbase = python-pyscaffold
 	optdepends = python-pytest: Use the integrated unit testing.
 	optdepends = python-pytest-runner: Use the integrated unit testing.
 	optdepends = python-pytest-cov: Generate a coverage report for your project.
-	source = pyscaffold-3.3.1::git+https://github.com/pyscaffold/pyscaffold.git#tag=v3.3.1
-	md5sums = SKIP
+	source = python-pyscaffold-4.1.tar.gz::https://github.com/pyscaffold/pyscaffold/archive/v4.1.tar.gz
+	sha256sums = 6db7ef19ebe812ebfc4d7cdb0cfb0dfcbeffc9fd48010ee21c26c359d6974956
 
 pkgname = python-pyscaffold
-
diff --git a/PKGBUILD b/PKGBUILD
index 2318f7a16e9e..445500def717 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,46 @@
-# Maintainer: gkmcd <g@dramati.cc>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: gkmcd <g@dramati.cc>
 
-pkgname=('python-pyscaffold')
-pkgver=3.3.1
+pkgname=python-pyscaffold
+pkgver=4.1
 pkgrel=1
 pkgdesc="Python project template generator with batteries included"
 url="https://pyscaffold.org/"
 arch=('any')
 license=('MIT')
-depends=('python' 'python-setuptools-scm' 'git')
-optdepends=('python-django: Scaffold Django projects.'
-            'python-cookiecutter: Create custom scaffold templates.'
-            'python-pre-commit: Use Git pre-commit hooks.'
-            'python-sphinx: Support building documentation with Sphinx.'
-            'python-pytest: Use the integrated unit testing.'
-            'python-pytest-runner: Use the integrated unit testing.'
-            'python-pytest-cov: Generate a coverage report for your project.')
-makedepends=('git' 'python-wheel')
-source=("pyscaffold-${pkgver}::git+https://github.com/pyscaffold/pyscaffold.git#tag=v${pkgver}")
-md5sums=('SKIP')
+depends=(
+	'python-appdirs>=1.4.4'
+	'python-appdirs<2'
+	'python-configupdater>=3.0'
+	'python-configupdater<4'
+	'python-tomlkit>=0.7.0'
+	'python-tomlkit<2'
+	'python-packaging>=20.7')
+optdepends=(
+	'python-django: Scaffold Django projects.'
+	'python-cookiecutter: Create custom scaffold templates.'
+	'python-pre-commit: Use Git pre-commit hooks.'
+	'python-sphinx: Support building documentation with Sphinx.'
+	'python-pytest: Use the integrated unit testing.'
+	'python-pytest-runner: Use the integrated unit testing.'
+	'python-pytest-cov: Generate a coverage report for your project.')
+makedepends=('git' 'python-setuptools' 'python-setuptools-scm')
+# checkdepends=('python-pytest-runner')
+source=("$pkgname::git+https://github.com/pyscaffold/pyscaffold/#tag=v$pkgver")
+sha256sums=('SKIP')
 
 build() {
-  cd "${srcdir}"/pyscaffold-$pkgver
-  python setup.py build
+	cd "$pkgname"
+	python setup.py build
 }
 
+# check() {
+# 	cd "$pkgname"
+# 	python setup.py pytest --addopts '-c /dev/null'
+# }
+
 package_python-pyscaffold() {
-  cd "${srcdir}/pyscaffold-$pkgver"
-  python setup.py install --root=${pkgdir}
-  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	cd "$pkgname"
+	PYTHONHASHSEED=0 python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }