Python 3 (#24)

Python 3 compatibility and more tests

Author: jacobtomlinson

.travis.yml

@@ -3,14 +3,17 @@ sudo: false
 python:
 - '2.6'
 - '2.7'
+- '3.3'
+- '3.4'
+- '3.5'
 env:
 - secure: PEOM40L5TK78GFQyt2I2PgOFf8QYGcP0YZmgMhacuKnCI0Lr3wztXucWtxeVpXeuDDe12d349FumQrg6ard8T69ZZYe25eJ5lR9ZMyVOzFJ9Ew3XhoEgWBgKFRNjEkhFU+/reYWRBkYHyFImLe9d8wq1I2UMQ6z2189PLKfBtIg=
 install:
 - pip install .
 - pip install -r requirements.txt
 script:
 - nosetests -w tests/unit
-- nosetests -w tests/integration
+- if [[ "$API_KEY" != "" ]]; then nosetests -w tests/integration; fi
 deploy:
   provider: pypi
   user: jacob.tomlinson

datapoint/Manager.py

@@ -4,6 +4,7 @@
 
 from datetime import datetime
 from datetime import timedelta
+import sys
 from time import time
 import pytz
 
@@ -15,8 +16,12 @@
 from .Timestep import Timestep
 from .Element import Element
 
+if (sys.version_info > (3, 0)):
+    long = int
+
 API_URL = "http://datapoint.metoffice.gov.uk/public/data/val/wxfcs/all/json"
 DATE_FORMAT = "%Y-%m-%dZ"
+DATA_DATE_FORMAT = "%Y-%m-%dT%XZ"
 FORECAST_DATE_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 ELEMENTS = {
     "Day":
@@ -201,7 +206,8 @@ def get_forecast_for_site(self, site_id, frequency="daily"):
         params = data['SiteRep']['Wx']['Param']
 
         forecast = Forecast()
-        forecast.data_date = datetime.strptime(data['SiteRep']['DV']['dataDate'], FORECAST_DATE_FORMAT).replace(tzinfo=pytz.UTC)
+        forecast.data_date = data['SiteRep']['DV']['dataDate']
+        forecast.data_date = datetime.strptime(data['SiteRep']['DV']['dataDate'], DATA_DATE_FORMAT).replace(tzinfo=pytz.UTC)
         forecast.continent = data['SiteRep']['DV']['Location']['continent']
         forecast.country = data['SiteRep']['DV']['Location']['country']
         forecast.name = data['SiteRep']['DV']['Location']['name']

setup.py

@@ -65,5 +65,6 @@
           'Development Status :: 3 - Alpha',
           'Programming Language :: Python :: 2.6',
           'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3.4',
       ]
      )

tests/integration/manager_test.py

@@ -1,3 +1,4 @@
+import datetime
 import os
 from types import *
 from nose.tools import *
@@ -13,3 +14,91 @@ def test_site(self):
         site = self.manager.get_nearest_site(-0.124626, 51.500728)
         assert site.name == 'London'
 
