Merge pull request #115 from pmav99/master

Drop python 3.8 and add python 3.12

.github/workflows/run_tests.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        python: [ '3.8', '3.9', '3.10', '3.11' ]
+        python: [ '3.9', '3.10', '3.11', '3.12' ]
     steps:
       - uses: actions/checkout@main
       - uses: actions/setup-python@main

.gitignore

@@ -107,6 +107,7 @@ celerybeat.pid
 # Environments
 .env
 .venv
+.venv*/
 env/
 venv/
 ENV/

pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.8, <3.12"
+python = ">=3.9, <3.13"
 beautifulsoup4 = "*"
 dataretrieval = ">=1"
 erddapy = "*"
@@ -58,7 +58,7 @@ urllib3 = "<2"   # https://github.com/kevin1024/vcrpy/issues/688
 
 [tool.poetry.group.docs.dependencies]
 dunamai = "*"
-m2r2 = "*"
+m2r2 = ">=0.3.2"
 sphinx = "*"
 furo = "*"
 toml = "*"

requirements/requirements.txt

@@ -1,46 +1,47 @@
-annotated-types==0.5.0 ; python_version >= "3.8" and python_version < "3.12"
-anyio==4.0.0 ; python_version >= "3.8" and python_version < "3.12"
-attrs==23.1.0 ; python_version >= "3.8" and python_version < "3.12"
-beautifulsoup4==4.12.2 ; python_version >= "3.8" and python_version < "3.12"
-certifi==2023.7.22 ; python_version >= "3.8" and python_version < "3.12"
-charset-normalizer==3.2.0 ; python_version >= "3.8" and python_version < "3.12"
-click-plugins==1.1.1 ; python_version >= "3.8" and python_version < "3.12"
-click==8.1.7 ; python_version >= "3.8" and python_version < "3.12"
-cligj==0.7.2 ; python_version >= "3.8" and python_version < "3.12"
-colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and platform_system == "Windows"
-dataretrieval==1.0.6 ; python_version >= "3.8" and python_version < "3.12"
-deprecated==1.2.14 ; python_version >= "3.8" and python_version < "3.12"
-erddapy==2.2.0 ; python_version >= "3.8" and python_version < "3.12"
-exceptiongroup==1.1.3 ; python_version >= "3.8" and python_version < "3.11"
-fiona==1.9.4.post1 ; python_version >= "3.8" and python_version < "3.12"
-geopandas==0.13.2 ; python_version >= "3.8" and python_version < "3.12"
-h11==0.14.0 ; python_version >= "3.8" and python_version < "3.12"
-html5lib==1.1 ; python_version >= "3.8" and python_version < "3.12"
-httpcore==0.18.0 ; python_version >= "3.8" and python_version < "3.12"
-httpx==0.25.0 ; python_version >= "3.8" and python_version < "3.12"
-idna==3.4 ; python_version >= "3.8" and python_version < "3.12"
-importlib-metadata==6.8.0 ; python_version >= "3.8" and python_version < "3.10"
-importlib-resources==6.1.0 ; python_version >= "3.8" and python_version < "3.12"
-limits==3.6.0 ; python_version >= "3.8" and python_version < "3.12"
-lxml==4.9.3 ; python_version >= "3.8" and python_version < "3.12"
-numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.12"
-packaging==23.1 ; python_version >= "3.8" and python_version < "3.12"
-pandas==2.0.3 ; python_version >= "3.8" and python_version < "3.12"
-pydantic-core==2.10.1 ; python_version >= "3.8" and python_version < "3.12"
-pydantic==2.4.2 ; python_version >= "3.8" and python_version < "3.12"
-pyproj==3.5.0 ; python_version >= "3.8" and python_version < "3.12"
-python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.12"
-pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "3.12"
-requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12"
-shapely==2.0.1 ; python_version >= "3.8" and python_version < "3.12"
-six==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
-sniffio==1.3.0 ; python_version >= "3.8" and python_version < "3.12"
-soupsieve==2.5 ; python_version >= "3.8" and python_version < "3.12"
-tqdm==4.66.1 ; python_version >= "3.8" and python_version < "3.12"
-typing-extensions==4.8.0 ; python_version >= "3.8" and python_version < "3.12"
-tzdata==2023.3 ; python_version >= "3.8" and python_version < "3.12"
-urllib3==1.26.16 ; python_version >= "3.8" and python_version < "3.12"
-webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12"
-wrapt==1.15.0 ; python_version >= "3.8" and python_version < "3.12"
-xarray==2023.1.0 ; python_version >= "3.8" and python_version < "3.12"
-zipp==3.17.0 ; python_version >= "3.8" and python_version < "3.10"
+annotated-types==0.6.0 ; python_version >= "3.9" and python_version < "3.13"
+anyio==4.0.0 ; python_version >= "3.9" and python_version < "3.13"
+attrs==23.1.0 ; python_version >= "3.9" and python_version < "3.13"
+beautifulsoup4==4.12.2 ; python_version >= "3.9" and python_version < "3.13"
+certifi==2023.7.22 ; python_version >= "3.9" and python_version < "3.13"
+charset-normalizer==3.3.1 ; python_version >= "3.9" and python_version < "3.13"
+click-plugins==1.1.1 ; python_version >= "3.9" and python_version < "3.13"
+click==8.1.7 ; python_version >= "3.9" and python_version < "3.13"
+cligj==0.7.2 ; python_version >= "3.9" and python_version < "3.13"
+colorama==0.4.6 ; python_version >= "3.9" and python_version < "3.13" and platform_system == "Windows"
+dataretrieval==1.0.6 ; python_version >= "3.9" and python_version < "3.13"
+deprecated==1.2.14 ; python_version >= "3.9" and python_version < "3.13"
+erddapy==2.2.0 ; python_version >= "3.9" and python_version < "3.13"
+exceptiongroup==1.1.3 ; python_version >= "3.9" and python_version < "3.11"
+fiona==1.9.5 ; python_version >= "3.9" and python_version < "3.13"
+geopandas==0.14.0 ; python_version >= "3.9" and python_version < "3.13"
+h11==0.14.0 ; python_version >= "3.9" and python_version < "3.13"
+html5lib==1.1 ; python_version >= "3.9" and python_version < "3.13"
+httpcore==0.18.0 ; python_version >= "3.9" and python_version < "3.13"
+httpx==0.25.0 ; python_version >= "3.9" and python_version < "3.13"
+idna==3.4 ; python_version >= "3.9" and python_version < "3.13"
+importlib-metadata==6.8.0 ; python_version >= "3.9" and python_version < "3.10"
+importlib-resources==6.1.0 ; python_version >= "3.9" and python_version < "3.13"
+limits==3.6.0 ; python_version >= "3.9" and python_version < "3.13"
+lxml==4.9.3 ; python_version >= "3.9" and python_version < "3.13"
+numpy==1.26.1 ; python_version >= "3.9" and python_version < "3.13"
+packaging==23.2 ; python_version >= "3.9" and python_version < "3.13"
+pandas==2.1.2 ; python_version >= "3.9" and python_version < "3.13"
+pydantic-core==2.10.1 ; python_version >= "3.9" and python_version < "3.13"
+pydantic==2.4.2 ; python_version >= "3.9" and python_version < "3.13"
+pyproj==3.6.1 ; python_version >= "3.9" and python_version < "3.13"
+python-dateutil==2.8.2 ; python_version >= "3.9" and python_version < "3.13"
+pytz==2023.3.post1 ; python_version >= "3.9" and python_version < "3.13"
+requests==2.31.0 ; python_version >= "3.9" and python_version < "3.13"
+setuptools==68.2.2 ; python_version >= "3.9" and python_version < "3.13"
+shapely==2.0.2 ; python_version >= "3.9" and python_version < "3.13"
+six==1.16.0 ; python_version >= "3.9" and python_version < "3.13"
+sniffio==1.3.0 ; python_version >= "3.9" and python_version < "3.13"
+soupsieve==2.5 ; python_version >= "3.9" and python_version < "3.13"
+tqdm==4.66.1 ; python_version >= "3.9" and python_version < "3.13"
+typing-extensions==4.8.0 ; python_version >= "3.9" and python_version < "3.13"
+tzdata==2023.3 ; python_version >= "3.9" and python_version < "3.13"
+urllib3==1.26.18 ; python_version >= "3.9" and python_version < "3.13"
+webencodings==0.5.1 ; python_version >= "3.9" and python_version < "3.13"
+wrapt==1.15.0 ; python_version >= "3.9" and python_version < "3.13"
+xarray==2023.10.1 ; python_version >= "3.9" and python_version < "3.13"
+zipp==3.17.0 ; python_version >= "3.9" and python_version < "3.10"

