From 05548613d88692b680554ccdc467733de1939e33 Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 17 Aug 2016 12:37:34 +0000 Subject: update to pydot-1.2.2 # `pydot` changelog ## 1.2.0 (2016-07-01) - Python 3 compatibility - bumped dependency to `pyparsing >= 2.1.4` - tests running on Travis CI - tests require `chardet` - detect character encoding for most test files using the package `chardet` API: - on all operating systems, search GraphViz executables in environment `$PATH`, using `subprocess.Popen`. No paths hard-coded due to security and privacy issues. - add option to pass GraphViz executable name or absolute path as `prog` to `pydot.Dot.write_*` methods. This provides an alternative to adding GraphViz to the `$PATH`. - the functions: - `pydot.graph_from_dot_data` - `pydot.graph_from_dot_file` - `dot_parser.parse_dot_data` changed to always return a `list` of graphs, instead of behaving differently for singletons. - require that the user explicitly give an encoding to the function `pydot.graph_from_dot_file`, with default encoding same as `io.open`. - decode to unicode at program boundaries, and treat binary images as bytes, for more compatibility with python 3. Use `io.open`, instead of the built-in `open`. - rm function `pydot.set_graphviz_executables` - rm attribute `pydot.Dot.progs` ## 1.1.0 (2016-05-23) - compatibility with `pyparsing >= 1.5.7` API: - `pydot.Graph.to_string`: hide `subgraph` keyword only if so requested - produce `warnings.warn` if `pydot.dot_parser` fails to import, instead of `print` ## 1.0.29 (2016-05-16) - Maintenance release that keeps the same API - pin `pyparsing == 1.5.7` - update version number in source code - update `setup.py` --- graphics/py-dot/Makefile | 13 +++++-------- graphics/py-dot/PLIST | 8 ++++++-- graphics/py-dot/distinfo | 11 +++++------ graphics/py-dot/patches/patch-dot__parser.py | 23 ----------------------- 4 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 graphics/py-dot/patches/patch-dot__parser.py (limited to 'graphics/py-dot') diff --git a/graphics/py-dot/Makefile b/graphics/py-dot/Makefile index 92c9a4bc560..a2a86f22572 100644 --- a/graphics/py-dot/Makefile +++ b/graphics/py-dot/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2016/07/09 13:03:51 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2016/08/17 12:37:34 richard Exp $ -DISTNAME= pydot-1.0.28 +DISTNAME= pydot-1.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} CATEGORIES= graphics python -MASTER_SITES= http://pydot.googlecode.com/files/ +MASTER_SITES= ${MASTER_SITE_PYPI:=p/pydot/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://code.google.com/p/pydot/ @@ -13,12 +13,9 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz -PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.0.28 - post-install: - ${RM} ${DESTDIR}${PREFIX}/README + ${RM} ${DESTDIR}${PREFIX}/README.md ${RM} ${DESTDIR}${PREFIX}/LICENSE -.include "../../lang/python/application.mk" -.include "../../lang/python/distutils.mk" +.include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-dot/PLIST b/graphics/py-dot/PLIST index e54150d2e2c..96a80485fe2 100644 --- a/graphics/py-dot/PLIST +++ b/graphics/py-dot/PLIST @@ -1,8 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2014/01/19 20:15:43 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/08/17 12:37:34 richard Exp $ ${PYSITELIB}/dot_parser.py ${PYSITELIB}/dot_parser.pyc ${PYSITELIB}/dot_parser.pyo -${PYSITELIB}/${EGG_FILE} +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/requires.txt +${PYSITELIB}/${EGG_INFODIR}/top_level.txt ${PYSITELIB}/pydot.py ${PYSITELIB}/pydot.pyc ${PYSITELIB}/pydot.pyo diff --git a/graphics/py-dot/distinfo b/graphics/py-dot/distinfo index 0faf6bdc2ec..7185310531b 100644 --- a/graphics/py-dot/distinfo +++ b/graphics/py-dot/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 21:34:16 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/08/17 12:37:34 richard Exp $ -SHA1 (pydot-1.0.28.tar.gz) = 3945af1765943807d72e773c7ac853f008ebb0b2 -RMD160 (pydot-1.0.28.tar.gz) = a67336f5edf55a81fe654df3258a12a8ff92d4f6 -SHA512 (pydot-1.0.28.tar.gz) = 54b4d7bfb01bbcae9a4832d1c3321d4f453a93f062ee55b35e3d59bee3f8989f4a544afb56c3d16b22bca8e6ef24b6286ac2688c9045b16906ef625999b35055 -Size (pydot-1.0.28.tar.gz) = 19711 bytes -SHA1 (patch-dot__parser.py) = 9ce92c76bb5878ac990a3557e550679364a2d7b2 +SHA1 (pydot-1.2.2.tar.gz) = 1f0813b6b0a1201a2a34affb0164e699df8327c0 +RMD160 (pydot-1.2.2.tar.gz) = 2311a2894262ca20baeb4abb4077a910283cfcc3 +SHA512 (pydot-1.2.2.tar.gz) = bde62da86d3d99fa45c4266e47be1b36e3fa746556064d1e15911abad6583fcd1020c9f1b6c8e73359e0d3a336ed0f19c95fd860627d99f8d3f20b98e454407a +Size (pydot-1.2.2.tar.gz) = 20027 bytes diff --git a/graphics/py-dot/patches/patch-dot__parser.py b/graphics/py-dot/patches/patch-dot__parser.py deleted file mode 100644 index 80a02e8c27e..00000000000 --- a/graphics/py-dot/patches/patch-dot__parser.py +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-dot__parser.py,v 1.1 2014/01/19 20:15:43 wiz Exp $ - -_noncomma is obsoleted in the latest pyparsing, fix to work with all versions. - ---- dot_parser.py.orig 2012-01-02 23:23:26.000000000 +0000 -+++ dot_parser.py -@@ -25,7 +25,7 @@ from pyparsing import __version__ as pyp - 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 @@ def graph_definition(): - - 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): -- cgit v1.2.3