[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

repo2docker/contentproviders/dataverse.py

@@ -106,7 +106,7 @@ def get_persistent_id_from_url(self, url: str) -> str:
                 )
             return data["items"][0]["dataset_persistent_id"]
         elif parsed_url.path.startswith("/file.xhtml"):
-            file_persistent_id = qs['persistentId'][0]
+            file_persistent_id = qs["persistentId"][0]
             dataset_persistent_id = file_persistent_id.rsplit("/", 1)[0]
             if file_persistent_id == dataset_persistent_id:
                 # We can't figure this one out, throw an error
@@ -155,7 +155,6 @@ def fetch(self, spec, output_dir, yield_output=False):
             copytree(os.path.join(output_dir, d), output_dir)
             shutil.rmtree(os.path.join(output_dir, d))
 
-
         # Save persistent id
         self.persitent_id = persistent_id
 

tests/contentproviders/test_dataverse.py

@@ -10,19 +10,50 @@
 harvard_dv = next(_ for _ in test_dv.hosts if _["name"] == "Harvard Dataverse")
 cimmyt_dv = next(_ for _ in test_dv.hosts if _["name"] == "CIMMYT Research Data")
 
+
 @pytest.mark.parametrize(
     ("doi", "resolved"),
     [
-        ("doi:10.7910/DVN/6ZXAGT/3YRRYJ", {"host": harvard_dv, "url": "https://dataverse.harvard.edu/file.xhtml?persistentId=doi:10.7910/DVN/6ZXAGT/3YRRYJ"}),
-        ("10.7910/DVN/6ZXAGT/3YRRYJ", {"host": harvard_dv, "url": "https://dataverse.harvard.edu/file.xhtml?persistentId=doi:10.7910/DVN/6ZXAGT/3YRRYJ"}),
-        ("10.7910/DVN/TJCLKP", {"host": harvard_dv, "url": "https://dataverse.harvard.edu/citation?persistentId=doi:10.7910/DVN/TJCLKP"}),
-        ("https://dataverse.harvard.edu/api/access/datafile/3323458", {"host": harvard_dv, "url": "https://dataverse.harvard.edu/api/access/datafile/3323458"}),
-        ("https://data.cimmyt.org/dataset.xhtml?persistentId=hdl:11529/10016", {"host": cimmyt_dv, "url": "https://data.cimmyt.org/dataset.xhtml?persistentId=hdl:11529/10016"}),
+        (
+            "doi:10.7910/DVN/6ZXAGT/3YRRYJ",
+            {
+                "host": harvard_dv,
+                "url": "https://dataverse.harvard.edu/file.xhtml?persistentId=doi:10.7910/DVN/6ZXAGT/3YRRYJ",
+            },
+        ),
+        (
+            "10.7910/DVN/6ZXAGT/3YRRYJ",
+            {
+                "host": harvard_dv,
+                "url": "https://dataverse.harvard.edu/file.xhtml?persistentId=doi:10.7910/DVN/6ZXAGT/3YRRYJ",
+            },
+        ),
+        (
+            "10.7910/DVN/TJCLKP",
+            {
+                "host": harvard_dv,
+                "url": "https://dataverse.harvard.edu/citation?persistentId=doi:10.7910/DVN/TJCLKP",
+            },
+        ),
+        (
+            "https://dataverse.harvard.edu/api/access/datafile/3323458",
+            {
+                "host": harvard_dv,
+                "url": "https://dataverse.harvard.edu/api/access/datafile/3323458",
+            },
+        ),
+        (
+            "https://data.cimmyt.org/dataset.xhtml?persistentId=hdl:11529/10016",
+            {
+                "host": cimmyt_dv,
+                "url": "https://data.cimmyt.org/dataset.xhtml?persistentId=hdl:11529/10016",
+            },
+        ),
         ("/some/random/string", None),
         ("https://example.com/path/here", None),
         # Non dataverse DOIs
-        ("https://doi.org/10.21105/joss.01277", None)
-    ]
+        ("https://doi.org/10.21105/joss.01277", None),
+    ],
 )
 def test_detect(doi, resolved):
     assert Dataverse().detect(doi) == resolved
@@ -31,15 +62,28 @@ def test_detect(doi, resolved):
 @pytest.mark.parametrize(
     ("url", "persistent_id"),
     [
-        ("https://dataverse.harvard.edu/file.xhtml?persistentId=doi:10.7910/DVN/6ZXAGT/3YRRYJ", "doi:10.7910/DVN/6ZXAGT"),
-        ("https://dataverse.harvard.edu/citation?persistentId=doi:10.7910/DVN/TJCLKP", "doi:10.7910/DVN/TJCLKP"),
-        ("https://dataverse.harvard.edu/api/access/datafile/3323458", "doi:10.7910/DVN/3MJ7IR"),
-        ("https://data.cimmyt.org/dataset.xhtml?persistentId=hdl:11529/10016", "hdl:11529/10016"),
-    ]
+        (
+            "https://dataverse.harvard.edu/file.xhtml?persistentId=doi:10.7910/DVN/6ZXAGT/3YRRYJ",
+            "doi:10.7910/DVN/6ZXAGT",
+        ),
+        (
+            "https://dataverse.harvard.edu/citation?persistentId=doi:10.7910/DVN/TJCLKP",
+            "doi:10.7910/DVN/TJCLKP",
+        ),
+        (
+            "https://dataverse.harvard.edu/api/access/datafile/3323458",
+            "doi:10.7910/DVN/3MJ7IR",
+        ),
+        (
+            "https://data.cimmyt.org/dataset.xhtml?persistentId=hdl:11529/10016",
+            "hdl:11529/10016",
+        ),
+    ],
 )
 def test_get_persistent_id(url, persistent_id):
     assert Dataverse().get_persistent_id_from_url(url) == persistent_id
 
+
 def test_dataverse_fetch():
 
     dv = Dataverse()
@@ -55,13 +99,13 @@ def test_dataverse_fetch():
 
         # Verify sha256sum of three files
         expected_sha = {
-            'data/primary/primary-data.zip': '880f99a1e1d54a2553be61301f92e06b29236785b8d4d1b7ad0b4595d9d7512b',
-            'data/2023-01-03.tsv': 'cc9759e8e6bc076dd7c1a8eb53a7ea3d38e8697fa9f544d15768db308516cc5f',
-            'code/language.py': '1ffb3b3cdc9de01279779f3fc88824672c8ec3ab1c41ecdd5c1b59a9b0202215'
+            "data/primary/primary-data.zip": "880f99a1e1d54a2553be61301f92e06b29236785b8d4d1b7ad0b4595d9d7512b",
+            "data/2023-01-03.tsv": "cc9759e8e6bc076dd7c1a8eb53a7ea3d38e8697fa9f544d15768db308516cc5f",
+            "code/language.py": "1ffb3b3cdc9de01279779f3fc88824672c8ec3ab1c41ecdd5c1b59a9b0202215",
         }
 
         for subpath, expected_sha in expected_sha.items():
-            with open(os.path.join(d, subpath), 'rb') as f:
+            with open(os.path.join(d, subpath), "rb") as f:
                 h = hashlib.sha256()
                 h.update(f.read())
-                assert h.hexdigest() == expected_sha
+                assert h.hexdigest() == expected_sha