summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/Credits.txt1
-rw-r--r--doc/Install.txt74
-rw-r--r--doc/News.txt23
-rw-r--r--networkx/release.py4
4 files changed, 66 insertions, 36 deletions
diff --git a/doc/Credits.txt b/doc/Credits.txt
index 7eb788c3..d23863a8 100644
--- a/doc/Credits.txt
+++ b/doc/Credits.txt
@@ -49,3 +49,4 @@ Thanks to the following people who have made contributions to NetworkX:
- Eben Kennah contributed the strongly connected components and
DFS functions.
+- Sasha Gutfriend contributed edge betweenness algorithms
diff --git a/doc/Install.txt b/doc/Install.txt
index 7725822c..bde737e4 100644
--- a/doc/Install.txt
+++ b/doc/Install.txt
@@ -3,37 +3,7 @@ Requirements
To use NetworkX you need Python version 2.3 or later http://www.python.org/
-If you don't have Python installed on your system:
-
-Windows
-~~~~~~~
-The easiest way to get Python and most optional packages is to install
-the Enthought Python distribution: http://code.enthought.com/enthon/
-
-Other options are
-
- - Download from the official Python site at
- http://www.python.org/download/
-
- - ActiveState also distributes a binary version
- http://activestate.com/Products/ActivePython/?mp=1
-
-OSX
-~~~
-OSX ships with Python version 2.3. You are encouraged to download
-a newer release. Pre-built Python packages are available from
-
- - Pythonmac http://www.pythonmac.org/packages/
-
-Other options are:
-
- - ActiveState http://activestate.com/Products/ActivePython/?mp=1
-
- - Download from the official Python site at
- http://www.python.org/download/
-
-If you are using Fink or MacPorts, Python is available through both
-of those package systems.
+See below for tips on installing Python.
Installing Pre-built NetworkX packages
@@ -45,9 +15,9 @@ Windows
~~~~~~~
Download and run the latest version of the Windows installer (.exe extension).
-OSX (Pythonmac)
-~~~~~~~~~~~~~~~
-Download and install the latest mpkg for your system.
+OSX 10.5
+~~~~~~~~
+Download and install the latest mpkg.
Linux
~~~~~
@@ -140,3 +110,39 @@ These are extra packages you may consider to use with NetworkX
- sAsync, persistent storage with SQL, http://foss.eepatents.com/sAsync
- PyYAML, structured output format, http://pyyaml.org/
+
+Installing Python
+-----------------
+
+If you don't have Python installed on your system:
+
+Windows
+~~~~~~~
+The easiest way to get Python and most optional packages is to install
+the Enthought Python distribution: http://code.enthought.com/enthon/
+
+Other options are
+
+ - Download from the official Python site at
+ http://www.python.org/download/
+
+ - ActiveState also distributes a binary version
+ http://activestate.com/Products/ActivePython/?mp=1
+
+OSX
+~~~
+OSX 10.5 ships with Python version 2.5. If you
+have an older version we encourage you to download
+a newer release. Pre-built Python packages are available from
+
+ - Pythonmac http://www.pythonmac.org/packages/
+
+Other options are:
+
+ - ActiveState http://activestate.com/Products/ActivePython/?mp=1
+
+ - Download from the official Python site at
+ http://www.python.org/download/
+
+If you are using Fink or MacPorts, Python is available through both
+of those package systems.
diff --git a/doc/News.txt b/doc/News.txt
index 507657df..ea69fba9 100644
--- a/doc/News.txt
+++ b/doc/News.txt
@@ -3,6 +3,29 @@
NetworkX News
=============
+NetworkX-0.36
+---------------
+
+Release date: 13 January 2008
+
+See: https://networkx.lanl.gov/timeline
+
+
+New features
+~~~~~~~~~~~~
+ - GML format graph reader, tests, and example (football.py)
+ - edge_betweenness() and load_betweenness()
+
+Bug fixes
+~~~~~~~~~
+ - remove obsolete parts of pygraphviz interface
+ - improve handling of Matplotlib version strings
+ - write_dot() now writes parallel edges and self loops
+ - is_bipartite() and bipartite_color() fixes
+ - configuration model speedup using random.shuffle()
+ - convert with specified nodelist now works correctly
+ - vf2 isomorphism checker updates
+
NetworkX-0.35.1
---------------
diff --git a/networkx/release.py b/networkx/release.py
index 81992b00..d3e6f685 100644
--- a/networkx/release.py
+++ b/networkx/release.py
@@ -1,6 +1,6 @@
"""Release data for NetworkX."""
-# Copyright (C) 2004-2007 by
+# Copyright (C) 2004-2008 by
# Aric Hagberg <hagberg@lanl.gov>
# Dan Schult <dschult@colgate.edu>
# Pieter Swart <swart@lanl.gov>
@@ -10,7 +10,7 @@
__author__ = """Aric Hagberg (hagberg@lanl.gov)\nPieter Swart (swart@lanl.gov)\nDan Schult (dschult@colgate.edu)"""
name = 'networkx'
-version = '0.36-svn'
+version = '0.36'
description = "Python package for creating and manipulating graphs and networks"