Fix travis build

.travis.yml

@@ -18,11 +18,9 @@ before_script:
   - flake8 tests ogn_test
   - psql -U postgres -c 'CREATE DATABASE ogn_test;'
   - psql -U postgres -c 'CREATE EXTENSION postgis;'
-  - psql -U postgres -d ogn_test
 
 script:
   - nosetests --with-coverage --cover-package=ogn
-
   - pip install . --upgrade
   - python -c 'import ogn'
 

ogn/collect/database.py

@@ -249,4 +249,4 @@ def update_country_code():
 
     app.session.commit()
 
-    return "Updated country_code for {} Receivers".format(counter)
+    return "Updated country_code for {} Receivers".format(counter)

ogn/collect/logbook.py

@@ -1,6 +1,6 @@
 from celery.utils.log import get_task_logger
 
-from sqlalchemy import and_, or_, insert, update, between, exists
+from sqlalchemy import and_, or_, insert, update, exists
 from sqlalchemy.sql import func, null
 from sqlalchemy.sql.expression import true, false
 

ogn/collect/stats.py

@@ -1,10 +1,10 @@
 from celery.utils.log import get_task_logger
 
 from sqlalchemy import insert, distinct
-from sqlalchemy.sql import null, and_, or_, func, not_
+from sqlalchemy.sql import null, and_, func
 from sqlalchemy.sql.expression import literal_column
 
-from ogn.model import AircraftBeacon, ReceiverBeacon, Device, Receiver, DeviceStats, ReceiverStats
+from ogn.model import AircraftBeacon, DeviceStats, ReceiverStats
 
 from .celery import app
 

ogn/collect/takeoff_landing.py

@@ -5,7 +5,6 @@ from celery.utils.log import get_task_logger
 from sqlalchemy import and_, or_, insert, between, exists
 from sqlalchemy.sql import func, null
 from sqlalchemy.sql.expression import case
-from sqlalchemy.orm import aliased
 
 from ogn.collect.celery import app
 from ogn.model import AircraftBeacon, TakeoffLanding, Airport

ogn/model/device_stats.py

@@ -1,6 +1,4 @@
-from geoalchemy2.shape import to_shape
-from geoalchemy2.types import Geometry
-from sqlalchemy import Column, String, Integer, Date, Float, ForeignKey
+from sqlalchemy import Column, Integer, Date, Float, ForeignKey
 from sqlalchemy.orm import relationship
 
 from .base import Base

ogn/model/receiver_stats.py

@@ -1,6 +1,4 @@
-from geoalchemy2.shape import to_shape
-from geoalchemy2.types import Geometry
-from sqlalchemy import Column, String, Integer, Date, Float, ForeignKey
+from sqlalchemy import Column, Integer, Date, Float, ForeignKey
 from sqlalchemy.orm import relationship
 
 from .base import Base

tests/gateway/test_manage.py

@@ -1,23 +0,0 @@
-import unittest
-import unittest.mock as mock
-
-from ogn.gateway.manage import run
-# from ogn.gateway.manage import import_logfile
-
-
-class GatewayManagerTest(unittest.TestCase):
-    # try simple user interrupt
-    @mock.patch('ogn.gateway.manage.AprsClient')
-    def test_run_user_interruption(self, mock_aprs_client):
-        instance = mock_aprs_client.return_value
-        instance.run.side_effect = KeyboardInterrupt()
-
-        run(aprs_user="testuser")
-
-        instance.connect.assert_called_once_with()
-        self.assertEqual(instance.run.call_count, 1)
-        instance.disconnect.assert_called_once_with()
-
-
-if __name__ == '__main__':
-    unittest.main()