diff options
| author | ysitu <ysitu@users.noreply.github.com> | 2014-06-07 08:01:50 -0400 |
|---|---|---|
| committer | ysitu <ysitu@users.noreply.github.com> | 2014-06-07 08:01:50 -0400 |
| commit | aa02955691df0fb6512b0214df0cdfc07ec89734 (patch) | |
| tree | 25074428da6cb111c41d76b1fc1bc5e0d685f718 /setup.py | |
| parent | a2489fdd5b6d03fd2fcb7601656e3cfc4059f1de (diff) | |
| parent | 9a0067a0638f4ff7a7e4a044faca230fdbd72f14 (diff) | |
| download | networkx-aa02955691df0fb6512b0214df0cdfc07ec89734.tar.gz | |
Merge branch 'greedy-coloring' of git://github.com/itu-sass-s2014/networkx into greedy_color
Conflicts:
networkx/algorithms/__init__.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -39,6 +39,7 @@ packages=["networkx", "networkx.algorithms.community", "networkx.algorithms.components", "networkx.algorithms.connectivity", + "networkx.algorithms.coloring", "networkx.algorithms.flow", "networkx.algorithms.traversal", "networkx.algorithms.isomorphism", @@ -90,6 +91,7 @@ package_data = { 'networkx.algorithms.community': ['tests/*.py'], 'networkx.algorithms.components': ['tests/*.py'], 'networkx.algorithms.connectivity': ['tests/*.py'], + 'networkx.algorithms.coloring': ['tests/*.py'], 'networkx.algorithms.flow': ['tests/*.py', 'tests/*.bz2'], 'networkx.algorithms.traversal': ['tests/*.py'], 'networkx.algorithms.isomorphism': ['tests/*.py','tests/*.*99'], |