searvey/__init__.py

@@ -5,12 +5,14 @@
 from searvey.ioc import get_ioc_stations
 from searvey.stations import get_stations
 from searvey.stations import Provider
+from searvey.usgs import get_usgs_stations
 
 
 __all__: list[str] = [
     "get_coops_stations",
     "get_ioc_data",
     "get_ioc_stations",
     "get_stations",
+    "get_usgs_stations",
     "Provider",
 ]

searvey/critech.py

@@ -27,7 +27,7 @@
 
 
 EMODNET_CRITECH = ERDDAPDataset(
-    server_url=pydantic.parse_obj_as(pydantic.HttpUrl, "https://erddap.emodnet-physics.eu/erddap"),
+    server_url=pydantic.HttpUrl("https://erddap.emodnet-physics.eu/erddap"),
     dataset_id="TAD_Tsunami_Alert_Device",
     is_longitude_symmetric=True,
 )

searvey/ioc.py

@@ -14,6 +14,7 @@
 from __future__ import annotations
 
 import functools
+import io
 import logging
 import warnings
 from typing import Optional
@@ -144,7 +145,7 @@ def get_ioc_stations_by_output(output: str, skip_table_rows: int) -> pd.DataFram
     table_contents = "\n".join(str(tr) for tr in trs[skip_table_rows:])
     html = f"<table>{table_contents}</table>"
     logger.debug("Created table: %s", url)
-    df = pd.read_html(html)[0]
+    df = pd.read_html(io.StringIO(html))[0]
     logger.debug("Parsed table: %s", url)
     df.columns = IOC_STATIONS_COLUMN_NAMES[output]
     df = df.drop(columns="view")

searvey/uhslc.py

@@ -24,7 +24,7 @@
 }
 
 SOEST_UHSLC = ERDDAPDataset(
-    server_url=pydantic.parse_obj_as(pydantic.HttpUrl, "https://uhslc.soest.hawaii.edu/erddap"),
+    server_url=pydantic.HttpUrl("https://uhslc.soest.hawaii.edu/erddap"),
     dataset_id="global_hourly_fast",
     is_longitude_symmetric=False,
 )