meteocatpy 0.0.11 → 0.0.13

package/pyproject.toml

@@ -1,72 +1,72 @@
-[tool.poetry]
-name = "meteocatpy"
-version = "0.0.11"
-description = "Script para obtener datos meteorológicos de la API de Meteocat"
-authors = ["figorr <jdcuartero@yahoo.es>"]
-license = "Apache-2.0"
-readme = "README.md"
-repository = "https://gitlab.com/figorr/meteocatpy"
-keywords = ['meteocatpy', 'meteocat']
-
-
-[tool.poetry.dependencies]
-python = ">=3.12,<3.14"
-requests = "^2.32.3"
-python-dotenv = "^1.0.1"
-simplejson = "^3.19.3"
-setuptools = "^75.5.0"
-python-semantic-release = "^7.28.1"
-twine = ">=3,<4"
-aiofiles = "^24.1.0"
-voluptuous = "^0.15.2"
-geopy = "^2.4.1"
-tzdata = "^2024.2"
-aiohttp = ">=3.10.11,<4.0.0"
-diskcache = "^5.6.3"
-semantic-release = "^0.1.0"
-
-
-[tool.semantic_release]
-branch = "master"  # Define la rama desde la que se harán los lanzamientos
-version_source = "commit"  # Determina la versión basada en los commits
-version_variable = "meteocatpy/version.py:__version__"  # Ubicación de la variable de versión
-changelog = { file = "CHANGELOG.md" }  # Genera el changelog en el archivo especificado
-upload_to_pypi = false  # Sube automáticamente la versión a PyPI
-ci = false  # Cambiar a false si no usas CI/CD
-
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-
-[tool.poetry.dev-dependencies]
-aresponses = "*"
-detox = "*"
-flake8 = "*"
-mypy = "*"
-pydocstyle = "*"
-pylint = "*"
-pytest-aiohttp = "*"
-pytest-cov = "*"
-python-semantic-release = "^7.28.1"
-tox = "*"
-safety = ">=1.8.7"
-black = { version = ">19.10b0", allow-prereleases = true }
-Sphinx = ">=3.5.0,<7.0.0"
-autoapi = ">=2.0.1"
-sphinx-rtd-theme = "^0.5.1"
-m2r2 = ">=0.2.7"
-tomlkit = ">=0.7.0"
-sphinx-autoapi = ">=1.7.0"
-sphinx-copybutton = ">=0.3.1"
-pipdeptree = "^2.2.1"
-
-
-[tool.poetry.group.dev.dependencies]
-pyupgrade = "^3.4.0"
-pre-commit = "^3.3.1"
-pytest = "^8.3.3"
-pytest-asyncio = "^0.24.0"
-syrupy = "^4.7.2"
-aioresponses = "^0.7.7"
+[tool.poetry]
+name = "meteocatpy"
+version = "0.0.13"
+description = "Script para obtener datos meteorológicos de la API de Meteocat"
+authors = ["figorr <jdcuartero@yahoo.es>"]
+license = "Apache-2.0"
+readme = "README.md"
+repository = "https://gitlab.com/figorr/meteocatpy"
+keywords = ['meteocatpy', 'meteocat']
+
+
+[tool.poetry.dependencies]
+python = ">=3.12,<3.14"
+requests = "^2.32.3"
+python-dotenv = "^1.0.1"
+simplejson = "^3.19.3"
+setuptools = "^75.5.0"
+python-semantic-release = "^7.28.1"
+twine = ">=3,<4"
+aiofiles = "^24.1.0"
+voluptuous = "^0.15.2"
+geopy = "^2.4.1"
+tzdata = "^2024.2"
+aiohttp = ">=3.10.11,<4.0.0"
+diskcache = "^5.6.3"
+semantic-release = "^0.1.0"
+
+
+[tool.semantic_release]
+branch = "master"  # Define la rama desde la que se harán los lanzamientos
+version_source = "commit"  # Determina la versión basada en los commits
+version_variable = "meteocatpy/version.py:__version__"  # Ubicación de la variable de versión
+changelog = { file = "CHANGELOG.md" }  # Genera el changelog en el archivo especificado
+upload_to_pypi = false  # Sube automáticamente la versión a PyPI
+ci = false  # Cambiar a false si no usas CI/CD
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+
+[tool.poetry.dev-dependencies]
+aresponses = "*"
+detox = "*"
+flake8 = "*"
+mypy = "*"
+pydocstyle = "*"
+pylint = "*"
+pytest-aiohttp = "*"
+pytest-cov = "*"
+python-semantic-release = "^7.28.1"
+tox = "*"
+safety = ">=1.8.7"
+black = { version = ">19.10b0", allow-prereleases = true }
+Sphinx = ">=3.5.0,<7.0.0"
+autoapi = ">=2.0.1"
+sphinx-rtd-theme = "^0.5.1"
+m2r2 = ">=0.2.7"
+tomlkit = ">=0.7.0"
+sphinx-autoapi = ">=1.7.0"
+sphinx-copybutton = ">=0.3.1"
+pipdeptree = "^2.2.1"
+
+
+[tool.poetry.group.dev.dependencies]
+pyupgrade = "^3.4.0"
+pre-commit = "^3.3.1"
+pytest = "^8.3.3"
+pytest-asyncio = "^0.24.0"
+syrupy = "^4.7.2"
+aioresponses = "^0.7.7"

