Skip to content

Commit

Permalink
update dependent packages
Browse files Browse the repository at this point in the history
  • Loading branch information
philopon committed Jan 20, 2018
1 parent acce36a commit 0656f25
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions mordred/DetourMatrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from . import _matrix_attributes as ma
from ._base import Descriptor

__all__ = ("DetourMatrix", "DetourIndex",)
__all__ = ("DetourMatrix", "DetourIndex")


class LongestSimplePath(object):
Expand All @@ -18,12 +18,12 @@ def __init__(self, G, weight=None):
self.N = G.number_of_nodes()
self.neighbors = {
n: [(v, d.get(weight, 1.0)) for v, d in G[n].items()]
for n in G.nodes_iter()
for n in G.nodes()
}

def _start(self, s):
self.start = s
self.result = {n: 0 for n in self.G.nodes_iter()}
self.result = {n: 0 for n in self.G.nodes()}
self.visited = set()
self.distance = 0.0
self._search(s)
Expand All @@ -50,7 +50,7 @@ def _search(self, u):

def __call__(self):
return {(min(s, g), max(s, g)): w
for s in self.G.nodes_iter()
for s in self.G.nodes()
for g, w in self._start(s).items()}


Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
from setuptools import setup, find_packages

install_requires = [
"six>=1.10",
"numpy>=1.10",
"networkx>=1.10",
"tqdm>=3.7.1",
"six==1.*",
"numpy==1.*",
"networkx==2.*",
"tqdm==4.*",
]

if sys.version_info < (3, 4, 0):
Expand Down Expand Up @@ -55,8 +55,8 @@ def get_test_data():
install_requires=install_requires,

tests_require=[
"nose>=1.3",
"PyYaml>=3.11",
"nose==1.*",
"PyYaml==3.*",
],

cmdclass={"test": None},
Expand Down

0 comments on commit 0656f25

Please sign in to comment.