Merge e285b72 into 9a0dc3a

.travis.yml

@@ -7,7 +7,7 @@ cache:
 python:
   - "3.4"
   - "3.5"
-  # - "3.6"
+  - "3.6"
   # - "nightly"
 install:
   - pip install -r requirements.txt

mesa/visualization/modules/ChartVisualization.py

@@ -74,9 +74,6 @@ def render(self, model):
 
         for s in self.series:
             name = s["Label"]
-            try:
-                val = data_collector.model_vars[name][-1]  # Latest value
-            except:
-                val = 0
+            val = data_collector.model_vars[name][-1]  # Latest value
             current_values.append(val)
         return current_values

requirements.txt

@@ -1,13 +1,12 @@
-setuptools<34
+setuptools
 numpy
-pandas==0.17.1
-jupyter==1.0.0
+pandas
+jupyter
 
-coverage==4.1
-nose==1.3.7
-tornado==4.5.3
-flake8==2.5.2
+coverage
+nose
+tornado
+flake8
 tqdm
-networkx==2.1
-click==6.7
-
+networkx
+click

tests/test_batchrunner.py

@@ -162,5 +162,6 @@ def test_model_with_variable_and_fixed_kwargs(self):
         self.assertEqual(model_vars['reported_fixed_param'].iloc[0],
                 self.fixed_params['fixed_name'])
 
+
 if __name__ == '__main__':
     unittest.main()

tests/test_datacollector.py

@@ -129,5 +129,6 @@ def test_exports(self):
         with self.assertRaises(Exception):
             table_df = data_collector.get_table_dataframe("not a real table")
 
+
 if __name__ == '__main__':
     unittest.main()

tests/test_grid.py

@@ -438,5 +438,6 @@ def test_neighbors(self):
         neighborhood = self.grid.get_neighborhood((2, 4))
         assert len(neighborhood) == 6
 
+
 if __name__ == '__main__':
     unittest.main()

tests/test_space.py

@@ -412,5 +412,6 @@ def test_get_all_cell_contents(self):
                                                       self.agents[1],
                                                       self.agents[2]]
 
+
 if __name__ == '__main__':
     unittest.main()