Fix an issue with new version of NetworkX

maximsch2 · Jun 21, 2016 · 65e1bb5 · 65e1bb5
1 parent 70f1ff0
commit 65e1bb5
Show file tree

Hide file tree

Showing 10 changed files with 12,150 additions and 8,150 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+dist
+build
+*.pyc
+*.egg-info/
diff --git a/PKG-INFO b/PKG-INFO
@@ -1,8 +1,8 @@
 Metadata-Version: 1.0
 Name: pglasso
-Version: 1.0.1
+Version: 1.0.2
 Summary: Pathway Graphical Lasso implementation
-Home-page: https://sites.google.com/a/cs.washington.edu/pathglasso/
+Home-page: http://pathglasso-leelab.cs.washington.edu
 Author: Maxim Grechkin
 Author-email: grechkin@cs.washington.edu
 License: MIT

diff --git a/_pglasso.c b/_pglasso.c
diff --git a/_pglasso.pyx b/_pglasso.pyx
@@ -905,6 +905,7 @@ def cpglasso_DC(S, pathways, lmbda, tol=1e-4, maxIter=50, debug=False, Theta=Non
     j = 1
     components = nx.connected_components(tree)
     for component in components:
+        component = list(component) # convert set to list for NetworkX > 1.10
         j += 1
         source = random.choice(component)
         for i in xrange(maxIter):

diff --git a/pglasso.egg-info/PKG-INFO b/pglasso.egg-info/PKG-INFO
diff --git a/pglasso.egg-info/SOURCES.txt b/pglasso.egg-info/SOURCES.txt
diff --git a/pglasso.egg-info/dependency_links.txt b/pglasso.egg-info/dependency_links.txt
diff --git a/pglasso.egg-info/requires.txt b/pglasso.egg-info/requires.txt
diff --git a/pglasso.egg-info/top_level.txt b/pglasso.egg-info/top_level.txt
diff --git a/setup.py b/setup.py
@@ -14,13 +14,14 @@
 
 setup(
     name = "pglasso",
-    version = "1.0.1",
+    version = "1.0.2",
     author='Maxim Grechkin',
     author_email='grechkin@cs.washington.edu',
-    url="https://sites.google.com/a/cs.washington.edu/pathglasso/",
+    url="http://pathglasso-leelab.cs.washington.edu",
     packages=['pglasso'],
     scripts=["pglasso/__init__.py"],
-    description='Pathway Graphical Lasso implementation',
+    description="Pathway Graphical Lasso implementation",
+    license="MIT",
     ext_modules = cythonize( Extension("_pglasso", ["_pglasso.pyx"], include_dirs=[np.get_include()])),
     install_requires=[
         "cython >= 0.20.1",