pygraphviz 2.0rc4__tar.gz → 2.0.2__tar.gz

{pygraphviz-2.0rc4 → pygraphviz-2.0.2}/INSTALL.txt

@@ -39,7 +39,7 @@ Install from Source
 
 Building PyGraphviz from source requires:
 
-- Python (version 3.10, 3.11, 3.12, 3.13 or 3.14)
+- Python (version 3.10, 3.11, 3.12, 3.13, 3.14, or 3.15)
 - `Graphviz <https://www.graphviz.org/>`_ (version 2.46 or later)
 - C/C++ compiler
 

{pygraphviz-2.0rc4/pygraphviz.egg-info → pygraphviz-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygraphviz
-Version: 2.0rc4
+Version: 2.0.2
 Summary: Python interface to Graphviz
 Author: Manos Renieris
 Author-email: Aric Hagberg <aric.hagberg@gmail.com>, Dan Schult <dschult@colgate.edu>
@@ -25,6 +25,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

{pygraphviz-2.0rc4 → pygraphviz-2.0.2}/doc/source/install.rst

@@ -39,7 +39,7 @@ Install from Source
 
 Building PyGraphviz from source requires:
 
-- Python (version 3.10, 3.11, 3.12, 3.13 or 3.14)
+- Python (version 3.10, 3.11, 3.12, 3.13, 3.14, or 3.15)
 - `Graphviz <https://www.graphviz.org/>`_ (version 2.46 or later)
 - C/C++ compiler
 

{pygraphviz-2.0rc4 → pygraphviz-2.0.2}/doc/source/release/index.rst

@@ -8,6 +8,9 @@ Releases
    :maxdepth: 2
 
    release_dev
+   release_2.0.2
+   release_2.0.1
+   release_2.0
    release_1.14
    release_1.13
    release_1.12

pygraphviz-2.0.2/doc/source/release/release_2.0.1.rst

@@ -0,0 +1,34 @@
+pygraphviz 2.0.1
+================
+
+We're happy to announce the release of pygraphviz 2.0.1!
+
+Bug Fixes
+---------
+
+- Fix graph-level attribute masking node/edge default (gh-563) (`#639 <https://github.com/pygraphviz/pygraphviz/pull/639>`_).
+- BUG: Use "nop2" instead of "neato -n2" for rendering with pre-computed positions (`#638 <https://github.com/pygraphviz/pygraphviz/pull/638>`_).
+
+Maintenance
+-----------
+
+- Bump actions/checkout from 6 to 7 (`#631 <https://github.com/pygraphviz/pygraphviz/pull/631>`_).
+
+Contributors
+------------
+
+4 authors added to this release (alphabetically):
+
+- `@dependabot[bot] <https://github.com/apps/dependabot>`_
+- Apoorv Darshan (`@apoorvdarshan <https://github.com/apoorvdarshan>`_)
+- Mridul Seth (`@MridulS <https://github.com/MridulS>`_)
+- Ross Barnowski (`@rossbar <https://github.com/rossbar>`_)
+
+3 reviewers added to this release (alphabetically):
+
+- Dan Schult (`@dschult <https://github.com/dschult>`_)
+- Mridul Seth (`@MridulS <https://github.com/MridulS>`_)
+- Ross Barnowski (`@rossbar <https://github.com/rossbar>`_)
+
+_These lists are automatically generated, and may not be complete or may contain
+duplicates._

pygraphviz-2.0.2/doc/source/release/release_2.0.2.rst

@@ -0,0 +1,29 @@
+pygraphviz 2.0.2
+================
+
+We're happy to announce the release of pygraphviz 2.0.2!
+
+Maintenance
+-----------
+
+- MAINT: simplify compressed filename handling (`#644 <https://github.com/pygraphviz/pygraphviz/pull/644>`_).
+- CI: Update twine requirement from >=4.0 to >=7.0.0 (`#643 <https://github.com/pygraphviz/pygraphviz/pull/643>`_).
+- CI: Update pre-commit requirement from >=4.1 to >=4.6.1 (`#642 <https://github.com/pygraphviz/pygraphviz/pull/642>`_).
+- CI: Bump actions/setup-python from 6 to 7 (`#641 <https://github.com/pygraphviz/pygraphviz/pull/641>`_).
+- Support Python 3.15 (`#649 <https://github.com/pygraphviz/pygraphviz/pull/649>`_).
+
+Contributors
+------------
+
+3 authors added to this release (alphabetically):
+
+- `@dependabot[bot] <https://github.com/apps/dependabot>`_
+- Dan Schult (`@dschult <https://github.com/dschult>`_)
+- Jarrod Millman (`@jarrodmillman <https://github.com/jarrodmillman>`_)
+
+2 reviewers added to this release (alphabetically):
+
+- Jarrod Millman (`@jarrodmillman <https://github.com/jarrodmillman>`_)
+- Ross Barnowski (`@rossbar <https://github.com/rossbar>`_)
+
+_These lists are automatically generated, and may not be complete or may contain duplicates._

pygraphviz-2.0.2/doc/source/release/release_2.0.rst

@@ -0,0 +1,108 @@
+pygraphviz 2.0
+==============
+
+We're happy to announce the release of pygraphviz 2.0!
+
+Enhancements
+------------
+
+- Add aarch64 wheels for linux to cibuildwheel (`#591 <https://github.com/pygraphviz/pygraphviz/pull/591>`_).
+- ENH: Export version info from wrapped graphviz (`#624 <https://github.com/pygraphviz/pygraphviz/pull/624>`_).
+
+Bug Fixes
+---------
+
+- More precise allocation for string copy in SWIG glue (`#559 <https://github.com/pygraphviz/pygraphviz/pull/559>`_).
+
+Documentation
+-------------
+
+- Avoid adding benchmark results to docs (`#544 <https://github.com/pygraphviz/pygraphviz/pull/544>`_).
+- DOC: remove pip install as recommendation (`#551 <https://github.com/pygraphviz/pygraphviz/pull/551>`_).
+- DOC: update install docs with link to graphviz 12.2.1 for windows (`#552 <https://github.com/pygraphviz/pygraphviz/pull/552>`_).
+- Update docs for 2.0 (`#609 <https://github.com/pygraphviz/pygraphviz/pull/609>`_).
+- DOC: Make tutorial executable, run as part of doc build (`#629 <https://github.com/pygraphviz/pygraphviz/pull/629>`_).
+- DOC: Add DOT special characters to documentation (`#628 <https://github.com/pygraphviz/pygraphviz/pull/628>`_).
+
+Maintenance
+-----------
+
+- Drop support for Python 3.10 (SPEC 0) (`#543 <https://github.com/pygraphviz/pygraphviz/pull/543>`_).
+- Bump up CI builds, test with latest windows graphviz release (`#550 <https://github.com/pygraphviz/pygraphviz/pull/550>`_).
+- Update fedora tests (`#554 <https://github.com/pygraphviz/pygraphviz/pull/554>`_).
+- Update pre-commit (`#557 <https://github.com/pygraphviz/pygraphviz/pull/557>`_).
+- Update pyproject.toml to comply with PEP 639 (`#578 <https://github.com/pygraphviz/pygraphviz/pull/578>`_).
+- CI: Github actions uses MacOS 15; update macports (`#579 <https://github.com/pygraphviz/pygraphviz/pull/579>`_).
+- Add support for Python 3.14 (`#576 <https://github.com/pygraphviz/pygraphviz/pull/576>`_).
+- Use pytest's tmp_path fixture (`#561 <https://github.com/pygraphviz/pygraphviz/pull/561>`_).
+- Bump webfactory/ssh-agent from 0.9.0 to 0.9.1 (`#562 <https://github.com/pygraphviz/pygraphviz/pull/562>`_).
+- Bump scientific-python/attach-next-milestone-action from bc07be829f693829263e57d5e8489f4e57d3d420 to c9cfab10ad0c67fed91b01103db26b7f16634639 (`#560 <https://github.com/pygraphviz/pygraphviz/pull/560>`_).
+- Bump actions/checkout from 4 to 6 (`#581 <https://github.com/pygraphviz/pygraphviz/pull/581>`_).
+- Bump actions/setup-python from 5 to 6 (`#580 <https://github.com/pygraphviz/pygraphviz/pull/580>`_).
+- CI: test CI with choco (`#556 <https://github.com/pygraphviz/pygraphviz/pull/556>`_).
+- Drop support for python 3.11 (SPEC 0) (`#582 <https://github.com/pygraphviz/pygraphviz/pull/582>`_).
+- CI: fix silent Windows failures and duplicate PR runs (`#588 <https://github.com/pygraphviz/pygraphviz/pull/588>`_).
+- Bump webfactory/ssh-agent from 0.9.1 to 0.10.0 (`#586 <https://github.com/pygraphviz/pygraphviz/pull/586>`_).
+- CI: cibuildwheel take 4 (`#583 <https://github.com/pygraphviz/pygraphviz/pull/583>`_).
+- MAINT: Add swig step to build (`#590 <https://github.com/pygraphviz/pygraphviz/pull/590>`_).
+- Bump conda-incubator/setup-miniconda from 3 to 4 (`#595 <https://github.com/pygraphviz/pygraphviz/pull/595>`_).
+- Bump actions/upload-artifact from 4 to 7 (`#594 <https://github.com/pygraphviz/pygraphviz/pull/594>`_).
+- Bump actions/download-artifact from 4 to 8 (`#593 <https://github.com/pygraphviz/pygraphviz/pull/593>`_).
+- Update setuptools version requirement in pyproject.toml (`#602 <https://github.com/pygraphviz/pygraphviz/pull/602>`_).
+- Graphviz support across v13 API change (`#603 <https://github.com/pygraphviz/pygraphviz/pull/603>`_).
+- CI: Rm fedora/macports testing workflows (`#606 <https://github.com/pygraphviz/pygraphviz/pull/606>`_).
+- CI: Build macos wheels against macos 11, and move cibuildwheel to release pipeline (`#604 <https://github.com/pygraphviz/pygraphviz/pull/604>`_).
+- More 2.0 cleanups (`#610 <https://github.com/pygraphviz/pygraphviz/pull/610>`_).
+- Update type of id param to IDTYPE in swig wrapper (`#611 <https://github.com/pygraphviz/pygraphviz/pull/611>`_).
+- Add Python 3.11 support for 2.0 release (`#613 <https://github.com/pygraphviz/pygraphviz/pull/613>`_).
+- CONF: escaped slashes in windows pathspec (`#614 <https://github.com/pygraphviz/pygraphviz/pull/614>`_).
+- TST: Add tests for ``tred`` method (`#615 <https://github.com/pygraphviz/pygraphviz/pull/615>`_).
+- PKG: Include examples/*.txt in MANIFEST.in (`#617 <https://github.com/pygraphviz/pygraphviz/pull/617>`_).
+- TST: Add unit test for gh-123 (`#622 <https://github.com/pygraphviz/pygraphviz/pull/622>`_).
+- TST: Add example from gh-162 as unit test (`#621 <https://github.com/pygraphviz/pygraphviz/pull/621>`_).
+- CI: See what happens when freethreading enabled (`#616 <https://github.com/pygraphviz/pygraphviz/pull/616>`_).
+- TST: Attempt regression test for gh-585 (`#618 <https://github.com/pygraphviz/pygraphviz/pull/618>`_).
+- TST: Assert hex colors don't cause runtime warnings (`#619 <https://github.com/pygraphviz/pygraphviz/pull/619>`_).
+- Bump packaged graphviz version (`#623 <https://github.com/pygraphviz/pygraphviz/pull/623>`_).
+- TST: Add regression test for gh-171 (`#620 <https://github.com/pygraphviz/pygraphviz/pull/620>`_).
+- DOC: Fix testing badge readme (`#626 <https://github.com/pygraphviz/pygraphviz/pull/626>`_).
+- Add graphviz license to the wheel (`#627 <https://github.com/pygraphviz/pygraphviz/pull/627>`_).
+
+Other
+-----
+
+- WIP: Using cgraph/gvc lib interface for wheel building (`#421 <https://github.com/pygraphviz/pygraphviz/pull/421>`_).
+- docs: replace deprecated --global-option with --config-settings (`#574 <https://github.com/pygraphviz/pygraphviz/pull/574>`_).
+- Fix FILE* resource leak in agwrite() wrapper (`#585 <https://github.com/pygraphviz/pygraphviz/pull/585>`_).
+- CI: Build macos wheels with quartz; no gd (`#608 <https://github.com/pygraphviz/pygraphviz/pull/608>`_).
+- Add Python 3.10 support for 2.0 release (`#625 <https://github.com/pygraphviz/pygraphviz/pull/625>`_).
+
+Contributors
+------------
+
+13 authors added to this release (alphabetically):
+
+- `@dependabot[bot] <https://github.com/apps/dependabot>`_
+- Bryan Gin-ge Chen (`@bryangingechen <https://github.com/bryangingechen>`_)
+- Cat Chenal (`@CatChenal <https://github.com/CatChenal>`_)
+- Dan Schult (`@dschult <https://github.com/dschult>`_)
+- Jarrod Millman (`@jarrodmillman <https://github.com/jarrodmillman>`_)
+- Matthew Fernandez (`@Smattr <https://github.com/Smattr>`_)
+- Matěj Cepl (`@mcepl <https://github.com/mcepl>`_)
+- Miroslav Šedivý (`@eumiro <https://github.com/eumiro>`_)
+- Mridul Seth (`@MridulS <https://github.com/MridulS>`_)
+- Rob Taylor (`@robtaylor <https://github.com/robtaylor>`_)
+- Ross Barnowski (`@rossbar <https://github.com/rossbar>`_)
+- Yatin (`@YatinAdityaT <https://github.com/YatinAdityaT>`_)
+- Ülgen Sarıkavak (`@ulgens <https://github.com/ulgens>`_)
+
+5 reviewers added to this release (alphabetically):
+
+- Dan Schult (`@dschult <https://github.com/dschult>`_)
+- Jarrod Millman (`@jarrodmillman <https://github.com/jarrodmillman>`_)
+- Matthew Fernandez (`@Smattr <https://github.com/Smattr>`_)
+- Mridul Seth (`@MridulS <https://github.com/MridulS>`_)
+- Ross Barnowski (`@rossbar <https://github.com/rossbar>`_)
+
+_These lists are automatically generated, and may not be complete or may contain
+duplicates._

{pygraphviz-2.0rc4 → pygraphviz-2.0.2}/examples/plot_miles.py

@@ -93,5 +93,5 @@ if __name__ == "__main__":
 
     G.write("miles.dot")
     print("Wrote miles.dot")
-    G.draw("miles.png", prog="neato", args="-n2")
+    G.draw("miles.png", prog="nop2")
     print("Wrote miles.png")

pygraphviz-2.0.2/examples/plot_subgraph_boundaries.py

@@ -0,0 +1,36 @@
+"""
+Subgraph with Boundaries
+========================
+
+Draw a subgraph with bounding boxes demarcating both the nodes and the subgraphs
+"""
+
+import pygraphviz as pgv
+
+# A graph in `.dot` format specifying two nodes, each within their own subgraph,
+# and a bi-directional edge between them
+dot_str = """
+digraph G {
+    graph [compound=true];
+
+    node [shape=box];
+
+    subgraph cluster_A {
+        label="A";
+        a1 [pos="50,100!"];
+    }
+
+    subgraph cluster_B {
+        label="B";
+        b1 [pos="200,100!"];
+    }
+
+    a1 -> b1 [lhead=cluster_B, ltail=cluster_A, dir=both];
+
+    graph [bb="0,0,300,200"];
+}
+"""
+
+A = pgv.AGraph(dot_str)
+A.layout("dot")
+A.draw("subgraph_bdries.png")

{pygraphviz-2.0rc4 → pygraphviz-2.0.2}/pygraphviz/__init__.py

@@ -32,7 +32,7 @@ from ._graphviz import (
     GRAPHVIZ_PATCH_VERSION,
 )
 
-__version__ = "2.0rc4"
+__version__ = "2.0.2"
 __graphviz_version__ = (
     f"{GRAPHVIZ_MAJOR_VERSION}.{GRAPHVIZ_MINOR_VERSION}.{GRAPHVIZ_PATCH_VERSION}"
 )

{pygraphviz-2.0rc4 → pygraphviz-2.0.2}/pygraphviz/agraph.py

@@ -2,6 +2,7 @@
 A Python interface to Graphviz.
 """
 
+import fileinput
 import os
 import re
 import shlex
@@ -1580,8 +1581,7 @@ class AGraph:
 
         if prog is None:
             if self.has_layout:
-                prog = "neato"
-                args += " -n2"
+                prog = "nop2"
             else:
                 msg = """Graph has no layout information, see layout() or specify prog={}.""".format(
                     "|".join(["neato", "dot", "twopi", "circo", "fdp", "nop"])
@@ -1671,16 +1671,7 @@ class AGraph:
         import os
 
         if isinstance(path, str):
-            if path.endswith(".gz"):
-                # import gzip
-                # fh = gzip.open(path,mode=mode)  # doesn't return real fh
-                fh = os.popen("gzcat " + path)  # probably not portable
-            elif path.endswith(".bz2"):
-                # import bz2
-                # fh = bz2.BZ2File(path,mode=mode) # doesn't return real fh
-                fh = os.popen("bzcat " + path)  # probably not portable
-            else:
-                fh = open(path, mode=mode)
+            fh = fileinput.hook_compressed(path, mode=mode)
         elif hasattr(path, "write"):
             # Note, mode of file handle is unchanged.
             fh = path
@@ -1939,10 +1930,8 @@ class Attribute(MutableMapping):
             )
 
     def __getitem__(self, name):
-        item = gv.agget(self.handle, name.encode(self.encoding))
-        if item is None:
-            ah = gv.agattr(self.handle, self.type, name.encode(self.encoding), None)
-            item = gv.agattrdefval(ah)
+        ah = gv.agattr(self.handle, self.type, name.encode(self.encoding), None)
+        item = gv.agattrdefval(ah)
         return item.decode(self.encoding)
 
     def __delitem__(self, name):

{pygraphviz-2.0rc4 → pygraphviz-2.0.2}/pygraphviz/tests/test_attribute_defaults.py

@@ -83,3 +83,13 @@ def test_edge_defaults():
     del A.edge_attr["label"]
     ans = """strict graph { }"""
     assert stringify(A) == " ".join(ans.split())
+
+
+def test_default_not_masked_by_graph_attribute():
+    # See gh-563: an attribute set at the graph level (e.g. via a subgraph)
+    # must not mask a same-named node/edge default.
+    A = pgv.AGraph("digraph { edge[penwidth=2]; subgraph { penwidth=1; } }")
+    assert A.edge_attr["penwidth"] == "2"
+
+    A = pgv.AGraph("digraph { node[shape=box]; subgraph { shape=circle; } }")
+    assert A.node_attr["shape"] == "box"

{pygraphviz-2.0rc4 → pygraphviz-2.0.2/pygraphviz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygraphviz
-Version: 2.0rc4
+Version: 2.0.2
 Summary: Python interface to Graphviz
 Author: Manos Renieris
 Author-email: Aric Hagberg <aric.hagberg@gmail.com>, Dan Schult <dschult@colgate.edu>
@@ -25,6 +25,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

{pygraphviz-2.0rc4 → pygraphviz-2.0.2}/pygraphviz.egg-info/SOURCES.txt

@@ -22,7 +22,9 @@ doc/source/release/old_release_log.rst
 doc/source/release/release_1.12.rst
 doc/source/release/release_1.13.rst
 doc/source/release/release_1.14.rst
-doc/source/release/release_dev.rst
+doc/source/release/release_2.0.1.rst
+doc/source/release/release_2.0.2.rst
+doc/source/release/release_2.0.rst
 examples/README.txt
 examples/miles_dat.txt.gz
 examples/plot_attributes.py
@@ -30,6 +32,7 @@ examples/plot_miles.py
 examples/plot_simple.py
 examples/plot_star.py
 examples/plot_subgraph.py
+examples/plot_subgraph_boundaries.py
 examples/skip_django_simple.py
 examples/skip_utf8_encoding.py
 pygraphviz/__init__.py

{pygraphviz-2.0rc4 → pygraphviz-2.0.2}/pyproject.toml

@@ -34,6 +34,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Software Development :: Libraries :: Python Modules",

pygraphviz-2.0rc4/doc/source/release/release_dev.rst

@@ -1,38 +0,0 @@
-pygraphviz 2.0rc4
-=================
-
-We're happy to announce the release of pygraphviz 2.0rc4!
-
-Documentation
--------------
-
-- DOC: Make tutorial executable, run as part of doc build (`#629 <https://github.com/pygraphviz/pygraphviz/pull/629>`_).
-- DOC: Add DOT special characters to documentation (`#628 <https://github.com/pygraphviz/pygraphviz/pull/628>`_).
-
-Maintenance
------------
-
-- DOC: Fix testing badge readme (`#626 <https://github.com/pygraphviz/pygraphviz/pull/626>`_).
-- Add graphviz license to the wheel (`#627 <https://github.com/pygraphviz/pygraphviz/pull/627>`_).
-
-Other
------
-
-- Add Python 3.10 support for 2.0 release (`#625 <https://github.com/pygraphviz/pygraphviz/pull/625>`_).
-
-Contributors
-------------
-
-2 authors added to this release (alphabetically):
-
-- Mridul Seth (`@MridulS <https://github.com/MridulS>`_)
-- Ross Barnowski (`@rossbar <https://github.com/rossbar>`_)
-
-3 reviewers added to this release (alphabetically):
-
-- Dan Schult (`@dschult <https://github.com/dschult>`_)
-- Mridul Seth (`@MridulS <https://github.com/MridulS>`_)
-- Ross Barnowski (`@rossbar <https://github.com/rossbar>`_)
-
-_These lists are automatically generated, and may not be complete or may contain
-duplicates._