Merge branch 'master' into greedy_color

.travis.yml

@@ -4,24 +4,21 @@
 language: python
 
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"
-  - "pypy"
 
 matrix:
   fast_finish: true
 
   include:
+    - python: "pypy"
+      env: OPTIONAL_DEPS=no
     - python: "3.4"
       env: OPTIONAL_DEPS=source
 
   allow_failures:
-    # 3.4 and pypy Wheels are not yet available.
-    - python: "pypy"
-      env: OPTIONAL_DEPS=pip
     - env: OPTIONAL_DEPS=source
 
 env:

doc/source/reference/api_2.0.rst

@@ -0,0 +1,13 @@
+*********************************
+Version 2.0 notes and API changes
+*********************************
+
+This page reflects API changes from NetworkX 1.9 to NetworkX 2.0.
+
+Please send comments and questions to the networkx-discuss mailing list:
+<http://groups.google.com/group/networkx-discuss>.
+
+Miscellaneous changes
+---------------------
+
+* Support for Python 2.6 is dropped.

doc/source/reference/api_changes.rst

@@ -5,6 +5,7 @@ API changes
 .. toctree::
    :maxdepth: 2
 
+   api_2.0
    api_1.9
    api_1.8
    api_1.7

doc/source/reference/news.rst

@@ -4,6 +4,12 @@
 Release Log
 ===========
 
+NetworkX 2.0
+------------
+Release date: TBD
+
+Support for Python 2.6 is dropped in this release.
+
 NetworkX 1.9
 ------------
 Release date: TBD

networkx/__init__.py

@@ -34,8 +34,8 @@
 from __future__ import absolute_import
 
 import sys
-if sys.version_info[:2] < (2, 6):
-    m = "Python version 2.6 or later is required for NetworkX (%d.%d detected)."
+if sys.version_info[:2] < (2, 7):
+    m = "Python 2.7 or later is required for NetworkX (%d.%d detected)."
     raise ImportError(m % sys.version_info[:2])
 del sys
 
@@ -54,7 +54,6 @@
 from networkx.exception import  *
 import networkx.external
 import networkx.utils
-# these packages work with Python >= 2.6
 
 import networkx.classes
 from networkx.classes import *

networkx/release.py

@@ -127,7 +127,7 @@ def get_revision():
     if os.path.isdir(hgdir):
         vcs = 'mercurial'
         try:
-            p = subprocess.Popen(['hg', 'id'], 
+            p = subprocess.Popen(['hg', 'id'],
                                  cwd=basedir,
                                  stdout=subprocess.PIPE)
         except OSError:
@@ -137,7 +137,7 @@ def get_revision():
             stdout = p.communicate()[0]
             # Force strings instead of unicode.
             x = list(map(str, stdout.decode().strip().split()))
-            
+
             if len(x) == 0:
                 # Somehow stdout was empty. This can happen, for example,
                 # if you're running in a terminal which has redirected stdout.
@@ -149,7 +149,7 @@ def get_revision():
             else:
                 revision = str(x[0])
                 tag = str(x[1])
-                
+
     elif os.path.isdir(gitdir):
         vcs = 'git'
         # For now, we are not bothering with revision and tag.
@@ -200,8 +200,8 @@ def get_info(dynamic=True):
 
 ## Version information
 name = 'networkx'
-major = "1"
-minor = "9"
+major = "2"
+minor = "0"
 
 
 ## Declare current release as a development release.
@@ -235,7 +235,6 @@ def get_info(dynamic=True):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',

setup.py

@@ -19,8 +19,8 @@
     print("To install, run 'python setup.py install'")
     print()
 
-if sys.version_info[:2] < (2, 6):
-    print("NetworkX requires Python version 2.6 or later (%d.%d detected)." %
+if sys.version_info[:2] < (2, 7):
+    print("NetworkX requires Python 2.7 or later (%d.%d detected)." %
           sys.version_info[:2])
     sys.exit(-1)