[arch-commits] Commit in seqdiag/trunk (2 files)

[David Runge]

    Date: Saturday, December 4, 2021 @ 10:35:22
  Author: dvzrv
Revision: 1065006

Remove broken test for python 3.10 rebuild.

Remove a test, that fails due to the use of the default font:
https://github.com/blockdiag/seqdiag/issues/51
Simplify installation in package() to adhere to python package guidelines.

Added:
  seqdiag/trunk/seqdiag-2.0.0-remove_broken_test.patch
Modified:
  seqdiag/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   27 +++++++++++++++++++--------
 seqdiag-2.0.0-remove_broken_test.patch |   20 ++++++++++++++++++++
 2 files changed, 39 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-04 10:30:15 UTC (rev 1065005)
+++ PKGBUILD	2021-12-04 10:35:22 UTC (rev 1065006)
@@ -4,17 +4,30 @@
 pkgname=seqdiag
 pkgver=2.0.0
 pkgrel=5
-pkgdesc="seqdiag generates sequence-diagram images from .diag files"
-url="http://blockdiag.com/en/seqdiag/index.html"
+pkgdesc="Sequence-diagram images from .diag files"
+arch=('any')
+url="https://blockdiag.com/en/seqdiag/index.html"
 license=('Apache')
-arch=('any')
 depends=('blockdiag')
 checkdepends=('python-docutils' 'python-nose' 'python-pycodestyle' 'python-reportlab')
 optdepends=('python-reportlab: for PDF export'
             'python-docutils: for RST parser')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/blockdiag/seqdiag/archive/$pkgver.tar.gz")
-sha512sums=('ec4ebfc2822dd1b4dd65881b2199f512cab3ac3772451e87a1f798f36925ebb7b5824a8cd797d9e6f128698340c04e89ba226af37b02d40cf9b38638545af9bb')
+source=(
+  "$pkgname-$pkgver.tar.gz::https://github.com/blockdiag/seqdiag/archive/$pkgver.tar.gz"
+  "${pkgname}-2.0.0-remove_broken_test.patch"
+)
+sha512sums=('ec4ebfc2822dd1b4dd65881b2199f512cab3ac3772451e87a1f798f36925ebb7b5824a8cd797d9e6f128698340c04e89ba226af37b02d40cf9b38638545af9bb'
+            'de01e48df2ffbe3af30e810d74550e70bd176db6a2becfb61e44f67e2808662a10eb1348aed140b7dec10e56b3c8b17cc000184c7d9ea9203653ab9f52273710')
+b2sums=('b35c3b289e4dff2105b84734967744c6693033664c5c5015d5f90976ae8002f18927124c8e679d0c1795aaa361afe7a837aa7bf29be090243ef2f2ce7a8739ba'
+        '4bcb3227ea42fc0b4951ad8605f14949e13eec697f89687b0b98c844a2260eabb3dac74c0d33d0bc4984705fd9b5aea771f729845e4adaa47b35efbbb328bf34')
 
+prepare() {
+  cd seqdiag-$pkgver
+  # remove a broken test, that fails due to wrong font:
+  # https://github.com/blockdiag/seqdiag/issues/51
+  patch -Np1 -i ../"${pkgname}-2.0.0-remove_broken_test.patch"
+}
+
 build() {
   cd seqdiag-$pkgver
   python setup.py build
@@ -29,9 +42,7 @@
 
 package() {
   cd seqdiag-$pkgver
-  python setup.py install --root="$pkgdir" \
-                          --optimize=1 \
-                          --skip-build
+  python setup.py install --root="$pkgdir" --optimize=1
   install -vDm 644 {CHANGES,README}.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
   install -vDm 644 "${pkgname}.1" -t "${pkgdir}/usr/share/man/man1/"
 }

Added: seqdiag-2.0.0-remove_broken_test.patch
===================================================================
--- seqdiag-2.0.0-remove_broken_test.patch	                        (rev 0)
+++ seqdiag-2.0.0-remove_broken_test.patch	2021-12-04 10:35:22 UTC (rev 1065006)
@@ -0,0 +1,20 @@
+diff --git i/src/seqdiag/tests/test_rst_directives.py w/src/seqdiag/tests/test_rst_directives.py
+index c3affce..4c184b8 100644
+--- i/src/seqdiag/tests/test_rst_directives.py
++++ w/src/seqdiag/tests/test_rst_directives.py
+@@ -177,15 +177,6 @@ class TestRstDirectives(unittest.TestCase):
+         self.assertEqual(1, len(doctree))
+         self.assertEqual(nodes.image, type(doctree[0]))
+ 
+-    def test_setup_inline_svg_is_true_with_multibytes(self):
+-        directives.setup(format='SVG', outputdir=self.tmpdir, inline_svg=True)
+-        text = (".. seqdiag::\n"
+-                "\n"
+-                "   あ -> い")
+-        doctree = publish_doctree(text)
+-        self.assertEqual(1, len(doctree))
+-        self.assertEqual(nodes.raw, type(doctree[0]))
+-
+     def test_setup_inline_svg_is_true_and_width_option1(self):
+         directives.setup(format='SVG', outputdir=self.tmpdir,
+                          nodoctype=True, noviewbox=True, inline_svg=True)