New upstream version

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

2 files changed, 19 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73f383f1977b..0a5bde73e512 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 # Generated by mksrcinfo v8
-# Fri Oct 21 15:54:13 UTC 2016
+# Wed Mar 15 00:08:34 UTC 2017
 pkgbase = python-radon
-	pkgver = 1.4.2
+	pkgver = 1.5.0
 	pkgrel = 1
 	url = https://radon.readthedocs.org/
 	arch = any
 	license = MIT
 	makedepends = python-sphinx
 	makedepends = python2-sphinx
-	source = https://pypi.python.org/packages/91/48/5853fa60811d6cec1043bd60b057aafc22706e19ab90b33d8df8155e6b8d/radon-1.4.2.tar.gz
-	source = https://raw.githubusercontent.com/rubik/radon/master/LICENSE
-	sha256sums = 4f24ea6215e17c7c6d8548035c56d29e31131d17da1d607359fc07e9b6fabe97
-	sha256sums = 13cde2df14c3b42e6ecd452dd2b4d679ac40e7cbaaa8d2d87068f1e46be53677
+	source = https://files.pythonhosted.org/packages/source/r/radon/radon-1.5.0.tar.gz
+	sha256sums = 5463d02c91f93e694b76fd947427e99e86244c9c042881c2112882aaccd8d2c0
 
 pkgname = python-radon
 	pkgdesc = A tool that computes various metrics for Python source code
diff --git a/PKGBUILD b/PKGBUILD
index d1be87ab04ae..6fddc80482f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,35 +2,32 @@
 # Contributor: Simon Conseil <contact+aur at saimon dot org>
 # Contributor: Jesus Alvarez
 
-_module=radon
-pkgbase="python-${_module}"
-pkgname=("${pkgbase}" "python2-${_module}")
-pkgver=1.4.2
+_name=radon
+pkgbase="python-${_name}"
+pkgname=("${pkgbase}" "python2-${_name}")
+pkgver=1.5.0
 pkgrel=1
 arch=('any')
-url="https://radon.readthedocs.org/"
+url="https://${_name}.readthedocs.org/"
 license=('MIT')
 depends=()
 makedepends=('python-sphinx' 'python2-sphinx')
-source=("https://pypi.python.org/packages/91/48/5853fa60811d6cec1043bd60b057aafc22706e19ab90b33d8df8155e6b8d/${_module}-${pkgver}.tar.gz"
- "https://raw.githubusercontent.com/rubik/radon/master/LICENSE"
-)
-sha256sums=('4f24ea6215e17c7c6d8548035c56d29e31131d17da1d607359fc07e9b6fabe97'
-            '13cde2df14c3b42e6ecd452dd2b4d679ac40e7cbaaa8d2d87068f1e46be53677')
+source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz")
+sha256sums=('5463d02c91f93e694b76fd947427e99e86244c9c042881c2112882aaccd8d2c0')
 
 
 prepare() {
-  cp -r ${_module}-${pkgver} python2-${_module}-${pkgver}
+  cp -r "${_name}-${pkgver}" "python2-${_name}-${pkgver}"
 }
 
 build() {
-  cd "${srcdir}/${_module}-${pkgver}"
+  cd "${srcdir}/${_name}-${pkgver}"
   sed -i -e "s/mando[^']*/mando/" -e "s/colorama[^']*/colorama/" setup.py
   python setup.py build
   cd docs
   make html
 
-  cd "${srcdir}/python2-${_module}-${pkgver}"
+  cd "${srcdir}/python2-${_name}-${pkgver}"
   sed -i -e "s/mando[^']*/mando/" -e "s/colorama[^']*/colorama/" setup.py
   python2 setup.py build
   cd docs
@@ -41,29 +38,29 @@ package_python-radon() {
   pkgdesc="A tool that computes various metrics for Python source code"
   depends=('python-flake8-polyfill' 'python-mando' 'python-colorama')
 
-  cd "${srcdir}/${_module}-${pkgver}"
+  cd "${srcdir}/${_name}-${pkgver}"
   python setup.py install --root="$pkgdir" --skip-build --optimize=1
 
   install -d "${pkgdir}/usr/share/doc/${pkgname}"
   cp -r docs/_build/html/* "${pkgdir}/usr/share/doc/${pkgname}"
 
   # license
-  install -Dm644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_python2-radon() {
   pkgdesc="A tool that computes various metrics for Python source code (Python2)"
   depends=('python2-flake8-polyfill' 'python2-mando' 'python2-colorama')
 
-  cd "${srcdir}/python2-${_module}-$pkgver"
+  cd "${srcdir}/python2-${_name}-$pkgver"
   python2 setup.py install --root="$pkgdir" --skip-build --optimize=1
-  mv "$pkgdir/usr/bin/radon" "$pkgdir/usr/bin/radon2"
+  mv "$pkgdir/usr/bin/${_name}" "$pkgdir/usr/bin/${_name}2"
 
   install -d "${pkgdir}/usr/share/doc/${pkgname}"
   cp -r docs/_build/html/* "${pkgdir}/usr/share/doc/${pkgname}"
 
   # license
-  install -Dm644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: