[arch-commits] Commit in python-pydot/trunk (PKGBUILD noncomma.patch)

[Felix Yan]

    Date: Tuesday, July 11, 2017 @ 13:54:40
  Author: felixonmars
Revision: 244243

upgpkg: python-pydot 1.2.3-1

Modified:
  python-pydot/trunk/PKGBUILD
Deleted:
  python-pydot/trunk/noncomma.patch

----------------+
 PKGBUILD       |   63 ++++++++++++++++++++++++++++++++++---------------------
 noncomma.patch |   19 ----------------
 2 files changed, 39 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-11 13:45:06 UTC (rev 244242)
+++ PKGBUILD	2017-07-11 13:54:40 UTC (rev 244243)
@@ -1,39 +1,54 @@
 # $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
 # Contrinutor: shining <shiningxc at gmail.com>
 # Contributor: phillid <dbphillipsnz _at_thingy_that_swirly_a_symbol gmaildott comm>
 
-_pypiname=pydot
-pkgname=python2-$_pypiname
-pkgver=1.0.28
-pkgrel=3
-pkgdesc="Python interface to Graphviz's Dot language"
+pkgbase=python-pydot
+pkgname=(python-pydot python2-pydot)
+pkgver=1.2.3
+pkgrel=1
+pkgdesc="Python interface to Graphviz's Dot"
 arch=('any')
-url="http://code.google.com/p/pydot/"
+url="https://github.com/erocarrera/pydot"
 license=('MIT')
-provides=("pydot=$pkgver")
-conflicts=('pydot')
-replaces=('pydot')
-depends=('python2-pyparsing' 'graphviz')
-makedepends=('python2-setuptools')
-source=("http://pydot.googlecode.com/files/$_pypiname-$pkgver.tar.gz"
-        "noncomma.patch")
-md5sums=('c0a7a027176a62c412fd0f54951af692'
-         'c709dccc04dfa1960b64fbd8aa7c5da7')
+makedepends=('python-setuptools' 'python2-setuptools' 'python-pyparsing' 'python2-pyparsing'
+             'graphviz')
+checkdepends=('python-chardet' 'python2-chardet')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/erocarrera/pydot/archive/v$pkgver.tar.gz")
+md5sums=('ed5edbe6b4bd5d1ddbdd7eb4b51e94c8')
 
 prepare() {
-  cd $_pypiname-$pkgver
-  # Fix compatibility with pyparsing >=2.0
-  patch -p0 -i "${srcdir}/noncomma.patch"
+  cp -a pydot-$pkgver{,-py2}
 }
 
 build() {
-  cd $_pypiname-$pkgver
+  cd "$srcdir"/pydot-$pkgver
+  python setup.py build
+
+  cd "$srcdir"/pydot-$pkgver-py2
   python2 setup.py build
 }
 
-package() {
-  cd $_pypiname-$pkgver
-  python2 setup.py install -O1 --install-data=/usr/share/pydot --root="$pkgdir"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+check() {
+  cd "$srcdir"/pydot-$pkgver/test
+  PYTHONPATH="$PWD/../build/lib:$PYTHONPATH" python pydot_unittest.py
+
+  cd "$srcdir"/pydot-$pkgver-py2/test
+  PYTHONPATH="$PWD/../build/lib:$PYTHONPATH" python2 pydot_unittest.py
 }
+
+package_python-pydot() {
+  depends=('python-pyparsing' 'graphviz')
+
+  cd pydot-$pkgver
+  python setup.py install -O1 --root="$pkgdir"
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python2-pydot() {
+  depends=('python2-pyparsing' 'graphviz')
+
+  cd pydot-$pkgver-py2
+  python2 setup.py install -O1 --root="$pkgdir"
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}

Deleted: noncomma.patch
===================================================================
--- noncomma.patch	2017-07-11 13:45:06 UTC (rev 244242)
+++ noncomma.patch	2017-07-11 13:54:40 UTC (rev 244243)
@@ -1,19 +0,0 @@
---- dot_parser.py	2014-03-03 01:04:18.028561791 +0100
-+++ dot_parser.py	2014-03-03 01:08:32.811564628 +0100
-@@ -25,7 +25,7 @@
- from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
-     Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
-     restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
--    ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
-+    ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
- 
- 
- class P_AttrList:
-@@ -414,6 +414,7 @@
-         
-         double_quoted_string = QuotedString('"', multiline=True, unquoteResults=False) # dblQuotedString
- 
-+        _noncomma = "".join( [ c for c in printables if c != "," ] )
-         alphastring_ = OneOrMore(CharsNotIn(_noncomma + ' '))
- 
-         def parse_html(s, loc, toks):