mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-30 05:40:06 +00:00
- Update to 1.2.3
- Remove BUILD_DEPENDS Changes: https://github.com/erocarrera/pydot/blob/master/ChangeLog
This commit is contained in:
parent
d38b0a1115
commit
bb6dc81930
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=426449
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= pydot
|
||||
PORTVERSION= 1.1.0
|
||||
PORTVERSION= 1.2.3
|
||||
CATEGORIES= graphics python
|
||||
MASTER_SITES= CHEESESHOP
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
@ -13,9 +13,9 @@ COMMENT= Python interface to the Graphviz Dot language
|
||||
LICENSE= MIT
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
|
||||
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.7:devel/py-pyparsing
|
||||
#BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing
|
||||
RUN_DEPENDS= dot:graphics/graphviz \
|
||||
${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.7:devel/py-pyparsing
|
||||
${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing
|
||||
|
||||
NO_ARCH= yes
|
||||
USE_PYTHON= autoplist concurrent distutils
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1464369127
|
||||
SHA256 (pydot-1.1.0.tar.gz) = 469d2cf565994064236be24e87ab3571c1c1243fbc8d2ad836d16637d1a5049b
|
||||
SIZE (pydot-1.1.0.tar.gz) = 20451
|
||||
TIMESTAMP = 1479405300
|
||||
SHA256 (pydot-1.2.3.tar.gz) = edb5d3f249f97fbd9c4bb16959e61bc32ecf40eee1a9f6d27abe8d01c0a73502
|
||||
SIZE (pydot-1.2.3.tar.gz) = 20268
|
||||
|
@ -1,51 +0,0 @@
|
||||
--- dot_parser.py.orig 2016-05-24 09:57:52.000000000 +0800
|
||||
+++ dot_parser.py 2016-05-28 01:23:50.843873969 +0800
|
||||
@@ -111,7 +111,7 @@
|
||||
add_elements(g, element)
|
||||
|
||||
else:
|
||||
- raise ValueError, "Unknown element statement: %r " % element
|
||||
+ raise ValueError("Unknown element statement: %r " % element)
|
||||
|
||||
|
||||
for g in top_graphs:
|
||||
@@ -218,14 +218,14 @@
|
||||
defaults_edge.update(element.attrs)
|
||||
|
||||
else:
|
||||
- raise ValueError, "Unknown DefaultStatement: %s " % element.default_type
|
||||
+ raise ValueError("Unknown DefaultStatement: %s " % element.default_type)
|
||||
|
||||
elif isinstance(element, P_AttrList):
|
||||
|
||||
g.obj_dict['attributes'].update(element.attrs)
|
||||
|
||||
else:
|
||||
- raise ValueError, "Unknown element statement: %r" % element
|
||||
+ raise ValueError("Unknown element statement: %r" % element)
|
||||
|
||||
|
||||
def push_graph_stmt(str, loc, toks):
|
||||
@@ -267,7 +267,7 @@
|
||||
if default_type in ['graph', 'node', 'edge']:
|
||||
return DefaultStatement(default_type, attrs)
|
||||
else:
|
||||
- raise ValueError, "Unknown default statement: %r " % toks
|
||||
+ raise ValueError("Unknown default statement: %r " % toks)
|
||||
|
||||
|
||||
def push_attr_list(str, loc, toks):
|
||||
@@ -524,9 +524,9 @@
|
||||
else:
|
||||
return [g for g in tokens]
|
||||
|
||||
- except ParseException, err:
|
||||
+ except ParseException as err:
|
||||
|
||||
- print err.line
|
||||
- print " "*(err.column-1) + "^"
|
||||
- print err
|
||||
+ print(err.line)
|
||||
+ print(" "*(err.column-1) + "^")
|
||||
+ print(err)
|
||||
return None
|
@ -1,138 +0,0 @@
|
||||
--- pydot.py.orig 2016-05-24 09:57:52.000000000 +0800
|
||||
+++ pydot.py 2016-05-28 01:22:15.617300969 +0800
|
||||
@@ -29,7 +29,7 @@
|
||||
import warnings
|
||||
try:
|
||||
import dot_parser
|
||||
-except Exception, e:
|
||||
+except Exception as e:
|
||||
warnings.warn(
|
||||
"Couldn't import dot_parser, "
|
||||
"loading of dot files will not be possible.")
|
||||
@@ -94,7 +94,7 @@
|
||||
#
|
||||
class frozendict(dict):
|
||||
def _blocked_attribute(obj):
|
||||
- raise AttributeError, "A frozendict cannot be modified."
|
||||
+ raise AttributeError("A frozendict cannot be modified.")
|
||||
_blocked_attribute = property(_blocked_attribute)
|
||||
|
||||
__delitem__ = __setitem__ = clear = _blocked_attribute
|
||||
@@ -192,7 +192,7 @@
|
||||
return 'True'
|
||||
return 'False'
|
||||
|
||||
- if not isinstance( s, basestring ):
|
||||
+ if not isinstance( s, str ):
|
||||
return s
|
||||
|
||||
if not s:
|
||||
@@ -505,10 +505,10 @@
|
||||
path = os.path.join(path, "bin")
|
||||
progs = __find_executables(path)
|
||||
if progs is not None :
|
||||
- #print "Used Windows registry"
|
||||
+ #print("Used Windows registry")
|
||||
return progs
|
||||
|
||||
- except Exception, excp:
|
||||
+ except Exception as excp:
|
||||
#raise excp
|
||||
pass
|
||||
else:
|
||||
@@ -523,7 +523,7 @@
|
||||
for path in os.environ['PATH'].split(os.pathsep):
|
||||
progs = __find_executables(path)
|
||||
if progs is not None :
|
||||
- #print "Used path"
|
||||
+ #print("Used path")
|
||||
return progs
|
||||
|
||||
# Method 3 (Windows only)
|
||||
@@ -550,7 +550,7 @@
|
||||
|
||||
if progs is not None :
|
||||
|
||||
- #print "Used default install location"
|
||||
+ #print("Used default install location")
|
||||
return progs
|
||||
|
||||
|
||||
@@ -562,7 +562,7 @@
|
||||
|
||||
progs = __find_executables(path)
|
||||
if progs is not None :
|
||||
- #print "Used path"
|
||||
+ #print("Used path")
|
||||
return progs
|
||||
|
||||
# Failed to find GraphViz
|
||||
@@ -719,7 +719,7 @@
|
||||
|
||||
|
||||
|
||||
-class Node(object, Common):
|
||||
+class Node(Common):
|
||||
"""A graph node.
|
||||
|
||||
This class represents a graph's node with all its attributes.
|
||||
@@ -758,12 +758,12 @@
|
||||
# Remove the compass point
|
||||
#
|
||||
port = None
|
||||
- if isinstance(name, basestring) and not name.startswith('"'):
|
||||
+ if isinstance(name, str) and not name.startswith('"'):
|
||||
idx = name.find(':')
|
||||
if idx > 0 and idx+1 < len(name):
|
||||
name, port = name[:idx], name[idx:]
|
||||
|
||||
- if isinstance(name, (long, int)):
|
||||
+ if isinstance(name, int):
|
||||
name = str(name)
|
||||
|
||||
self.obj_dict['name'] = quote_if_necessary(name)
|
||||
@@ -836,7 +836,7 @@
|
||||
|
||||
|
||||
|
||||
-class Edge(object, Common ):
|
||||
+class Edge(Common):
|
||||
"""A graph edge.
|
||||
|
||||
This class represents a graph's edge with all its attributes.
|
||||
@@ -927,7 +927,7 @@
|
||||
"""
|
||||
|
||||
if not isinstance(edge, Edge):
|
||||
- raise Error, "Can't compare and edge to a non-edge object."
|
||||
+ raise Error("Can't compare and edge to a non-edge object.")
|
||||
|
||||
if self.get_parent_graph().get_top_graph_type() == 'graph':
|
||||
|
||||
@@ -1027,7 +1027,7 @@
|
||||
|
||||
|
||||
|
||||
-class Graph(object, Common):
|
||||
+class Graph(Common):
|
||||
"""Class representing a graph in Graphviz's dot language.
|
||||
|
||||
This class implements the methods to work on a representation
|
||||
@@ -1077,7 +1077,7 @@
|
||||
self.obj_dict['attributes'] = dict(attrs)
|
||||
|
||||
if graph_type not in ['graph', 'digraph']:
|
||||
- raise Error, 'Invalid type "%s". Accepted graph types are: graph, digraph' % graph_type
|
||||
+ raise Error('Invalid type "%s". Accepted graph types are: graph, digraph' % graph_type)
|
||||
|
||||
|
||||
self.obj_dict['name'] = quote_if_necessary(graph_name)
|
||||
@@ -2024,7 +2024,7 @@
|
||||
'Program terminated with status: %d. stderr follows: %s' % (
|
||||
status, stderr_output) )
|
||||
elif stderr_output:
|
||||
- print stderr_output
|
||||
+ print(stderr_output)
|
||||
|
||||
# For each of the image files...
|
||||
#
|
@ -1,10 +0,0 @@
|
||||
--- setup.py.orig 2016-05-24 01:57:52 UTC
|
||||
+++ setup.py
|
||||
@@ -27,5 +27,5 @@ setup( name = 'pydot',
|
||||
'Topic :: Software Development :: Libraries :: Python Modules'],
|
||||
long_description = "\n".join(pydot.__doc__.split('\n')),
|
||||
py_modules = ['pydot', 'dot_parser'],
|
||||
- install_requires = ['pyparsing>=1.5.7'],
|
||||
- data_files = [('.', ['LICENSE', 'README'])] )
|
||||
+ install_requires = ['pyparsing', 'setuptools'] )
|
||||
+ #data_files = [('.', ['LICENSE', 'README'])] )
|
Loading…
Reference in New Issue
Block a user