package/releaserc.json

@@ -1,18 +1,18 @@
-{
-    "branches": ["master"],
-    "plugins": [
-      "@semantic-release/commit-analyzer",
-      "@semantic-release/release-notes-generator",
-      "@semantic-release/changelog",
-      [
-        "@semantic-release/exec",
-        {
-          "prepareCmd": "python setup.py sdist bdist_wheel",
-          "publishCmd": "twine upload dist/* -u ${PYPI_USERNAME} -p ${PYPI_PASSWORD}"
-        }
-      ],
-      "@semantic-release/github",
-      "@semantic-release/git"
-    ]
-  }
+{
+    "branches": ["master"],
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/changelog",
+      [
+        "@semantic-release/exec",
+        {
+          "prepareCmd": "python setup.py sdist bdist_wheel",
+          "publishCmd": "twine upload dist/* -u ${PYPI_USERNAME} -p ${PYPI_PASSWORD}"
+        }
+      ],
+      "@semantic-release/github",
+      "@semantic-release/git"
+    ]
+  }
   

package/requirements.test.txt

@@ -1,3 +1,3 @@
-pytest
-pytest-cov
-pytest-homeassistant-custom-component
+pytest
+pytest-cov
+pytest-homeassistant-custom-component

package/setup.cfg

@@ -1,64 +1,64 @@
-[coverage:run]
-source =
-  meteocatpy
-
-[coverage:report]
-exclude_lines =
-    pragma: no cover
-    raise NotImplemented()
-    if __name__ == '__main__':
-    main()
-show_missing = true
-
-[tool:pytest]
-testpaths = tests
-norecursedirs = .git
-asyncio_mode = auto
-addopts =
-    -p syrupy
-    --strict
-    --cov=meteocatpy
-
-[flake8]
-# https://github.com/ambv/black#line-length
-max-line-length = 88
-# E501: line too long
-# W503: Line break occurred before a binary operator
-# E203: Whitespace before ':'
-# D202 No blank lines allowed after function docstring
-# W504 line break after binary operator
-ignore =
-    E501,
-    W503,
-    E203,
-    D202,
-    W504
-
-[isort]
-# https://github.com/timothycrosley/isort
-# https://github.com/timothycrosley/isort/wiki/isort-Settings
-# splits long import on multiple lines indented by 4 spaces
-multi_line_output = 3
-include_trailing_comma=True
-force_grid_wrap=0
-use_parentheses=True
-line_length=88
-indent = "    "
-# by default isort don't check module indexes
-not_skip = __init__.py
-# will group `import x` and `from x import` of the same module.
-force_sort_within_sections = true
-sections = FUTURE,STDLIB,INBETWEENS,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
-default_section = THIRDPARTY
-known_first_party = custom_components,tests
-forced_separate = tests
-combine_as_imports = true
-
-[mypy]
-python_version = 3.7
-ignore_errors = true
-follow_imports = silent
-ignore_missing_imports = true
-warn_incomplete_stub = true
-warn_redundant_casts = true
-warn_unused_configs = true
+[coverage:run]
+source =
+  meteocatpy
+
+[coverage:report]
+exclude_lines =
+    pragma: no cover
+    raise NotImplemented()
+    if __name__ == '__main__':
+    main()
+show_missing = true
+
+[tool:pytest]
+testpaths = tests
+norecursedirs = .git
+asyncio_mode = auto
+addopts =
+    -p syrupy
+    --strict
+    --cov=meteocatpy
+
+[flake8]
+# https://github.com/ambv/black#line-length
+max-line-length = 88
+# E501: line too long
+# W503: Line break occurred before a binary operator
+# E203: Whitespace before ':'
+# D202 No blank lines allowed after function docstring
+# W504 line break after binary operator
+ignore =
+    E501,
+    W503,
+    E203,
+    D202,
+    W504
+
+[isort]
+# https://github.com/timothycrosley/isort
+# https://github.com/timothycrosley/isort/wiki/isort-Settings
+# splits long import on multiple lines indented by 4 spaces
+multi_line_output = 3
+include_trailing_comma=True
+force_grid_wrap=0
+use_parentheses=True
+line_length=88
+indent = "    "
+# by default isort don't check module indexes
+not_skip = __init__.py
+# will group `import x` and `from x import` of the same module.
+force_sort_within_sections = true
+sections = FUTURE,STDLIB,INBETWEENS,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+default_section = THIRDPARTY
+known_first_party = custom_components,tests
+forced_separate = tests
+combine_as_imports = true
+
+[mypy]
+python_version = 3.7
+ignore_errors = true
+follow_imports = silent
+ignore_missing_imports = true
+warn_incomplete_stub = true
+warn_redundant_casts = true
+warn_unused_configs = true

