Merge pull request #1348 from lldelisle/patch-1

fix orcid regex for dockstore_init
galaxyproject · Jan 26, 2023 · 9d9471f · 9d9471f
2 parents 6747e88 + 6cde259
commit 9d9471f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/planemo/workflow_lint.py b/planemo/workflow_lint.py
@@ -92,12 +92,14 @@ def generate_dockstore_yaml(directory: str, publish: bool = True) -> str:
                         continue
                     if field == "identifier":
                         # Check if it is an orcid:
-                        orcid = re.findall(r"(?:\d{4}-){3}\d{3}", value)
+                        orcid = re.findall(r"(?:\d{4}-){3}\d{4}", value)
                         if len(orcid) > 0:
                             # Check the orcid is valid
                             if (
                                 requests.get(
-                                    f"https://orcid.org/{orcid[0]}", headers={"Accept": "application/xml"}
+                                    f"https://orcid.org/{orcid[0]}",
+                                    headers={"Accept": "application/xml"},
+                                    allow_redirects=False,
                                 ).status_code
                                 == 200
                             ):

diff --git a/tests/test_cmd_dockstore_init.py b/tests/test_cmd_dockstore_init.py
@@ -47,5 +47,6 @@ def run_dockstore_init_with_creator(self):
             assert "workflows" in dockstore_config
             assert len(dockstore_config["workflows"]) == 1
             assert "authors" in dockstore_config["workflows"]
+            assert dockstore_config["workflows"]["authors"]["orcid"] == "0000-0002-1964-4960"
             workflow_lint_cmd = ["workflow_lint", "--skip", "tool_ids", "--fail_level", "error", f]
             self._check_exit_code(workflow_lint_cmd)