[Python-modules-commits] [python-networkx] 01/09: Import python-networkx_1.11.orig.tar.gz
Sandro Tosi
morph at moszumanska.debian.org
Sun Jan 31 11:30:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository python-networkx.
commit d17c01666c785cb70a3a0ad9af7b6ce0fbc6e143
Author: Sandro Tosi <morph at debian.org>
Date: Sun Jan 31 11:14:03 2016 +0000
Import python-networkx_1.11.orig.tar.gz
---
LICENSE.txt | 3 +--
PKG-INFO | 2 +-
README.rst | 6 +-----
doc/source/conf.py | 2 +-
doc/source/reference/news.rst | 4 ++--
doc/source/tutorial/tutorial.rst | 4 ++--
networkx.egg-info/PKG-INFO | 2 +-
networkx/drawing/tests/test_agraph.py | 5 +++--
networkx/release.py | 2 +-
networkx/version.py | 8 ++++----
10 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index d0bbf4e..5d07e77 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -4,7 +4,7 @@ NetworkX is distributed with the BSD license.
::
- Copyright (C) 2004-2015, NetworkX Developers
+ Copyright (C) 2004-2016, NetworkX Developers
Aric Hagberg <hagberg at lanl.gov>
Dan Schult <dschult at colgate.edu>
Pieter Swart <swart at lanl.gov>
@@ -38,4 +38,3 @@ NetworkX is distributed with the BSD license.
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/PKG-INFO b/PKG-INFO
index 30a5db9..17fa5c4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: networkx
-Version: 1.11rc2
+Version: 1.11
Summary: Python package for creating and manipulating graphs and networks
Home-page: http://networkx.github.io/
Author: NetworkX Developers
diff --git a/README.rst b/README.rst
index 1d55751..089fb79 100644
--- a/README.rst
+++ b/README.rst
@@ -35,11 +35,7 @@ A quick example that finds the shortest path between two nodes in an undirected
Distributed with a BSD license; see LICENSE.txt::
- Copyright (C) 2004-2015 NetworkX Developers
+ Copyright (C) 2004-2016 NetworkX Developers
Aric Hagberg <hagberg at lanl.gov>
Dan Schult <dschult at colgate.edu>
Pieter Swart <swart at lanl.gov>
-
-
-
-
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 96ea8ef..24faf00 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -100,7 +100,7 @@ master_doc = 'index'
# General substitutions.
project = 'NetworkX'
-copyright = '2015, NetworkX Developers'
+copyright = '2016, NetworkX Developers'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
diff --git a/doc/source/reference/news.rst b/doc/source/reference/news.rst
index 2d2a101..269475e 100644
--- a/doc/source/reference/news.rst
+++ b/doc/source/reference/news.rst
@@ -6,14 +6,14 @@ Release Log
NetworkX 1.11
-------------
-Release date: * November 2015
+Release date: 30 January 2016
Support for Python 3.5 added, drop support for Python 3.2.
Highlights
~~~~~~~~~~
Pydot features now use pydotplus.
-Fixes installation on some machines and test with appveyor,
+Fixes installation on some machines and test with appveyor,
Restores default center and scale of layout routines,
Fixes various docs including no symbolic links in examples.
Docs can now build using autosummary on readthedocs.org.
diff --git a/doc/source/tutorial/tutorial.rst b/doc/source/tutorial/tutorial.rst
index f52e84f..dcd195b 100644
--- a/doc/source/tutorial/tutorial.rst
+++ b/doc/source/tutorial/tutorial.rst
@@ -468,8 +468,8 @@ To save drawings to a file, use, for example
writes to the file "path.png" in the local directory. If Graphviz
and PyGraphviz, or pydotplus, are available on your system, you can also use
+>>> from networkx.drawing.nx_pydot import write_dot
>>> nx.draw_graphviz(G)
->>> nx.write_dot(G,'file.dot')
+>>> write_dot(G,'file.dot')
Details on drawing graphs: :doc:`/reference/drawing`
-
diff --git a/networkx.egg-info/PKG-INFO b/networkx.egg-info/PKG-INFO
index 30a5db9..17fa5c4 100644
--- a/networkx.egg-info/PKG-INFO
+++ b/networkx.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: networkx
-Version: 1.11rc2
+Version: 1.11
Summary: Python package for creating and manipulating graphs and networks
Home-page: http://networkx.github.io/
Author: NetworkX Developers
diff --git a/networkx/drawing/tests/test_agraph.py b/networkx/drawing/tests/test_agraph.py
index a706585..e13178e 100644
--- a/networkx/drawing/tests/test_agraph.py
+++ b/networkx/drawing/tests/test_agraph.py
@@ -5,6 +5,7 @@ import tempfile
from nose import SkipTest
from nose.tools import assert_true,assert_equal
+from networkx.testing import assert_edges_equal, assert_nodes_equal
import networkx as nx
@@ -27,8 +28,8 @@ class TestAGraph(object):
return G
def assert_equal(self, G1, G2):
- assert_true( sorted(G1.nodes())==sorted(G2.nodes()) )
- assert_true( sorted(G1.edges())==sorted(G2.edges()) )
+ assert_nodes_equal(G1.nodes(),G2.nodes())
+ assert_edges_equal(G1.edges(),G2.edges())
def agraph_checks(self, G):
diff --git a/networkx/release.py b/networkx/release.py
index 07130c3..5ccc541 100644
--- a/networkx/release.py
+++ b/networkx/release.py
@@ -174,7 +174,7 @@ def get_info(dynamic=True):
## Version information
name = 'networkx'
major = '1'
-minor = '11rc2'
+minor = '11'
## Declare current release as a development release.
diff --git a/networkx/version.py b/networkx/version.py
index 505cb86..d5e933c 100644
--- a/networkx/version.py
+++ b/networkx/version.py
@@ -7,18 +7,18 @@ Do not add this file to the repository.
import datetime
-version = '1.11rc2'
-date = 'Sat Jan 16 08:53:36 2016'
+version = '1.11'
+date = 'Sat Jan 30 09:55:40 2016'
# Was NetworkX built from a development version? If so, remember that the major
# and minor versions reference the "target" (rather than "current") release.
dev = False
# Format: (name, major, min, revision)
-version_info = ('networkx', '1', '11rc2', None)
+version_info = ('networkx', '1', '11', None)
# Format: a 'datetime.datetime' instance
-date_info = datetime.datetime(2016, 1, 16, 8, 53, 36, 737023)
+date_info = datetime.datetime(2016, 1, 30, 9, 55, 40, 165755)
# Format: (vcs, vcs_tuple)
vcs_info = (None, (None, None))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-networkx.git
More information about the Python-modules-commits
mailing list