From 8ecca7d3acf6787b110ee5e58ae6598b28956a97 Mon Sep 17 00:00:00 2001 From: Dan Nowacki Date: Tue, 21 Mar 2023 15:10:19 -0700 Subject: [PATCH 1/2] update standard names URL --- compliance_checker/cf/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compliance_checker/cf/util.py b/compliance_checker/cf/util.py index 627bfe4e..6a55b6f2 100644 --- a/compliance_checker/cf/util.py +++ b/compliance_checker/cf/util.py @@ -430,7 +430,7 @@ def download_cf_standard_name_table(version, location=None): ) if version == "latest": - tables_tree = lxml.html.parse("http://cfconventions.org/documents.html") + tables_tree = lxml.html.parse("http://cfconventions.org/vocabularies.html") end_str = "cf-standard-name-table.xml" xpath_expr = ( "//a[substring(@href, string-length(@href) - " From 26626c7d6045c530a4b1b2e379ab16fd10e87a53 Mon Sep 17 00:00:00 2001 From: Dan Nowacki Date: Tue, 21 Mar 2023 15:26:53 -0700 Subject: [PATCH 2/2] simplify latest URL --- compliance_checker/cf/util.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/compliance_checker/cf/util.py b/compliance_checker/cf/util.py index 6a55b6f2..713280d1 100644 --- a/compliance_checker/cf/util.py +++ b/compliance_checker/cf/util.py @@ -7,7 +7,6 @@ from pkgutil import get_data from urllib.parse import urljoin -import lxml.html import requests from cf_units import Unit from lxml import etree @@ -430,16 +429,7 @@ def download_cf_standard_name_table(version, location=None): ) if version == "latest": - tables_tree = lxml.html.parse("http://cfconventions.org/vocabularies.html") - end_str = "cf-standard-name-table.xml" - xpath_expr = ( - "//a[substring(@href, string-length(@href) - " - "string-length('{0}') +1) " - " = '{0}'][1]".format(end_str) - ) - latest_vers = tables_tree.xpath(xpath_expr)[0] - - url = urljoin("http://cfconventions.org", latest_vers.attrib["href"]) + url = "http://cfconventions.org/Data/cf-standard-names/current/src/cf-standard-name-table.xml" else: url = "http://cfconventions.org/Data/cf-standard-names/{0}/src/cf-standard-name-table.xml".format( version