Upgrade nsapi to 2.7.4

Also enable the related test that were failing for 2.7.3
bartromgens · Feb 27, 2016 · 005d8d5 · 005d8d5
1 parent 9ba8897
commit 005d8d5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,4 @@ xmltodict==0.9.2
 numpy==1.10.4
 matplotlib==1.5.1
 scipy==0.17.0
--e git+https://github.com/bartromgens/ns-api3@python3-compatibility#egg=ns-api
+nsapi==2.7.4
diff --git a/test.py b/test.py
@@ -26,22 +26,22 @@ def test_get_station_info(self):
         stations = self.nsapi.get_stations()
         self.assertEqual(len(stations), 620)
 
-    # def test_trip_stop_without(self):
-    #     """ Tests https://github.com/aquatix/ns-api/issues/14 """
-    #     timestamp = "04-02-2016 08:00"
-    #     start = "Rotterdam Blaak"
-    #     via = ""
-    #     destination = "Amsterdam Centraal"
-    #     trips = self.nsapi.get_trips(timestamp, start, via, destination)
-    #
-    # def test_no_trips_found(self):
-    #     """ Tests https://github.com/aquatix/ns-api/issues/12 """
-    #     timestamp = "12-01-2016 08:00"
-    #     start = "Utrecht Centraal"
-    #     via = ""
-    #     destination = "Amsterdam Van der Madeweg"
-    #     trips = self.nsapi.get_trips(timestamp, start, via, destination)
-    #     self.assertEqual(trips, None)
+    def test_trip_stop_without(self):
+        """ Tests https://github.com/aquatix/ns-api/issues/14 """
+        timestamp = "04-02-2016 08:00"
+        start = "Rotterdam Blaak"
+        via = ""
+        destination = "Amsterdam Centraal"
+        trips = self.nsapi.get_trips(timestamp, start, via, destination)
+
+    def test_no_trips_found(self):
+        """ Tests https://github.com/aquatix/ns-api/issues/12 """
+        timestamp = "12-01-2016 08:00"
+        start = "Utrecht Centraal"
+        via = ""
+        destination = "Amsterdam Van der Madeweg"
+        trips = self.nsapi.get_trips(timestamp, start, via, destination)
+        self.assertEqual(trips, None)
 
 
 class TestStationData(unittest.TestCase):