[arch-commits] Commit in python-tzlocal/trunk (PKGBUILD)

[David Runge]

    Date: Monday, May 11, 2020 @ 20:47:23
  Author: dvzrv
Revision: 626495

upgpkg: python-tzlocal 2.1-1: Upgrading to 2.1.

Updating maintainer info.
Removing python2-tzlocal as it's not used by any other package.
Running tests using pytest (although disabling one test is required) and opening upstream ticket.

Modified:
  python-tzlocal/trunk/PKGBUILD

----------+
 PKGBUILD |   56 ++++++++++++++++++++------------------------------------
 1 file changed, 20 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-11 20:46:41 UTC (rev 626494)
+++ PKGBUILD	2020-05-11 20:47:23 UTC (rev 626495)
@@ -1,4 +1,4 @@
-# Maintainer: David Runge <dave at sleepmap.de>
+# Maintainer: David Runge <dvzrv at archlinux.org>
 # Contributor: eolianoe <eolianoe At GoogleMAIL DoT com>
 # Contributor: Étienne Deparis <etienne [at] depar.is>
 # Contributor: Patrice Peterson <runiq at archlinux dot us>
@@ -5,43 +5,42 @@
 # Contributor: Patrick Burroughs <celticmadman at gmail dot com>
 
 _name=tzlocal
-pkgbase=python-tzlocal
-pkgname=("python-tzlocal" "python2-tzlocal")
-pkgver=2.0.0
-pkgrel=3
+pkgname=python-tzlocal
+pkgver=2.1
+pkgrel=1
 pkgdesc="Tzinfo object for the local timezone"
 arch=('any')
 url="https://github.com/regebro/tzlocal"
 license=('MIT')
-makedepends=('python-pytz' 'python-setuptools' 'python2-pytz' 'python2-setuptools')
-checkdepends=('python-mock' 'python2-mock')
+depends=('python-pytz')
+makedepends=('python-setuptools')
+checkdepends=('python-pytest' 'python-mock')
 source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz")
-sha512sums=('b72487f791df1dda7370ef5de58e524a451bf87a2ad5ce9d365591fb45af1e080499956d9b19410aeacdf3013ce09c84cd3ec243e15d3bbbee4cec32685298d9')
+sha512sums=('5419f3316dfcbf0355cc6f0790454fe6cecfa8b1ae17bfa7bf8aff89b0af3e63c94ffe9c22b11f612e53826a33e7179ff71bc2a86f6a358cdff36c7ae34e2453')
 
 prepare() {
-  mv -v "${_name}-${pkgver}" "${pkgbase}-${pkgver}"
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   # fix symlink, required for test: https://github.com/regebro/tzlocal/issues/53
-  (
-    cd "${pkgbase}-${pkgver}/tests/test_data/symlink_localtime/etc"
-    ln -sfv ../usr/share/zoneinfo/Africa/Harare localtime
-  )
+  cd tests/test_data/symlink_localtime/etc
+  ln -sfv ../usr/share/zoneinfo/Africa/Harare localtime
 }
 
 build() {
-  cd "${pkgbase}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   python setup.py build
-  python2 setup.py build
 }
 
 check() {
-  cd "${pkgbase}-${pkgver}"
-  python setup.py test
-  python2 setup.py test
+  cd "${pkgname}-${pkgver}"
+  export PYTHONPATH="build:${PYTHONPATH}"
+  # disable failing timezone test:
+  # https://github.com/regebro/tzlocal/issues/89
+  pytest -v tests/tests.py -k 'not test_fail'
 }
 
-package_python-tzlocal() {
-  depends=('python-pytz')
-  cd "${pkgbase}-${pkgver}"
+package() {
+  cd "${pkgname}-${pkgver}"
   python setup.py install --skip-build \
                           --optimize=1 \
                           --prefix=/usr \
@@ -53,19 +52,4 @@
   install -vDm 644 {CHANGES.txt,README.rst} \
     -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
-
-package_python2-tzlocal() {
-  depends=('python2-pytz')
-  cd "${pkgbase}-${pkgver}"
-  python2 setup.py install --skip-build \
-                           --optimize=1 \
-                           --prefix=/usr \
-                           --root="${pkgdir}"
-  # license
-  install -vDm 644 LICENSE.txt \
-    -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  # docs
-  install -vDm 644 {CHANGES.txt,README.rst} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
 # vim:set ts=2 sw=2 et: