erddapy 3.2.0__tar.gz → 3.2.1__tar.gz

{erddapy-3.2.0 → erddapy-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: erddapy
-Version: 3.2.0
+Version: 3.2.1
 Summary: Python interface for ERDDAP
 Maintainer-email: Alex Kerney <akerney@gmri.org>, Callum Rollo <c.rollo@outlook.com>, Filipe Fernandes <ocefpaf+erddapy@gmail.com>
 License: Copyright 2017 Filipe Fernandes

{erddapy-3.2.0 → erddapy-3.2.1}/erddapy/core/url.py

@@ -74,9 +74,9 @@ def _urlopen(url: str, auth: tuple | None = None, **kwargs: dict) -> BinaryIO:
     )
     try:
         response.raise_for_status()
-    except requests.HTTPError as err:
+    except requests.exceptions.HTTPError as err:
         msg = str(response.content.decode())
-        raise requests.HTTPError(msg) from err
+        raise requests.exceptions.HTTPError(msg) from err
     return io.BytesIO(response.content)
 
 
@@ -157,7 +157,11 @@ def _multi_urlopen(url: str) -> BinaryIO:
     """Simpler url open to work with multiprocessing."""
     try:
         data = urlopen(url, requests_kwargs={"timeout": 120})
-    except (requests.HTTPError, requests.ConnectionError):
+    except (
+        requests.exceptions.HTTPError,
+        requests.exceptions.ConnectionError,
+        requests.exceptions.ReadTimeout,
+    ):
         return None
     return data
 

{erddapy-3.2.0 → erddapy-3.2.1}/erddapy/servers/erddaps.json

@@ -65,13 +65,7 @@
 		"url": "https://erddap.sensors.ioos.us/erddap/",
 		"public": true
 	},
-    {
-		"name": "NOAA IOOS CeNCOOS (Central and Northern California Ocean Observing System)",
-		"short_name": "CeNCOOS",
-		"url": "https://erddap.axiomdatascience.com/erddap/",
-		"public": true
-	},
-	  {
+	{
 		"name": "CeNCOOS (Central and Northern California Ocean Observing System) ERDDAP",
 		"short_name": "CeNCOOS ERDDAP",
 		"url": "http://erddap.cencoos.org/erddap/",
@@ -80,7 +74,7 @@
     {
 		"name": "NOAA IOOS NERACOOS (Northeastern Regional Association of Coastal and Ocean Observing Systems)",
 		"short_name": "NERACOOS",
-		"url": "http://www.neracoos.org/erddap/",
+		"url": "https://data.neracoos.org/erddap/",
 		"public": true
 	},
     {
@@ -119,6 +113,12 @@
 		"url": "http://dap.onc.uvic.ca/erddap/",
 		"public": true
 	},
+	{
+		"name": "OTN (Ocean Tracking Network)",
+		"short_name": "OTN",
+		"url": "http://erddap.oceantrack.org/erddap/",
+		"public": true
+	},
     {
 		"name": "",
 		"short_name": "PIFSC",
@@ -137,12 +137,6 @@
 		"url": "https://erddap-goldcopy.dataexplorer.oceanobservatories.org/erddap/",
 		"public": true
 	},
-    {
-		"name": "Ocean Tracking Network",
-		"short_name": "OTN",
-		"url": "https://members.oceantrack.org/erddap/",
-		"public": true
-	},
     {
 		"name": "Regional Ocean Modelling System",
 		"short_name": "MYROMS",
@@ -182,7 +176,7 @@
     {
 		"name": "NOAA CoastWatch Great Lakes Node",
 		"short_name": "GLERL",
-		"url": "https://coastwatch.glerl.noaa.gov/erddap/",
+		"url": "https://apps.glerl.noaa.gov/erddap/",
 		"public": true
 	},
     {
@@ -209,12 +203,6 @@
 		"url": "https://upwell.pfeg.noaa.gov/erddap/",
 		"public": true
 	},
-	{
-		"name": "Marine Domain Awareness (MDA) - Italy",
-		"short_name": "MDA",
-		"url": "https://bluehub.jrc.ec.europa.eu/erddap/",
-		"public": true
-	},
 	{
 		"name": "French Research Institute for the Exploitation of the Sea",
 		"short_name": "IFREMER",
@@ -224,7 +212,7 @@
 	{
 		"name": "NOAA PMEL (Pacific Marine Environmental Laboratory)",
 		"short_name": "PMEL",
-		"url": "https://ferret.pmel.noaa.gov/pmel/erddap",
+		"url": "https://data.pmel.noaa.gov/pmel/erddap/",
 		"public": true
 	},
 	{
@@ -245,24 +233,12 @@
 		"url": "https://catalogue.hakai.org/erddap/",
 		"public": true
 	},
-	{
-		"name": "NANOOS (Northwest Association of Networked Ocean Observing Systems)",
-		"short_name": "NANOOS",
-		"url": "https://wilson.coas.oregonstate.edu/erddap/",
-		"public": true
-	},
 	{
 		"name": "NOAA Polar Watch",
 		"short_name": "POLARWATCH",
 		"url": "https://polarwatch.noaa.gov/erddap/",
 		"public": true
 	},
-	{
-		"name": "NCI (National Computational Infrastructure",
-		"short_name": "NCI",
-		"url": "http://nrm-erddap.nci.org.au/erddap/",
-		"public": true
-	},
 	{
 		"name": "USGS Coastal and Marine Geology Program",
 		"short_name": "USGS",
@@ -275,12 +251,6 @@
 		"url": "https://erddap.incois.gov.in/erddap/",
 		"public": true
 	},
-	{
-		"name": "ICHEC (Irish Centre for High-End Computing",
-		"short_name": "ICHEC",
-		"url": "https://erddap.ichec.ie/erddap/",
-		"public": true
-	},
 	{
 		"name": "Smart Atlantic",
 		"short_name": "SmartAtlantic",
@@ -305,12 +275,6 @@
 		"url": "https://pub-data.diver.orr.noaa.gov/erddap/",
 		"public": true
 	},
-	{
-		"name": "JEODPP ERDDAP server",
-		"short_name": "JEOPP",
-		"url": "https://jeodpp.jrc.ec.europa.eu/services/erddap/",
-		"public": true
-	},
 	{
 		"name": "GCOOS Atmospheric and Oceanographic: Observing System",
 		"short_name": "GCOOS",
@@ -338,13 +302,7 @@
 	{
 		"name": "European Multidisciplinary Seafloor and water column Observatory (EMSO)",
 		"short_name": "EMSO ERIC",
-		"url": "http://erddap.emso.eu:8080/erddap/",
-		"public": true
-	},
-	{
-		"name": "Southern Ocean Carbon and Heat Imact on Climate (SO-CHIC)",
-		"short_name": "SO-CHIC",
-		"url": "http://erddap.sochic-h2020.eu/erddap/",
+		"url": "http://erddap.emso.eu/erddap/",
 		"public": true
 	},
 	{
@@ -356,13 +314,13 @@
 	{
 		"name": "The Canadian Watershed Information Network at the University of Manitoba",
 		"short_name": "CanWIN",
-		"url": "https://canwinerddap.ad.umanitoba.ca/erddap/index.html",
+		"url": "https://canwinerddap.ad.umanitoba.ca/erddap/",
 		"public": true
 	},
 	{
 		"name": "NOAA Oceanview",
 		"short_name": "NOAA Oceanview",
-		"url": "https://oceanview.pfeg.noaa.gov/erddap/index.html",
+		"url": "https://oceanview.pfeg.noaa.gov/erddap/",
 		"public": true
 	},
 	{
@@ -374,7 +332,19 @@
 	{
 		"name": "Linked Systems @ the British Oceanographic Data Centre, National Oceanography Centre, UK",
 		"short_name": "NOC-BODC Linked Systems",
-		"url": "https://linkedsystems.uk/erddap",
+		"url": "https://linkedsystems.uk/erddap/",
+		"public": true
+	},
+	{
+		"name": "Bio-Oracle Erddap Server",
+		"short_name": "Bio-Oracle",
+		"url": "https://erddap.bio-oracle.org/erddap/",
+		"public": true
+	},
+	{
+		"name": "Commercial Fisheries Research Foundation",
+		"short_name": "CFRF",
+		"url": "https://erddap.ondeckdata.com/erddap/",
 		"public": true
 	}
 ]