update to py-dot 1.4.1 (from pirofti), add py2/py3 dual support

This commit is contained in:
sthen 2019-11-10 15:52:42 +00:00
parent f31f158588
commit 3647397b22
5 changed files with 28 additions and 37 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.489 2019/11/10 15:33:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.490 2019/11/10 15:52:42 sthen Exp $
SUBDIR =
SUBDIR += DevIL
@ -243,6 +243,7 @@
SUBDIR += py-cycler
SUBDIR += py-cycler,python3
SUBDIR += py-dot
SUBDIR += py-dot,python3
SUBDIR += py-pygal
SUBDIR += py-pygal,python3
SUBDIR += py-gd

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.20 2019/07/12 20:47:08 sthen Exp $
# $OpenBSD: Makefile,v 1.21 2019/11/10 15:52:42 sthen Exp $
COMMENT= Python interface to Graphviz's Dot#'
MODPY_EGG_VERSION= 1.0.28
REVISION= 2
MODPY_EGG_VERSION= 1.4.1
DISTNAME= pydot-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:S/py/py-/}
CATEGORIES= graphics
@ -13,14 +12,23 @@ HOMEPAGE= https://github.com/erocarrera/pydot
# MIT
PERMIT_PACKAGE= Yes
MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=pydot/}
FLAVORS= python3
FLAVOR?=
MODULES= lang/python
BUILD_DEPENDS= devel/py-parsing
RUN_DEPENDS= devel/py-parsing \
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
BUILD_DEPENDS= devel/py-parsing${MODPY_FLAVOR}
RUN_DEPENDS= devel/py-parsing${MODPY_FLAVOR} \
math/graphviz
NO_TEST= Yes
TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH} \
devel/py-hypothesis${MODPY_FLAVOR} \
textproc/py-chardet${MODPY_FLAVOR}
do-test:
cd ${WRKSRC}/test; ${MODPY_BIN} pydot_unittest.py
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (pydot-1.0.28.tar.gz) = Hur/exBPuPMFqYMY2v3gstFfHvzfixYgZGVVHNRu2d8=
SIZE (pydot-1.0.28.tar.gz) = 19711
SHA256 (pydot-1.4.1.tar.gz) = 1JydTdGRO+7CqZf4MVQ8jL1T5TWxpznpIWQv5BYjXwE=
SIZE (pydot-1.4.1.tar.gz) = 128236

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-dot_parser_py,v 1.1 2016/03/13 08:12:14 shadchin Exp $
--- dot_parser.py.orig Tue Jan 3 05:23:26 2012
+++ dot_parser.py Wed Mar 2 15:52:33 2016
@@ -19,13 +19,17 @@ import glob
import pydot
import re
import codecs
+import string
from pyparsing import __version__ as pyparsing_version
-from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
+from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, 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 )
+
+printables = "".join( [ c for c in string.printable if c not in string.whitespace ] )
+_noncomma = "".join( [ c for c in printables if c != "," ] )
class P_AttrList:

View File

@ -1,6 +1,11 @@
@comment $OpenBSD: PLIST,v 1.3 2012/10/30 14:28:04 sthen Exp $
@comment $OpenBSD: PLIST,v 1.4 2019/11/10 15:52:42 sthen Exp $
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}dot_parser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pydot.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dot_parser.py
lib/python${MODPY_VERSION}/site-packages/dot_parser.pyc
lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pydot.py
lib/python${MODPY_VERSION}/site-packages/pydot.pyc