+    def test_get_all_sites(self):
+        sites = self.manager.get_all_sites()
+        assert isinstance(sites, list)
+        assert sites
+
+    def test_get_daily_forecast(self):
+        site = self.manager.get_nearest_site(-0.124626, 51.500728)
+        forecast = self.manager.get_forecast_for_site(site.id, 'daily')
+        assert isinstance(forecast, datapoint.Forecast.Forecast)
+        assert forecast.continent.upper() == 'EUROPE'
+        assert forecast.country.upper() == 'ENGLAND'
+        assert forecast.name.upper() == 'LONDON'
+        assert abs(float(forecast.longitude) - (-0.124626)) < 0.1
+        assert abs(float(forecast.latitude) - 51.500728) < 0.1
+        # Forecast should have been made within last 3 hours
+        tz = forecast.data_date.tzinfo
+        assert (forecast.data_date
+            - datetime.datetime.now(tz=tz) < datetime.timedelta(hours=3))
+        # First forecast should be less than 12 hours away
+        tz = forecast.days[0].timesteps[0].date.tzinfo
+        assert (forecast.days[0].timesteps[0].date -
+            datetime.datetime.now(tz=tz) < datetime.timedelta(hours=12))
+        for day in forecast.days:
+            for timestep in day.timesteps:
+                assert timestep.name in ['Day', 'Night']
+                assert self.manager._weather_to_text(
+                    int(timestep.weather.value)) == timestep.weather.text
+                assert -100 < timestep.temperature.value < 100
+                assert timestep.temperature.units == 'C'
+                assert -100 < timestep.feels_like_temperature.value < 100
+                assert timestep.feels_like_temperature.units == 'C'
+                assert 0 <= timestep.wind_speed.value < 300
+                assert timestep.wind_speed.units == 'mph'
+                for char in timestep.wind_direction.value:
+                    assert char in ['N', 'E', 'S', 'W']
+                assert timestep.wind_direction.units == 'compass'
+                assert 0 <= timestep.wind_gust.value < 300
+                assert timestep.wind_gust.units == 'mph'
+                assert (timestep.visibility.value in
+                    ['UN', 'VP', 'PO', 'MO', 'GO', 'VG', 'EX'])
+                assert 0 <= timestep.precipitation.value <= 100
+                assert timestep.precipitation.units == '%'
+                assert 0 <= timestep.humidity.value <= 100
+                assert timestep.humidity.units == '%'
+                if hasattr(timestep.uv, 'value'):
+                    assert 0 < int(timestep.uv.value) < 20
+
+    def test_get_3hour_forecast(self):
+        site = self.manager.get_nearest_site(-0.124626, 51.500728)
+        forecast = self.manager.get_forecast_for_site(site.id, '3hourly')
+        assert isinstance(forecast, datapoint.Forecast.Forecast)
+        assert forecast.continent.upper() == 'EUROPE'
+        assert forecast.country.upper() == 'ENGLAND'
+        assert forecast.name.upper() == 'LONDON'
+        assert abs(float(forecast.longitude) - (-0.124626)) < 0.1
+        assert abs(float(forecast.latitude) - 51.500728) < 0.1
+        # Forecast should have been made within last 3 hours
+        tz = forecast.data_date.tzinfo
+        assert (forecast.data_date
+            - datetime.datetime.now(tz=tz) < datetime.timedelta(hours=3))
+        # First forecast should be less than 12 hours away
+        tz = forecast.days[0].timesteps[0].date.tzinfo
+        assert (forecast.days[0].timesteps[0].date -
+            datetime.datetime.now(tz=tz) < datetime.timedelta(hours=3))
+        for day in forecast.days:
+            for timestep in day.timesteps:
+                assert isinstance(timestep.name, int)
+                assert self.manager._weather_to_text(
+                    int(timestep.weather.value)) == timestep.weather.text
+                assert -100 < timestep.temperature.value < 100
+                assert timestep.temperature.units == 'C'
+                assert -100 < timestep.feels_like_temperature.value < 100
+                assert timestep.feels_like_temperature.units == 'C'
+                assert 0 <= timestep.wind_speed.value < 300
+                assert timestep.wind_speed.units == 'mph'
+                for char in timestep.wind_direction.value:
+                    assert char in ['N', 'E', 'S', 'W']
+                assert timestep.wind_direction.units == 'compass'
+                assert 0 <= timestep.wind_gust.value < 300
+                assert timestep.wind_gust.units == 'mph'
+                assert (timestep.visibility.value in
+                    ['UN', 'VP', 'PO', 'MO', 'GO', 'VG', 'EX'])
+                assert 0 <= timestep.precipitation.value <= 100
+                assert timestep.precipitation.units == '%'
+                assert 0 <= timestep.humidity.value <= 100
+                assert timestep.humidity.units == '%'
+                if hasattr(timestep.uv, 'value'):
+                    assert 0 <= int(timestep.uv.value) < 20

tests/unit/manager_test.py

@@ -10,7 +10,7 @@ def __init__(self):
 
     def test_weather_to_text_is_string(self):
         weather_text = self.manager._weather_to_text(0)
-        assert type(weather_text) is StringType
+        assert isinstance(weather_text, type(""))
 
     @raises(ValueError)
     def test_weather_to_text_invalid_input_None(self):