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

[David Runge]

    Date: Tuesday, November 17, 2020 @ 11:10:40
  Author: dvzrv
Revision: 756488

upgpkg: nikola 8.1.2-1: Upgrade to 3.1.2.

Remove all (now) unnecessary fixes and patches.

Modified:
  nikola/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-17 11:10:39 UTC (rev 756487)
+++ PKGBUILD	2020-11-17 11:10:40 UTC (rev 756488)
@@ -2,8 +2,8 @@
 
 _name=Nikola
 pkgname=nikola
-pkgver=8.1.1
-pkgrel=3
+pkgver=8.1.2
+pkgrel=1
 pkgdesc="A static site and blog generator"
 arch=('any')
 url="https://getnikola.com/"
@@ -32,11 +32,11 @@
             'python-toml: for TOML support'
             'python-typogrify: for typographical enhancements'
             'python-watchdog: for `nikola auto`')
-source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"{,.asc}
-        "${pkgname}-8.1.1-fix_shortcode_log.patch::https://github.com/getnikola/nikola/commit/62c29c6382d663afbed9a23f68ea1cba881abcdb.patch")
-sha512sums=('a833cb7687077266a20f7043f99b03391f350b48ceea71250158e760b0e44b603de1d6e398a03ec848483775501ad248b6ac45a23ceb250d120a63f110d482b5'
-            'SKIP'
-            '10937750e24886a7e033c7148ffdea46b637793a80957a6e579f27aaa698028c18ad32e6c34947ebf398acab828dbfd6eb549730dccc9cec736e69f47df6c646')
+source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"{,.asc})
+sha512sums=('5f53f4939dddececfaf75922147b18fd08434242373d3f4a54e300475adf274b716cdc6e485e6703bdb17fe038656a8c4ac9b260b4ddd47c252a645c3d26a30a'
+            'SKIP')
+b2sums=('28b4a9905a92ba2714e05aec5854ffbd9bf136e9d31218e032d6697f54b3b2711256b83e74ef6ebd0411fdeb0ac17d6454c52473cb396c029af5086cc085728e'
+        'SKIP')
 validpgpkeys=('DF32C99CFF84282CF9D4CF7171023DBD5EAAEA16') # Chris Warrick <kwpolska at gmail.com>
 
 prepare() {
@@ -44,8 +44,6 @@
   cd "$pkgname-$pkgver"
   # remove options to pytest so that we don't require python-coverage et. al.
   sed -e '/addopts/d' -i setup.cfg
-  # fix log argument handling for shortcodes (make compatible with python 3.9)
-  patch -Np 1 -i ../"${pkgname}-8.1.1-fix_shortcode_log.patch"
 }
 
 build() {
@@ -67,8 +65,7 @@
 check() {
   cd "$pkgname-$pkgver"
   export PYTHONPATH="build:${PYTHONPATH}"
-  # disabling failing test: https://github.com/getnikola/nikola/issues/3432
-  pytest -vv -k 'not test_compiling_markdown[hilite]' tests/
+  pytest -v
 }
 
 package() {
@@ -85,8 +82,4 @@
     "${pkgdir}/usr/share/bash-completion/completions/${pkgname}"
   install -vDm 644 "${pkgname}_zsh" \
     "${pkgdir}/usr/share/zsh/site-functions/_${pkgname}"
-  # removing tests as a top-level module
-  # https://github.com/getnikola/nikola/issues/3348
-  local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
-  rm -rvf "${pkgdir}/${site_packages}/tests"
 }