pygraphviz 2.0rc2__tar.gz → 2.0rc4__tar.gz

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

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

pygraphviz-2.0rc4/LICENSE.graphviz

@@ -0,0 +1,277 @@
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/MANIFEST.in

@@ -2,6 +2,7 @@ include MANIFEST.in
 include INSTALL.txt
 include README.rst
 include LICENSE
+include LICENSE.graphviz
 
 include *.py
 include *.swg
@@ -9,7 +10,7 @@ include Makefile
 
 recursive-include doc *.png
 recursive-include pygraphviz *.i
-recursive-include examples *.py *.gz
+recursive-include examples *.py *.gz *.txt
 recursive-include doc *.py *.rst Makefile *.html *.txt *.css
 
 global-exclude *~

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygraphviz
-Version: 2.0rc2
+Version: 2.0rc4
 Summary: Python interface to Graphviz
 Author: Manos Renieris
 Author-email: Aric Hagberg <aric.hagberg@gmail.com>, Dan Schult <dschult@colgate.edu>
@@ -20,6 +20,7 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -30,16 +31,17 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Classifier: Topic :: Scientific/Engineering :: Visualization
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
+License-File: LICENSE.graphviz
 Dynamic: license-file
 
 PyGraphviz
 ==========
 
-.. image:: https://github.com/pygraphviz/pygraphviz/workflows/test/badge.svg?branch=main
-  :target: https://github.com/pygraphviz/pygraphviz/actions?query=workflow%3Atest+branch%3Amain
+.. image:: https://github.com/pygraphviz/pygraphviz/workflows/test/badge.svg
+  :target: https://github.com/pygraphviz/pygraphviz/actions/workflows/test.yml
 
 .. image:: https://codecov.io/gh/pygraphviz/pygraphviz/branch/main/graph/badge.svg
    :target: https://app.codecov.io/gh/pygraphviz/pygraphviz/branch/main
@@ -87,3 +89,7 @@ Released under the 3-Clause BSD license (see ``LICENSE``)::
   Aric Hagberg <aric.hagberg@gmail.gov>
   Dan Schult <dschult@colgate.edu>
   Manos Renieris
+
+The binary wheels distributed on PyPI bundle the Graphviz libraries and
+command-line tools, which are licensed separately under the Eclipse Public
+License v2.0 (see ``LICENSE.graphviz``).

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/README.rst

@@ -1,8 +1,8 @@
 PyGraphviz
 ==========
 
-.. image:: https://github.com/pygraphviz/pygraphviz/workflows/test/badge.svg?branch=main
-  :target: https://github.com/pygraphviz/pygraphviz/actions?query=workflow%3Atest+branch%3Amain
+.. image:: https://github.com/pygraphviz/pygraphviz/workflows/test/badge.svg
+  :target: https://github.com/pygraphviz/pygraphviz/actions/workflows/test.yml
 
 .. image:: https://codecov.io/gh/pygraphviz/pygraphviz/branch/main/graph/badge.svg
    :target: https://app.codecov.io/gh/pygraphviz/pygraphviz/branch/main
@@ -50,3 +50,7 @@ Released under the 3-Clause BSD license (see ``LICENSE``)::
   Aric Hagberg <aric.hagberg@gmail.gov>
   Dan Schult <dschult@colgate.edu>
   Manos Renieris
+
+The binary wheels distributed on PyPI bundle the Graphviz libraries and
+command-line tools, which are licensed separately under the Eclipse Public
+License v2.0 (see ``LICENSE.graphviz``).

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/doc/source/conf.py

@@ -22,6 +22,7 @@ extensions = [
     "sphinx.ext.imgconverter",
     "sphinx_gallery.gen_gallery",
     "numpydoc",
+    "myst_nb",
 ]
 
 # General substitutions.
@@ -67,6 +68,12 @@ add_module_names = False
 pygments_style = "sphinx"
 
 
