From fcdf22dc056c3c4dd8f189c4858d011ad5bccd6c Mon Sep 17 00:00:00 2001 From: Bill Tucker Date: Mon, 14 May 2018 12:14:19 -0600 Subject: [PATCH 1/3] add version numbers for tornado in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 232f21371ea..33bda862497 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from codecs import open requires = [ - 'tornado', + 'tornado >= 4.2, < 5.0.0', 'numpy', 'pandas', 'tqdm', From c6a51fa126913520bb9e7fd3b749921e45a64848 Mon Sep 17 00:00:00 2001 From: Bill Tucker Date: Mon, 14 May 2018 13:30:02 -0600 Subject: [PATCH 2/3] add networkx to setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 33bda862497..7aad7ceedfe 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,7 @@ requires = [ 'tornado >= 4.2, < 5.0.0', + 'networkx', 'numpy', 'pandas', 'tqdm', From 642fd175d478bc1ef2cb62d036203f5b9fe6dee6 Mon Sep 17 00:00:00 2001 From: Bill Tucker Date: Mon, 14 May 2018 13:37:50 -0600 Subject: [PATCH 3/3] change lifespan test to get rid of the deprecation warning. --- tests/test_lifespan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_lifespan.py b/tests/test_lifespan.py index 59b5a06b296..22a285623d0 100644 --- a/tests/test_lifespan.py +++ b/tests/test_lifespan.py @@ -81,7 +81,7 @@ def test_ticks_seen(self): assert self.df.steps.max() == 1 def test_agent_lifetime(self): - lifetimes = self.df.groupby(["AgentID"]).Step.agg({"Step": + lifetimes = self.df.groupby(["AgentID"]).agg({"Step": lambda x: len(x)}) assert lifetimes.Step.max() == 2