Change library name

saaste · Feb 10, 2020 · e132012 · e132012
1 parent 61f7ac6
commit e132012
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 ![Test](https://github.com/saaste/fmi-weather/workflows/tests/badge.svg?branch=master)
 ![Last commit](https://img.shields.io/github/last-commit/saaste/fmi-weather)
+
 # Finnish Meteorological Institute Weather
 Library for fetching weather information from
 [Finnish Meteorological Institute (FMI)](https://en.ilmatieteenlaitos.fi/open-data). 
@@ -17,28 +18,28 @@ Working example can be found in [example.py](example.py).
 
 Weather station depends on FMI service.
 ```python
-import fmi_weather
+import fmi_weather_client
 
-weather = fmi_weather.weather_by_place_name("Mäkkylä, Espoo")
+weather = fmi_weather_client.weather_by_place_name("Mäkkylä, Espoo")
 ```
 
 If place name is not known or weather data is not available, the following exception is thrown:
 ```
-fmi_weather.errors.NoWeatherDataError
+fmi_weather_client.errors.NoWeatherDataError
 ```
 
 ### Get the weather by coordinates
 
 Weather stations is the closest one
 ```python
-import fmi_weather
+import fmi_weather_client
 
-weather = fmi_weather.weather_by_coordinates(63.361604, 27.392607)
+weather = fmi_weather_client.weather_by_coordinates(63.361604, 27.392607)
 ```
 
 If there are no stations within 50 km, the following exception is thrown:
 ```
-fmi_weather.errors.NoWeatherDataError
+fmi_weather_client.errors.NoWeatherDataError
 ```
 
 

diff --git a/example.py b/example.py
@@ -1,4 +1,4 @@
-import fmi_weather
+import fmi_weather_client
 
 
 def print_weather(weather):
@@ -17,8 +17,8 @@ def print_weather(weather):
     print('Cloud coverage: %s' % weather.cloud_coverage)
 
 
-weather = fmi_weather.weather_by_coordinates(67.2463, 23.6659)
-weather2 = fmi_weather.weather_by_place_name("Iisalmi")
+weather = fmi_weather_client.weather_by_coordinates(67.2463, 23.6659)
+weather2 = fmi_weather_client.weather_by_place_name("Iisalmi")
 
 print_weather(weather)
 print('')

diff --git a/fmi_weather/__init__.py → fmi_weather_client/__init__.py b/fmi_weather/__init__.py → fmi_weather_client/__init__.py
@@ -2,7 +2,7 @@
 
 import requests
 
-from fmi_weather import parser
+from fmi_weather_client import parser
 
 _BASE_URL = 'http://opendata.fmi.fi/wfs'
 

diff --git a/fmi_weather/errors.py → fmi_weather_client/errors.py b/fmi_weather/errors.py → fmi_weather_client/errors.py
diff --git a/fmi_weather/models.py → fmi_weather_client/models.py b/fmi_weather/models.py → fmi_weather_client/models.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from typing import Optional
-from fmi_weather import utils
+from fmi_weather_client import utils
 
 
 class WeatherMeasurement:

diff --git a/fmi_weather/parser.py → fmi_weather_client/parser.py b/fmi_weather/parser.py → fmi_weather_client/parser.py
@@ -5,7 +5,7 @@
 
 import xmltodict
 
-from fmi_weather import errors, models, utils
+from fmi_weather_client import errors, models, utils
 
 
 def parse_weather_data(response,

diff --git a/fmi_weather/test/__init__.py → fmi_weather_client/test/__init__.py b/fmi_weather/test/__init__.py → fmi_weather_client/test/__init__.py
diff --git a/fmi_weather/test/test_data/__init__.py → ...weather_client/test/test_data/__init__.py b/fmi_weather/test/test_data/__init__.py → ...weather_client/test/test_data/__init__.py
diff --git a/...weather/test/test_data/empty_response.xml → ..._client/test/test_data/empty_response.xml b/...weather/test/test_data/empty_response.xml → ..._client/test/test_data/empty_response.xml
diff --git a/..._data/exception_no_locations_response.xml → ..._data/exception_no_locations_response.xml b/..._data/exception_no_locations_response.xml → ..._data/exception_no_locations_response.xml
diff --git a/...st/test_data/exception_other_response.xml → ...st/test_data/exception_other_response.xml b/...st/test_data/exception_other_response.xml → ...st/test_data/exception_other_response.xml
diff --git a/...er/test/test_data/valid_bbox_response.xml → ...nt/test/test_data/valid_bbox_response.xml b/...er/test/test_data/valid_bbox_response.xml → ...nt/test/test_data/valid_bbox_response.xml
diff --git a/...r/test/test_data/valid_place_response.xml → ...t/test/test_data/valid_place_response.xml b/...r/test/test_data/valid_place_response.xml → ...t/test/test_data/valid_place_response.xml
diff --git a/fmi_weather/test/test_fmi_weather.py → fmi_weather_client/test/test_fmi_weather.py b/fmi_weather/test/test_fmi_weather.py → fmi_weather_client/test/test_fmi_weather.py
@@ -1,37 +1,37 @@
 import unittest
 from unittest import mock
 
-import fmi_weather
-import fmi_weather.test.test_data as test_data
-from fmi_weather.errors import NoWeatherDataError, ServiceError
+import fmi_weather_client
+import fmi_weather_client.test.test_data as test_data
+from fmi_weather_client.errors import NoWeatherDataError, ServiceError
 
 
 class FMIWeatherTest(unittest.TestCase):
 
     @mock.patch('requests.get', side_effect=test_data.mock_place_response)
     def test_get_weather_by_place(self, mock_get):
-        place_weather = fmi_weather.weather_by_place_name('Espoo, Tapiola')
+        place_weather = fmi_weather_client.weather_by_place_name('Espoo, Tapiola')
         self.assertEqual(place_weather.station_name, 'Espoo Tapiola')
 
     @mock.patch('requests.get', side_effect=test_data.mock_bbox_response)
     def test_get_weather_by_station(self, mock_get):
-        place_weather = fmi_weather.weather_by_coordinates(27.31317, 63.14343)
+        place_weather = fmi_weather_client.weather_by_coordinates(27.31317, 63.14343)
         self.assertEqual(place_weather.station_name, 'Kuopio Maaninka')
 
     @mock.patch('requests.get', side_effect=test_data.mock_empty_response)
     def test_empty_response(self, mock_get):
         with self.assertRaises(NoWeatherDataError):
-            fmi_weather.weather_by_coordinates(27.31317, 63.14343)
+            fmi_weather_client.weather_by_coordinates(27.31317, 63.14343)
 
     @mock.patch('requests.get', side_effect=test_data.mock_no_location_exception_response)
     def test_no_location_exception_response(self, mock_get):
         with self.assertRaises(NoWeatherDataError):
-            fmi_weather.weather_by_coordinates(27.31317, 63.14343)
+            fmi_weather_client.weather_by_coordinates(27.31317, 63.14343)
 
     @mock.patch('requests.get', side_effect=test_data.mock_other_exception_response)
     def test_other_exception_response(self, mock_get):
         with self.assertRaises(ServiceError):
-            fmi_weather.weather_by_coordinates(27.31317, 63.14343)
+            fmi_weather_client.weather_by_coordinates(27.31317, 63.14343)
 
 
 if __name__ == '__main__':

diff --git a/fmi_weather/utils.py → fmi_weather_client/utils.py b/fmi_weather/utils.py → fmi_weather_client/utils.py
diff --git a/setup.py b/setup.py
@@ -4,21 +4,24 @@
     long_description = fh.read()
 
 setuptools.setup(
-    name="fmi_weather",
+    name="fmi-weather-client",
     version="0.0.1",
     author="Mika Hiltunen",
     author_email="saaste@gmail.com",
     description="Library for fetching weather information from Finnish Meteorological Institute (FMI)",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/saaste/fmi-weather",
+    url="https://github.com/saaste/fmi-weather-client",
     packages=setuptools.find_packages(),
     install_requires=[
-        'requests'
+        'requests>=2.22.0',
+        'xmltodict>=0.12.0'
     ],
     classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: GPL License",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
     ],
     python_requires='>=3.6.9',