diff -pruN 2.2-1/debian/changelog 2.2-1ubuntu4/debian/changelog --- 2.2-1/debian/changelog 2018-11-23 22:21:28.000000000 +0000 +++ 2.2-1ubuntu4/debian/changelog 2019-10-01 22:24:24.000000000 +0000 @@ -1,3 +1,36 @@ +python-networkx (2.2-1ubuntu4) eoan; urgency=medium + + * Build-depend on texlive-plain-generic instead of obsolete texlive- + plain-extra. + + -- Steve Langasek Tue, 01 Oct 2019 15:24:24 -0700 + +python-networkx (2.2-1ubuntu3) eoan; urgency=medium + + * Build-depend on texlive-plain-extra instead of obsolete texlive- + generic-extra. + + -- Steve Langasek Fri, 27 Sep 2019 15:37:26 -0700 + +python-networkx (2.2-1ubuntu2) eoan; urgency=medium + + * Build-depend on python3-sphinx-gallery, not the obsolete python2 + version. + * debian/patches/python3-examples.patch: port code examples to + python3. + * Re-enable python-networkx-doc, universe build-deps are no longer a + reason for disabling this + + -- Steve Langasek Mon, 19 Aug 2019 15:37:59 -0700 + +python-networkx (2.2-1ubuntu1) disco; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Don't build the -doc package; too many dependencies in universe. + - Lower Recommends to Suggests for some universe packages. + + -- Gianfranco Costamagna Mon, 26 Nov 2018 06:34:27 +0100 + python-networkx (2.2-1) unstable; urgency=medium [ Ondřej Nový ] @@ -18,6 +51,35 @@ python-networkx (2.2-1) unstable; urgenc -- Sandro Tosi Fri, 23 Nov 2018 17:21:28 -0500 +python-networkx (2.1-1ubuntu4) disco; urgency=medium + + * python3-networkx: Suggest python3-gdal instead of recommending it. + + -- Matthias Klose Wed, 14 Nov 2018 19:29:50 +0100 + +python-networkx (2.1-1ubuntu3) disco; urgency=medium + + * d/patches/0007-Fix-StopIteration-handling-which-breaks-in-python-3.7.patch: + backport patch from upstream to improve compatibility with Python 3.7. + + -- Michael Hudson-Doyle Tue, 06 Nov 2018 14:01:33 +1300 + +python-networkx (2.1-1ubuntu2) cosmic; urgency=medium + + * Move python*-pkg-resources to real dependencies, needed to run the + python-cov testsuite (drawing/nx_pydot.py subpackage) + + -- Gianfranco Costamagna Wed, 27 Jun 2018 17:10:11 +0200 + +python-networkx (2.1-1ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Don't build the -doc package; too many dependencies in universe. + - Lower Recommends to Suggests for some universe packages. + - Build-depend on python3-decorator. + + -- Gianfranco Costamagna Wed, 27 Jun 2018 12:04:40 +0200 + python-networkx (2.1-1) unstable; urgency=medium [ Sandro Tosi ] @@ -78,6 +140,21 @@ python-networkx (1.11-2) UNRELEASED; urg -- Andreas Tille Sat, 06 Aug 2016 17:50:20 +0200 +python-networkx (1.11-1ubuntu2) bionic; urgency=medium + + * python3-networkx: Depend on python3-lib2to3. Closes: #896212. + + -- Matthias Klose Thu, 26 Apr 2018 09:39:13 +0200 + +python-networkx (1.11-1ubuntu1) xenial; urgency=medium + + * Merge with Debian; remaining changes: + - Don't build the -doc package; too many dependencies in universe. + - Lower Recommends to Suggests for some universe packages. + - Build-depend on python3-decorator. + + -- Matthias Klose Mon, 21 Mar 2016 20:52:54 +0100 + python-networkx (1.11-1) unstable; urgency=medium * New upstream release @@ -92,6 +169,15 @@ python-networkx (1.11~rc2-1) unstable; u -- Sandro Tosi Thu, 28 Jan 2016 19:52:06 +0000 +python-networkx (1.11~rc1-1ubuntu1) xenial; urgency=medium + + * Merge with Debian; remaining changes: + - Don't build the -doc package; too many dependencies in universe. + - Lower Recommends to Suggests for some universe packages. + * Build-depend on python3-decorator. + + -- Matthias Klose Sun, 17 Jan 2016 11:41:11 +0100 + python-networkx (1.11~rc1-1) unstable; urgency=medium [ Thomas Goirand ] diff -pruN 2.2-1/debian/control 2.2-1ubuntu4/debian/control --- 2.2-1/debian/control 2018-11-23 22:21:28.000000000 +0000 +++ 2.2-1ubuntu4/debian/control 2019-10-01 22:24:24.000000000 +0000 @@ -1,36 +1,38 @@ Source: python-networkx Section: python Priority: optional -Maintainer: Sandro Tosi +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sandro Tosi Uploaders: Debian Python Modules Team , Build-Depends: debhelper (>= 9), dh-python, latexmk, python-all, python-setuptools, - python-sphinx, + python3-sphinx, python3-all, + python3-decorator, python3-setuptools, Build-Depends-Indep: dvipng, - python-ipykernel, + python3-ipykernel, python-decorator (>= 4.3.0), python3-decorator (>= 4.3.0), python-gdal, python-matplotlib, - python-nb2plots, - python-nbformat, - python-nbconvert, python-nose, python-numpy, python-numpydoc, python-pydot, python-pygraphviz, python-scipy, - python-sphinx-rtd-theme, - python-sphinx-gallery, + python3-sphinx-rtd-theme, + python3-sphinx-gallery, python-traitlets, python3-gdal, python3-matplotlib, + python3-nb2plots, + python3-nbformat, + python3-nbconvert, python3-nose, python3-numpy, python3-scipy, @@ -41,7 +43,7 @@ Build-Depends-Indep: dvipng, texlive-latex-base, texlive-latex-extra, texlive-latex-recommended, - texlive-generic-extra, + texlive-plain-generic, zip, Standards-Version: 4.2.1 Homepage: http://networkx.github.io/ @@ -53,13 +55,13 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, -Recommends: python-gdal, - python-matplotlib, - python-numpy, - python-pygraphviz | python-pydot, - python-scipy, +Recommends: python-numpy, python-yaml, -Suggests: python-networkx-doc +Suggests: python-gdal, + python-matplotlib, + python-networkx-doc, + python-pygraphviz | python-pydot, + python-scipy Description: tool to create, manipulate and study complex networks NetworkX is a Python-based package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks. @@ -78,11 +80,9 @@ Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, python3-pkg-resources, -Recommends: python3-gdal, - python3-numpy, - python3-scipy, +Recommends: python3-numpy, python3-yaml, -Suggests: python-networkx-doc +Suggests: python3-gdal, python3-scipy, python-networkx-doc Description: tool to create, manipulate and study complex networks (Python3) NetworkX is a Python-based package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks. diff -pruN 2.2-1/debian/patches/python3-examples.patch 2.2-1ubuntu4/debian/patches/python3-examples.patch --- 2.2-1/debian/patches/python3-examples.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2-1ubuntu4/debian/patches/python3-examples.patch 2019-08-19 22:37:59.000000000 +0000 @@ -0,0 +1,60 @@ +Description: port code examples to python3 + This module is portable between python2 and python3, but the examples use + other modules that have changed interfaces between 2 and 3. +Author: Steve Langasek +Last-Modified: 2019-08-20 + +Index: python-networkx-2.2/examples/drawing/plot_unix_email.py +=================================================================== +--- python-networkx-2.2.orig/examples/drawing/plot_unix_email.py ++++ python-networkx-2.2/examples/drawing/plot_unix_email.py +@@ -40,13 +40,14 @@ + + def mbox_graph(): + try: +- fh = open("unix_email.mbox", 'rb') ++ # parse unix mailbox ++ mbox = mailbox.mbox("unix_email.mbox", ++ email.message_from_binary_file, ++ create=False) + except IOError: + print("unix_email.mbox not found") + raise + +- mbox = mailbox.UnixMailbox(fh, email.message_from_file) # parse unix mailbox +- + G = nx.MultiDiGraph() # create empty graph + + # parse each messages and build graph +Index: python-networkx-2.2/examples/graph/plot_erdos_renyi.py +=================================================================== +--- python-networkx-2.2.orig/examples/graph/plot_erdos_renyi.py ++++ python-networkx-2.2/examples/graph/plot_erdos_renyi.py +@@ -40,7 +40,10 @@ + try: + nx.write_adjlist(G, sys.stdout) + except TypeError: # Python 3.x +- nx.write_adjlist(G, sys.stdout.buffer) ++ try: ++ nx.write_adjlist(G, sys.stdout.buffer) ++ except AttributeError: # workaround for sphinx_gallery abusing sys.stdout ++ pass + + nx.draw(G) + plt.show() +Index: python-networkx-2.2/examples/basic/plot_read_write.py +=================================================================== +--- python-networkx-2.2.orig/examples/basic/plot_read_write.py ++++ python-networkx-2.2/examples/basic/plot_read_write.py +@@ -24,7 +24,10 @@ + try: # Python 2.6+ + nx.write_adjlist(G, sys.stdout) # write adjacency list to screen + except TypeError: # Python 3.x +- nx.write_adjlist(G, sys.stdout.buffer) # write adjacency list to screen ++ try: ++ nx.write_adjlist(G, sys.stdout.buffer) # write adjacency list to screen ++ except AttributeError: # workaround for sphinx_gallery abusing sys.stdout ++ pass + # write edgelist to grid.edgelist + nx.write_edgelist(G, path="grid.edgelist", delimiter=":") + # read edgelist from grid.edgelist diff -pruN 2.2-1/debian/patches/series 2.2-1ubuntu4/debian/patches/series --- 2.2-1/debian/patches/series 2018-11-23 22:21:28.000000000 +0000 +++ 2.2-1ubuntu4/debian/patches/series 2019-08-19 22:37:59.000000000 +0000 @@ -2,3 +2,4 @@ 30_use_local_objects.inv 0005-use-debian-mathjax.js.patch 0006-skip-plot_football-from-sphinx-gallery-requires-netw.patch +python3-examples.patch