From 1585ad629c11781a54aecfa7e787aad3c03f0d05 Mon Sep 17 00:00:00 2001 From: Xinwei Hu Date: Mon, 11 Sep 2023 10:12:27 +0800 Subject: [PATCH 1/3] update the url of upstream metacpan api --- advisors/yaml2url.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advisors/yaml2url.py b/advisors/yaml2url.py index 7dd16fff..1cda9b8f 100755 --- a/advisors/yaml2url.py +++ b/advisors/yaml2url.py @@ -75,7 +75,7 @@ def __get_metacpan_url(pkg_info): """ Get metacpan repo url of package """ - url = urljoin("https://metacpan.org/release/", pkg_info["src_repo"]) + url = urljoin("https://fastapi.metacpan.org/v1/release/", pkg_info["src_repo"]) return url -- Gitee From 0856c6b7a25bd58a575f3a01ab97cf3fb9edfc7a Mon Sep 17 00:00:00 2001 From: Xinwei Hu Date: Mon, 11 Sep 2023 10:50:34 +0800 Subject: [PATCH 2/3] fix test cases as well --- tests/test_yaml2url.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_yaml2url.py b/tests/test_yaml2url.py index ac43c210..09c4fd77 100644 --- a/tests/test_yaml2url.py +++ b/tests/test_yaml2url.py @@ -106,7 +106,7 @@ def test_get_metacpan_url(): pkg_info = yaml.load(doc, Loader=yaml.Loader) url = yaml2url.yaml2url(pkg_info) - assert url == "https://metacpan.org/release/File-Which" + assert url == "https://fastapi.metacpan.org/v1/release/File-Which" def test_get_rubygem_url(): -- Gitee From ae9a37d98125edafd30aaa2b6789484d4f28cb68 Mon Sep 17 00:00:00 2001 From: Xinwei Hu Date: Mon, 11 Sep 2023 11:29:50 +0800 Subject: [PATCH 3/3] fix version check --- advisors/check_upstream.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/advisors/check_upstream.py b/advisors/check_upstream.py index 3aeabea8..aa8e18bf 100755 --- a/advisors/check_upstream.py +++ b/advisors/check_upstream.py @@ -223,6 +223,8 @@ def check_metacpan(info, clean_tag=True): return "" resp = resp.text + + """ tags = [] tag_list = resp.splitlines() condition = "value=\"/release" @@ -241,9 +243,25 @@ def check_metacpan(info, clean_tag=True): if not tags: eprint("{repo} found unsorted on cpan.metacpan.org".format(repo=info["src_repo"])) return "" + result_list = [tag['tag'] for tag in sort_tags] + """ last_query = {"time_stamp": datetime.now(), "raw_data": resp} info["last_query"] = last_query + + tags = [] + tag = None + tags_json = json.loads(resp) + if "version" in tags_json: + tag = tags_json["version"] + elif "version" in tags.json["metadata"]: + tag = tags_json["metadata"]["version"] + elif "version_numified" in tags_json: + tag = str(tags_json["version_numified"]) + if tag: + tag = tag.lstrip('0').rstrip('0') + tags.append(tag) + if clean_tag: tags = clean_tags(tags, info) return tags -- Gitee