+def setup(app):
+    # Workaround to prevent duplicate file warnings from sphinx due to having
+    # both myst-nb and sphinx-gallery generating executable files
+    app.registry.source_suffix.pop(".ipynb")
+
+
 # Options for HTML output
 # -----------------------
 

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

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

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

@@ -7,6 +7,7 @@ Releases
 .. toctree::
    :maxdepth: 2
 
+   release_dev
    release_1.14
    release_1.13
    release_1.12

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

@@ -0,0 +1,38 @@
+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._

pygraphviz-2.0rc4/examples/README.txt

@@ -0,0 +1,6 @@
+.. _examples_gallery:
+
+Gallery
+=======
+
+Graph visualization examples with pygraphviz.

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

@@ -26,7 +26,16 @@ if sys.version_info >= (3, 8, 0) and sys.platform == "win32":
             os.add_dll_directory(path)
 
 
-__version__ = "2.0rc2"
+from ._graphviz import (
+    GRAPHVIZ_MAJOR_VERSION,
+    GRAPHVIZ_MINOR_VERSION,
+    GRAPHVIZ_PATCH_VERSION,
+)
+
+__version__ = "2.0rc4"
+__graphviz_version__ = (
+    f"{GRAPHVIZ_MAJOR_VERSION}.{GRAPHVIZ_MINOR_VERSION}.{GRAPHVIZ_PATCH_VERSION}"
+)
 
 from .agraph import AGraph, Attribute, DotError, Edge, ItemAttribute, Node
 

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/pygraphviz/graphviz.i

@@ -11,6 +11,10 @@
 #include <string.h>
 %}
 
+#define GRAPHVIZ_MAJOR_VERSION GRAPHVIZ_VERSION_MAJOR
+#define GRAPHVIZ_MINOR_VERSION GRAPHVIZ_VERSION_MINOR
+#define GRAPHVIZ_PATCH_VERSION GRAPHVIZ_VERSION_PATCH
+
 %typemap(in) FILE* input_file (int fd, PyObject *mode_obj, PyObject *mode_byte_obj, char *mode) {
     if ($input == Py_None) { $1 = NULL; }
     else {

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/pygraphviz/graphviz.py

@@ -58,6 +58,9 @@ class _SwigNonDynamicMeta(type):
     __setattr__ = _swig_setattr_nondynamic_class_variable(type.__setattr__)
 
 
+GRAPHVIZ_MAJOR_VERSION = _graphviz.GRAPHVIZ_MAJOR_VERSION
+GRAPHVIZ_MINOR_VERSION = _graphviz.GRAPHVIZ_MINOR_VERSION
+GRAPHVIZ_PATCH_VERSION = _graphviz.GRAPHVIZ_PATCH_VERSION
 
 def agopen(name, kind, disc):
     return _graphviz.agopen(name, kind, disc)

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/pygraphviz/tests/test_drawing.py

@@ -1,7 +1,52 @@
+import warnings
 import pygraphviz as pgv
 import pytest
 
 
+def test_drawing_hex_colors(tmp_path):
+    """Ensure hex colors are supported without warnings - see gh-351."""
+    # fmt: off
+    dotstr = """
+        digraph dag {
+        ratio=fill
+        node [style=filled,color="#444444",fillcolor="#ffed6f"]
+        edge [arrowhead=normal,arrowsize=1.0]
+
+        "ID0000001" [shape=ellipse,color="#000000",fillcolor="#1b9e77",label="preprocess\nID0000001"]
+        "ID0000002" [shape=ellipse,color="#000000",fillcolor="#d95f02",label="findrange\nID0000002"]
+        "ID0000003" [shape=ellipse,color="#000000",fillcolor="#d95f02",label="findrange\nID0000003"]
+        "ID0000004" [shape=ellipse,color="#000000",fillcolor="#7570b3",label="analyze\nID0000004"]
+        "f.a" [shape=rect,color="#000000",fillcolor="#ffed6f",label="f.a"]
+        "f.b1" [shape=rect,color="#000000",fillcolor="#ffed6f",label="f.b1"]
+        "f.b2" [shape=rect,color="#000000",fillcolor="#ffed6f",label="f.b2"]
+        "f.c1" [shape=rect,color="#000000",fillcolor="#ffed6f",label="f.c1"]
+        "f.c2" [shape=rect,color="#000000",fillcolor="#ffed6f",label="f.c2"]
+        "f.d" [shape=rect,color="#000000",fillcolor="#ffed6f",label="f.d"]
+        "ID0000001" -> "f.b1" [color="#000000"]
+        "ID0000001" -> "f.b2" [color="#000000"]
+        "ID0000001" -> "ID0000003" [color="#000000"]
+        "ID0000001" -> "ID0000002" [color="#000000"]
+        "ID0000002" -> "f.c1" [color="#000000"]
+        "ID0000002" -> "ID0000004" [color="#000000"]
+        "ID0000003" -> "f.c2" [color="#000000"]
+        "ID0000003" -> "ID0000004" [color="#000000"]
+        "ID0000004" -> "f.d" [color="#000000"]
+        "f.a" -> "ID0000001" [color="#000000"]
+        "f.b1" -> "ID0000002" [color="#000000"]
+        "f.b2" -> "ID0000003" [color="#000000"]
+        "f.c1" -> "ID0000004" [color="#000000"]
+        "f.c2" -> "ID0000004" [color="#000000"]
+    }
+    """
+    # fmt: on
+    A = pgv.AGraph()
+    A.from_string(dotstr)
+    with warnings.catch_warnings(record=True) as rec:
+        A.layout("dot")
+        A.draw(str(tmp_path / "img.png"))
+    assert len(rec) == 0
+
+
 def test_drawing_error():
     with pytest.raises(AttributeError):
         A = pgv.AGraph(name="test graph")

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/pygraphviz/tests/test_graph.py

@@ -6,6 +6,14 @@ import pygraphviz as pgv
 stringify = pgv.testing.stringify
 
 
+def test_agraph_multiedges():
+    """See gh-162"""
+    G = pgv.AGraph(strict=False)
+    G.add_edge("a", "b", "first")
+    G.add_edge("a", "b", "second")
+    assert sorted(G.edges(keys=True)) == [("a", "b", "first"), ("a", "b", "second")]
+
+
 def test_tred():
     A = pgv.AGraph(directed=True)
     A.add_edges_from([(0, 1), (1, 2), (0, 2)])
@@ -35,11 +43,12 @@ def test_tred_cycle():
     """RuntimeWarning raised when cycle detected."""
     A = pgv.AGraph(directed=True)
     A.add_edges_from([(0, 1), (1, 2), (2, 0)])  # Directed 3-cycle
-    with warnings.catch_warnings(record=True, category=RuntimeWarning) as rec:
+    with warnings.catch_warnings(record=True) as rec:
         A.tred()
     # No transitive reduction possible on 3-cycle
     assert A.edges() == [("0", "1"), ("1", "2"), ("2", "0")]
     assert len(rec) == 1  # Expect 1 RuntimeWarning
+    assert rec[0].category == RuntimeWarning
     assert "transitive reduction not unique" in str(rec[0].message)
 
 
@@ -565,3 +574,19 @@ def test_repr_on_incomplete_initialization():
     in __repr__ when object initialization fails. See gh-519."""
     with pytest.raises(TypeError, match="Unrecognized input"):
         A = pgv.AGraph(object())
+
+
+@pytest.mark.parametrize(
+    "node",
+    (
+        "Node D_0__Bacteria D_1__Cyanobacteria D_2__Chloroplast D_3__Bryum argenteum var. argenteum D_4__Bryum argenteum var. argenteum D_5__Bryum argenteum var. argenteum D_6__Bryum argenteum var",  # Very long node name
+        "xxxxxx市中西医结合医疗健康集团xxxxx分院(xxx市xxxxxxxxxx镇卫生院、xxx市xxxxxxxxxxx镇社区卫生服务中心)(15094137051)",  # with unicode
+    ),
+)
+def test_long_node(node):
+    """Test agnode doesn't fail when graph contains very long nodes. See gh-123."""
+    A = pgv.AGraph(directed=True)
+    A.add_nodes_from(list(range(5)) + [node])
+    A.layout()  # Smoke test - should not raise
+    # Check each node was assigned a position
+    assert A.to_string().count("pos") == 6

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/pygraphviz/tests/test_layout.py

@@ -3,6 +3,17 @@ import pytest
 import pygraphviz as pgv
 
 
+def test_sequential_layout_filehandles_windows():
+    """See gh-483"""
+    # Check that a bunch of sequential layout calls doesn't bork windows
+    for _ in range(512):
+        A = pgv.AGraph()
+        A.layout()
+    # The existence of "node" in the graph is an indication that the layout
+    # was run successfully.
+    assert "node" in A.to_string()
+
+
 def test_layout():
     A = pgv.AGraph(name="test graph")
     A.add_path([1, 2, 3, 4])

pygraphviz-2.0rc4/pygraphviz/tests/test_pygraphviz.py

@@ -0,0 +1,13 @@
+import pytest
+
+import pygraphviz as pgv
+
+
+def test_graphviz_version():
+    """Test to ensure package exports the __graphviz_version__ attribute, which
+    holds the version info for the packaged graphviz version."""
+    # Smoke test - the following lines will fail if e.g. __graphviz_version__
+    # is not present or the version string takes an unexpected form
+    graphviz_version = pgv.__graphviz_version__
+    vmaj, vmin, vpatch = graphviz_version.split(".")
+    assert int(vmaj) >= 2

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/pygraphviz/tests/test_readwrite.py

@@ -1,5 +1,24 @@
+import pytest
 import pygraphviz as pgv
 
+graphviz_major_version = int(pgv.__graphviz_version__.split(".")[0])
+
+
+@pytest.mark.skipif(graphviz_major_version < 13, reason="Graphviz version too old")
+def test_multiple_reads_same_source_trailing_character(tmp_path):
+    """Ensure multiple reads from the same text file with an unexpected trailing
+    character don't cause agread fails. See gh-171."""
+    fpath = tmp_path / "hello.gv.txt"
+    # Original bug was in the read-from-file code path
+    with open(fpath, "w") as fh:
+        fh.write('digraph G {Hello->World}"')  # note the trailing "
+
+    # Smoke test: sequential reads from the same file via the AGraph constructor
+    # should not raise ValueError/DotError
+    A = pgv.AGraph(str(fpath))
+    B = pgv.AGraph(str(fpath))
+    assert A.to_string() == B.to_string()
+
 
 def test_readwrite(tmp_path):
     A = pgv.AGraph(name="test graph")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygraphviz
-Version: 2.0rc2
+Version: 2.0rc4
 Summary: Python interface to Graphviz
 Author: Manos Renieris
 Author-email: Aric Hagberg <aric.hagberg@gmail.com>, Dan Schult <dschult@colgate.edu>
@@ -20,6 +20,7 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -30,16 +31,17 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Classifier: Topic :: Scientific/Engineering :: Visualization
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
+License-File: LICENSE.graphviz
 Dynamic: license-file
 
 PyGraphviz
 ==========
 
-.. image:: https://github.com/pygraphviz/pygraphviz/workflows/test/badge.svg?branch=main
-  :target: https://github.com/pygraphviz/pygraphviz/actions?query=workflow%3Atest+branch%3Amain
+.. image:: https://github.com/pygraphviz/pygraphviz/workflows/test/badge.svg
+  :target: https://github.com/pygraphviz/pygraphviz/actions/workflows/test.yml
 
 .. image:: https://codecov.io/gh/pygraphviz/pygraphviz/branch/main/graph/badge.svg
    :target: https://app.codecov.io/gh/pygraphviz/pygraphviz/branch/main
@@ -87,3 +89,7 @@ Released under the 3-Clause BSD license (see ``LICENSE``)::
   Aric Hagberg <aric.hagberg@gmail.gov>
   Dan Schult <dschult@colgate.edu>
   Manos Renieris
+
+The binary wheels distributed on PyPI bundle the Graphviz libraries and
+command-line tools, which are licensed separately under the Eclipse Public
+License v2.0 (see ``LICENSE.graphviz``).

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

@@ -1,5 +1,6 @@
 INSTALL.txt
 LICENSE
+LICENSE.graphviz
 MANIFEST.in
 Makefile
 README.rst
@@ -9,7 +10,6 @@ doc/Makefile
 doc/source/conf.py
 doc/source/index.rst
 doc/source/install.rst
-doc/source/tutorial.rst
 doc/source/developer/contribute.rst
 doc/source/developer/index.rst
 doc/source/developer/release.rst
@@ -23,6 +23,7 @@ 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
+examples/README.txt
 examples/miles_dat.txt.gz
 examples/plot_attributes.py
 examples/plot_miles.py
@@ -51,6 +52,7 @@ pygraphviz/tests/test_graph.py
 pygraphviz/tests/test_html.py
 pygraphviz/tests/test_layout.py
 pygraphviz/tests/test_node_attributes.py
+pygraphviz/tests/test_pygraphviz.py
 pygraphviz/tests/test_readwrite.py
 pygraphviz/tests/test_repr_mimebundle.py
 pygraphviz/tests/test_scraper.py

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

@@ -11,9 +11,9 @@ authors = [
 ]
 description = "Python interface to Graphviz"
 readme = "README.rst"
-requires-python = ">=3.11"
+requires-python = ">=3.10"
 license = "BSD-3-Clause"
-license-files = ['LICENSE']
+license-files = ['LICENSE', 'LICENSE.graphviz']
 dynamic = ["version"]
 keywords = [
     "Networks",
@@ -29,6 +29,7 @@ classifiers = [
     "Programming Language :: C",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",

{pygraphviz-2.0rc2 → pygraphviz-2.0rc4}/setup.py

@@ -23,11 +23,22 @@ if __name__ == "__main__":
             "Graphviz must be installed to build pygraphviz from source.\n\n"
         ) from e
 
-    vm = re.match(r"dot - graphviz version (\d+)", version_str.decode())
-    graphviz_major_version = int(vm.string[: vm.end()].split(" ")[-1])
-    print(f"Detected Graphviz version {graphviz_major_version}")
+    vm = re.match(r"dot - graphviz version \d+(\.\d+)+", version_str.decode())
+    graphviz_version = vm.string[: vm.end()].split(" ")[-1]
+    print(f"Detected Graphviz version {graphviz_version}")
+
+    vmaj, vmin, vpatch = graphviz_version.split(".")
+    # NOTE: int() is not strictly necessary, but used as implicit validation of
+    # version string
+    graphviz_major_version = int(vmaj)
+    graphviz_minor_version = int(vmin)
+    graphviz_patch_version = int(vpatch)
     # Pass version info into swig build
-    swig_options = [f"-DGRAPHVIZ_VERSION_MAJOR={graphviz_major_version}"]
+    swig_options = [
+        f"-DGRAPHVIZ_VERSION_MAJOR={graphviz_major_version}",
+        f"-DGRAPHVIZ_VERSION_MINOR={graphviz_minor_version}",
+        f"-DGRAPHVIZ_VERSION_PATCH={graphviz_patch_version}",
+    ]
 
     define_macros = [("SWIG_PYTHON_STRICT_BYTE_CHAR", None)]
     if WINDOWS:

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

@@ -1,39 +0,0 @@
-pygraphviz 2.0rc2
-=================
-
-We're happy to announce the release of pygraphviz 2.0rc2!
-
-Documentation
--------------
-
-- Update docs for 2.0 (`#609 <https://github.com/pygraphviz/pygraphviz/pull/609>`_).
-
-Maintenance
------------
-
-- 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>`_).
-
-Contributors
-------------
-
-5 authors 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>`_)
-
-4 reviewers added to this release (alphabetically):
-
-- Dan Schult (`@dschult <https://github.com/dschult>`_)
-- 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.0rc2/doc/source/tutorial.rst

@@ -1,115 +0,0 @@
-Tutorial
-========
-
-The API is very similar to that of NetworkX.  Much of the
-`NetworkX tutorial <https://networkx.org/documentation/latest/tutorial.html>`_
-is applicable to PyGraphviz.
-
-Start-up
---------
-
-Import PyGraphviz with
-
->>> import pygraphviz as pgv
-
-Graphs
-------
-
-To make an empty pygraphviz graph use the AGraph class:
-
->>> G = pgv.AGraph()
-
-You can use the strict and directed keywords to control what type of
-graph you want.  The default is to create a strict graph
-(no parallel edges or self-loops).  To create a digraph with possible
-parallel edges and self-loops use
-
->>> G = pgv.AGraph(strict=False, directed=True)
-
-You may specify a dot format file to be read on initialization:
-
->>> G = pgv.AGraph("Petersen.dot")  # doctest: +SKIP
-
-Other options for initializing a graph are using a string,
-
->>> G = pgv.AGraph("graph {1 - 2}")
-
-using a dict of dicts,
-
->>> d = {"1": {"2": None}, "2": {"1": None, "3": None}, "3": {"2": None}}
->>> A = pgv.AGraph(d)
-
-or using a SWIG pointer to the AGraph datastructure,
-
->>> h = A.handle
->>> C = pgv.AGraph(h)
-
-
-Nodes, and edges
-----------------
-
-Nodes and edges can be added one at a time
-
->>> G.add_node("a")  # adds node 'a'
->>> G.add_edge("b", "c")  # adds edge 'b'-'c' (and also nodes 'b', 'c')
-
-or from lists or containers.
-
->>> nodelist = ["f", "g", "h"]
->>> G.add_nodes_from(nodelist)
-
-If the node is not a string an attempt will be made to convert it
-to a string
-
->>> G.add_node(1)  # adds node '1'
-
-
-Attributes
-----------
-
-To set the default attributes for graphs, nodes, and edges use
-the graph_attr, node_attr, and edge_attr dictionaries
-
->>> G.graph_attr["label"] = "Name of graph"
->>> G.node_attr["shape"] = "circle"
->>> G.edge_attr["color"] = "red"
-
-Graph attributes can be set when initializing the graph
-
->>> G = pgv.AGraph(ranksep="0.1")
-
-Attributes can be added when adding nodes or edges,
-
->>> G.add_node(1, color="red")
->>> G.add_edge("b", "c", color="blue")
-
-or through the node or edge attr dictionaries,
-
->>> n = G.get_node(1)
->>> n.attr["shape"] = "box"
-
-
->>> e = G.get_edge("b", "c")
->>> e.attr["color"] = "green"
-
-Layout and Drawing
-------------------
-Pygraphviz provides several methods for layout and drawing of graphs.
-
-To store and print the graph in dot format as a Python string use
-
->>> s = G.string()
-
-To write to a file use
-
->>> G.write("file.dot")
-
-To add positions to the nodes with a Graphviz layout algorithm
-
->>> G.layout()  # default to neato
->>> G.layout(prog="dot")  # use dot
-
-To render the graph to an image
-
->>> G.draw("file.png")  # write previously positioned graph to PNG file
->>> G.draw("file.ps", prog="circo")  # use circo to position, write PS file