* Increase revision to trigger package rebuild for Python 3.8

* Remove Python 2 package

2 files changed, 9 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64cccd71ee05..4259deab1fa5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,17 @@
 pkgbase = python-radon
+	pkgdesc = A tool that computes various metrics for Python source code
 	pkgver = 4.0.0
 	pkgrel = 2
 	url = https://radon.readthedocs.org/
 	arch = any
 	license = MIT
 	makedepends = python-sphinx
-	makedepends = python2-sphinx
-	source = https://files.pythonhosted.org/packages/source/r/radon/radon-4.0.0.tar.gz
-	sha256sums = 20f799949e42e6899bc9304539de222d3bdaeec276f38fbd4034859ccd548b46
-
-pkgname = python-radon
-	pkgdesc = A tool that computes various metrics for Python source code
 	depends = python-flake8-polyfill
 	depends = python-future
 	depends = python-mando
 	depends = python-colorama
+	source = https://files.pythonhosted.org/packages/source/r/radon/radon-4.0.0.tar.gz
+	sha256sums = 20f799949e42e6899bc9304539de222d3bdaeec276f38fbd4034859ccd548b46
 
-pkgname = python2-radon
-	pkgdesc = A tool that computes various metrics for Python source code (Python2)
-	depends = python2-flake8-polyfill
-	depends = python2-future
-	depends = python2-mando
-	depends = python2-colorama
+pkgname = python-radon
 
diff --git a/PKGBUILD b/PKGBUILD
index 7f0b6872e66e..e1d52940ddc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,41 +3,28 @@
 # Contributor: Jesus Alvarez
 
 _name=radon
-pkgbase="python-${_name}"
-pkgname=("${pkgbase}" "python2-${_name}")
+pkgname="python-${_name}"
 pkgver=4.0.0
 pkgrel=2
+pkgdesc="A tool that computes various metrics for Python source code"
 arch=('any')
 url="https://${_name}.readthedocs.org/"
 license=('MIT')
-depends=()
-makedepends=('python-sphinx' 'python2-sphinx')
+depends=('python-flake8-polyfill' 'python-future' 'python-mando' 'python-colorama')
+makedepends=('python-sphinx')
 source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz")
 sha256sums=('20f799949e42e6899bc9304539de222d3bdaeec276f38fbd4034859ccd548b46')
 
 
-prepare() {
-  cp -r "${_name}-${pkgver}" "python2-${_name}-${pkgver}"
-}
-
 build() {
   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-${_name}-${pkgver}"
-  sed -i -e "s/mando[^']*/mando/" -e "s/colorama[^']*/colorama/" setup.py
-  python2 setup.py build
-  cd docs
-  make html
 }
 
-package_python-radon() {
-  pkgdesc="A tool that computes various metrics for Python source code"
-  depends=('python-flake8-polyfill' 'python-future' 'python-mando' 'python-colorama')
-
+package() {
   cd "${srcdir}/${_name}-${pkgver}"
   python setup.py install --root="$pkgdir" --skip-build --optimize=1
 
@@ -48,19 +35,4 @@ package_python-radon() {
   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-future' 'python2-mando' 'python2-colorama')
-
-  cd "${srcdir}/python2-${_name}-$pkgver"
-  python2 setup.py install --root="$pkgdir" --skip-build --optimize=1
-  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 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
 # vim:set ts=2 sw=2 et: