diff --git a/pyproject.toml b/pyproject.toml index 52d666b..f3ee2c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "open-irceline" -version = "0.0.3" +version = "0.0.7" description = "Get IRCEL - CELINE air quality data" readme = "README.md" authors = [{ name = "Jules Dejaeghere", email = "curable.grass491@mailer.me" }] @@ -27,7 +27,7 @@ requires-python = ">=3.11" Homepage = "https://github.com/jdejaegh/python-irceline" [tool.bumpver] -current_version = "0.0.3" +current_version = "0.0.7" version_pattern = "MAJOR.MINOR.PATCH" commit_message = "bump version {old_version} -> {new_version}" tag_message = "{new_version}" diff --git a/src/open_irceline/__init__.py b/src/open_irceline/__init__.py index 2eb2b4f..9608ecb 100644 --- a/src/open_irceline/__init__.py +++ b/src/open_irceline/__init__.py @@ -1,14 +1,5 @@ -from pyproj import Transformer as _Transformer - -from .data import RioFeature, ForecastFeature, FeatureValue, BelAqiIndex -from .api import IrcelineRioClient, IrcelineForecastClient +from .api import IrcelineRioClient, IrcelineForecastClient, IrcelineApiError from .belaqi import belaqi_index, belaqi_index_actual, belaqi_index_forecast +from .data import RioFeature, ForecastFeature, FeatureValue, BelAqiIndex -__version__ = '0.0.3' - -_project_transform = _Transformer.from_crs('EPSG:4326', 'EPSG:31370', always_xy=False) -_rio_wfs_base_url = 'https://geo.irceline.be/wfs' -# noinspection HttpUrlsUsage -# There is not HTTPS version of this endpoint -_forecast_base_url = 'http://ftp.irceline.be/forecast' -_user_agent = 'github.com/jdejaegh/python-irceline' +__version__ = '0.0.7' diff --git a/src/open_irceline/api.py b/src/open_irceline/api.py index f78b7f2..56ac603 100644 --- a/src/open_irceline/api.py +++ b/src/open_irceline/api.py @@ -12,10 +12,14 @@ import aiohttp import async_timeout from aiohttp import ClientResponse -from . import _rio_wfs_base_url, _user_agent, _forecast_base_url from .data import RioFeature, FeatureValue, ForecastFeature, IrcelineFeature from .utils import SizedDict, epsg_transform, round_coordinates +_rio_wfs_base_url = 'https://geo.irceline.be/wfs' +# noinspection HttpUrlsUsage +# There is not HTTPS version of this endpoint +_forecast_base_url = 'http://ftp.irceline.be/forecast' +_user_agent = 'github.com/jdejaegh/python-irceline' class IrcelineApiError(Exception): """Exception to indicate an API error.""" diff --git a/src/open_irceline/belaqi.py b/src/open_irceline/belaqi.py index 82b52c6..369e1e4 100644 --- a/src/open_irceline/belaqi.py +++ b/src/open_irceline/belaqi.py @@ -9,8 +9,8 @@ https://www.irceline.be/en/air-quality/measurements/belaqi-air-quality-index/inf from datetime import datetime, date from typing import Tuple, Dict -from src.open_irceline.api import IrcelineRioClient, IrcelineForecastClient -from src.open_irceline.data import BelAqiIndex, RioFeature, ForecastFeature +from .api import IrcelineRioClient, IrcelineForecastClient +from .data import BelAqiIndex, RioFeature, ForecastFeature def belaqi_index(pm10: float, pm25: float, o3: float, no2: float) -> BelAqiIndex: diff --git a/src/open_irceline/utils.py b/src/open_irceline/utils.py index 4c60a7e..65b573a 100644 --- a/src/open_irceline/utils.py +++ b/src/open_irceline/utils.py @@ -1,7 +1,9 @@ from collections import OrderedDict from typing import Tuple -from src.open_irceline import _project_transform +from pyproj import Transformer + +_project_transform = Transformer.from_crs('EPSG:4326', 'EPSG:31370', always_xy=False) class SizedDict(OrderedDict): diff --git a/tests/test_api_forecasts.py b/tests/test_api_forecasts.py index 10c5a16..b4cf079 100644 --- a/tests/test_api_forecasts.py +++ b/tests/test_api_forecasts.py @@ -1,7 +1,7 @@ from datetime import date from unittest.mock import call -from src.open_irceline import _forecast_base_url, _user_agent +from src.open_irceline.api import _forecast_base_url, _user_agent from src.open_irceline.api import IrcelineForecastClient from src.open_irceline.data import ForecastFeature from tests.conftest import get_api_data, get_mock_session_many_csv diff --git a/tests/test_api_rio.py b/tests/test_api_rio.py index cd782bb..409857b 100644 --- a/tests/test_api_rio.py +++ b/tests/test_api_rio.py @@ -2,8 +2,8 @@ from datetime import datetime, date from freezegun import freeze_time -from src.open_irceline import _rio_wfs_base_url, _user_agent from src.open_irceline.api import IrcelineRioClient +from src.open_irceline.api import _rio_wfs_base_url, _user_agent from src.open_irceline.data import RioFeature, FeatureValue from src.open_irceline.utils import epsg_transform from tests.conftest import get_api_data, get_mock_session