package/setup.py

@@ -1,10 +1,10 @@
-from setuptools import setup
-
-# Leer la versión desde el archivo version.py
-with open("meteocatpy/version.py") as f:
-    exec(f.read())  # Ejecuta el archivo version.py para cargar la variable __version__
-
-setup(
-    name="meteocatpy",
-    version=__version__,  # Usa la versión cargada dinámicamente # type: ignore
-)
+from setuptools import setup
+
+# Leer la versión desde el archivo version.py
+with open("meteocatpy/version.py") as f:
+    exec(f.read())  # Ejecuta el archivo version.py para cargar la variable __version__
+
+setup(
+    name="meteocatpy",
+    version=__version__,  # Usa la versión cargada dinámicamente # type: ignore
+)

package/tests/data_test.py

@@ -1,122 +1,122 @@
-import os
-import pytest
-from aioresponses import aioresponses
-from meteocatpy.data import MeteocatStationData
-from meteocatpy.exceptions import (
-    BadRequestError,
-    ForbiddenError,
-    TooManyRequestsError,
-    InternalServerError,
-    UnknownAPIError,
-)
-from meteocatpy.const import BASE_URL, STATION_DATA_URL
-from dotenv import load_dotenv
-
-# Cargar variables desde el archivo .env
-load_dotenv()
-
-# Obtener los valores del archivo .env
-API_KEY = os.getenv("METEOCAT_API_KEY")
-STATION_CODI_TEST = os.getenv("STATION_CODI_TEST")
-
-# Asegúrate de que las variables estén definidas
-assert API_KEY, "API Key is required"
-assert STATION_CODI_TEST, "Station codi test is required"
-
-@pytest.mark.asyncio
-async def test_get_station_data():
-    # Simular la respuesta de la API
-    test_url = f"{BASE_URL}{STATION_DATA_URL}".format(
-        codiEstacio=STATION_CODI_TEST, any=2024, mes="12", dia="04"
-    )
-    mock_response = {
-        "lectures": [
-            {"codi_variable": 32, "data": "2024-12-04T12:00:00Z", "valor": 15.2},
-            {"codi_variable": 33, "data": "2024-12-04T12:00:00Z", "valor": 80},
-        ]
-    }
-
-    with aioresponses() as mock:
-        mock.get(test_url, payload=mock_response)
-
-        station_data = MeteocatStationData(API_KEY)
-        result = await station_data.get_station_data(STATION_CODI_TEST)
-
-        assert result == mock_response
-
-
-@pytest.mark.asyncio
-async def test_get_station_data_with_variables(mocker):
-    # Simular la respuesta de la API y las variables
-    test_url = f"{BASE_URL}{STATION_DATA_URL}".format(
-        codiEstacio=STATION_CODI_TEST, any=2024, mes="12", dia="04"
-    )
-    mock_station_response = {
-        "lectures": [
-            {"codi_variable": 32, "data": "2024-12-04T12:00:00Z", "valor": 15.2},
-            {"codi_variable": 33, "data": "2024-12-04T12:00:00Z", "valor": 80},
-        ]
-    }
-    mock_variables_response = [
-        {"codi": 32, "nom": "Temperatura"},
-        {"codi": 33, "nom": "Humedad relativa"},
-    ]
-
-    # Mockear la llamada a la API y las variables
-    with aioresponses() as mock:
-        mock.get(test_url, payload=mock_station_response)
-        mocker.patch(
-            "meteocatpy.data.MeteocatVariables.get_variables",
-            return_value=mock_variables_response,
-        )
-
-        station_data = MeteocatStationData(API_KEY)
-        result = await station_data.get_station_data_with_variables(STATION_CODI_TEST)
-
-        # Validar los datos organizados por variables
-        expected_result = {
-            "Temperatura": [
-                {
-                    "data": "2024-12-04T12:00:00Z",
-                    "valor": 15.2,
-                    "estat": "",
-                    "base_horaria": "",
-                }
-            ],
-            "Humedad relativa": [
-                {
-                    "data": "2024-12-04T12:00:00Z",
-                    "valor": 80,
-                    "estat": "",
-                    "base_horaria": "",
-                }
-            ],
-        }
-        assert result == expected_result
-
-
-@pytest.mark.asyncio
-async def test_get_station_data_errors():
-    test_url = f"{BASE_URL}{STATION_DATA_URL}".format(
-        codiEstacio=STATION_CODI_TEST, any=2024, mes="12", dia="04"
-    )
-
-    # Simular errores de la API
-    with aioresponses() as mock:
-        mock.get(test_url, status=400, payload={"message": "Bad Request"})
-        station_data = MeteocatStationData(API_KEY)
-
-        with pytest.raises(BadRequestError):
-            await station_data.get_station_data(STATION_CODI_TEST)
-
-        mock.get(test_url, status=403, payload={"message": "Forbidden"})
-        with pytest.raises(ForbiddenError):
-            await station_data.get_station_data(STATION_CODI_TEST)
-
-        mock.get(test_url, status=429, payload={"message": "Too Many Requests"})
-        with pytest.raises(TooManyRequestsError):
-            await station_data.get_station_data(STATION_CODI_TEST)
-
-        mock.get(test_url, status=500, payload={"message": "Internal Server Error"})
-        with pytest.raises(InternalServerError):
-            await station_data.get_station_data(STATION_CODI_TEST)
+import os
+import pytest
+from aioresponses import aioresponses
+from meteocatpy.data import MeteocatStationData
+from meteocatpy.exceptions import (
+    BadRequestError,
+    ForbiddenError,
+    TooManyRequestsError,
+    InternalServerError,
+    UnknownAPIError,
+)
+from meteocatpy.const import BASE_URL, STATION_DATA_URL
+from dotenv import load_dotenv
+
+# Cargar variables desde el archivo .env
+load_dotenv()
+
+# Obtener los valores del archivo .env
+API_KEY = os.getenv("METEOCAT_API_KEY")
+STATION_CODI_TEST = os.getenv("STATION_CODI_TEST")
+
+# Asegúrate de que las variables estén definidas
+assert API_KEY, "API Key is required"
+assert STATION_CODI_TEST, "Station codi test is required"
+
+@pytest.mark.asyncio
+async def test_get_station_data():
+    # Simular la respuesta de la API
+    test_url = f"{BASE_URL}{STATION_DATA_URL}".format(
+        codiEstacio=STATION_CODI_TEST, any=2024, mes="12", dia="04"
+    )
+    mock_response = {
+        "lectures": [
+            {"codi_variable": 32, "data": "2024-12-04T12:00:00Z", "valor": 15.2},
+            {"codi_variable": 33, "data": "2024-12-04T12:00:00Z", "valor": 80},
+        ]
+    }
+
+    with aioresponses() as mock:
+        mock.get(test_url, payload=mock_response)
+
+        station_data = MeteocatStationData(API_KEY)
+        result = await station_data.get_station_data(STATION_CODI_TEST)
+
+        assert result == mock_response
+
+
+@pytest.mark.asyncio
+async def test_get_station_data_with_variables(mocker):
+    # Simular la respuesta de la API y las variables
+    test_url = f"{BASE_URL}{STATION_DATA_URL}".format(
+        codiEstacio=STATION_CODI_TEST, any=2024, mes="12", dia="04"
+    )
+    mock_station_response = {
+        "lectures": [
+            {"codi_variable": 32, "data": "2024-12-04T12:00:00Z", "valor": 15.2},
+            {"codi_variable": 33, "data": "2024-12-04T12:00:00Z", "valor": 80},
+        ]
+    }
+    mock_variables_response = [
+        {"codi": 32, "nom": "Temperatura"},
+        {"codi": 33, "nom": "Humedad relativa"},
+    ]
+
+    # Mockear la llamada a la API y las variables
+    with aioresponses() as mock:
+        mock.get(test_url, payload=mock_station_response)
+        mocker.patch(
+            "meteocatpy.data.MeteocatVariables.get_variables",
+            return_value=mock_variables_response,
+        )
+
+        station_data = MeteocatStationData(API_KEY)
+        result = await station_data.get_station_data_with_variables(STATION_CODI_TEST)
+
+        # Validar los datos organizados por variables
+        expected_result = {
+            "Temperatura": [
+                {
+                    "data": "2024-12-04T12:00:00Z",
+                    "valor": 15.2,
+                    "estat": "",
+                    "base_horaria": "",
+                }
+            ],
+            "Humedad relativa": [
+                {
+                    "data": "2024-12-04T12:00:00Z",
+                    "valor": 80,
+                    "estat": "",
+                    "base_horaria": "",
+                }
+            ],
+        }
+        assert result == expected_result
+
+
+@pytest.mark.asyncio
+async def test_get_station_data_errors():
+    test_url = f"{BASE_URL}{STATION_DATA_URL}".format(
+        codiEstacio=STATION_CODI_TEST, any=2024, mes="12", dia="04"
+    )
+
+    # Simular errores de la API
+    with aioresponses() as mock:
+        mock.get(test_url, status=400, payload={"message": "Bad Request"})
+        station_data = MeteocatStationData(API_KEY)
+
+        with pytest.raises(BadRequestError):
+            await station_data.get_station_data(STATION_CODI_TEST)
+
+        mock.get(test_url, status=403, payload={"message": "Forbidden"})
+        with pytest.raises(ForbiddenError):
+            await station_data.get_station_data(STATION_CODI_TEST)
+
+        mock.get(test_url, status=429, payload={"message": "Too Many Requests"})
+        with pytest.raises(TooManyRequestsError):
+            await station_data.get_station_data(STATION_CODI_TEST)
+
+        mock.get(test_url, status=500, payload={"message": "Internal Server Error"})
+        with pytest.raises(InternalServerError):
+            await station_data.get_station_data(STATION_CODI_TEST)

package/tests/import_test.py

@@ -1,18 +1,18 @@
-def test_imports():
-    from meteocatpy import (
-        MeteocatTown,
-        MeteocatForecast,
-        MeteocatSymbols,
-        MeteocatStations,
-        MeteocatTownStations,
-        MeteocatStationData,
-        MeteocatVariables,
-    )
-
-    assert MeteocatTown is not None
-    assert MeteocatForecast is not None
-    assert MeteocatSymbols is not None
-    assert MeteocatStations is not None
-    assert MeteocatTownStations is not None
-    assert MeteocatStationData is not None
-    assert MeteocatVariables is not None
+def test_imports():
+    from meteocatpy import (
+        MeteocatTown,
+        MeteocatForecast,
+        MeteocatSymbols,
+        MeteocatStations,
+        MeteocatTownStations,
+        MeteocatStationData,
+        MeteocatVariables,
+    )
+
+    assert MeteocatTown is not None
+    assert MeteocatForecast is not None
+    assert MeteocatSymbols is not None
+    assert MeteocatStations is not None
+    assert MeteocatTownStations is not None
+    assert MeteocatStationData is not None
+    assert MeteocatVariables is not None