Skip to content

Commit f9e3d70

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent b854b77 commit f9e3d70

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

repo2docker/contentproviders/dataverse.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def parse_dataverse_url(self, url: str) -> Tuple[str, bool]:
9999
100100
Raises a ValueError if we can not parse the url
101101
"""
102-
parsed_url= urlparse(url)
102+
parsed_url = urlparse(url)
103103
path = parsed_url.path
104104
qs = parse_qs(parsed_url.query)
105105
base_url = f"{parsed_url.scheme}://{parsed_url.netloc}"
@@ -157,10 +157,10 @@ def get_datafiles(self, url: str) -> List[dict]:
157157
resp = self._request(dataset_api_url, headers={"accept": "application/json"})
158158
if resp.status_code == 404 and is_ambiguous:
159159
# It's possible this is a *file* persistent_id, not a dataset one
160-
persistent_id = self.get_dataset_id_from_file_id(
161-
base_url, persistent_id
160+
persistent_id = self.get_dataset_id_from_file_id(base_url, persistent_id)
161+
dataset_api_url = (
162+
f"{base_url}/api/datasets/:persistentId?persistentId={persistent_id}"
162163
)
163-
dataset_api_url = f"{base_url}/api/datasets/:persistentId?persistentId={persistent_id}"
164164
resp = self._request(
165165
dataset_api_url, headers={"accept": "application/json"}
166166
)
@@ -181,7 +181,7 @@ def fetch(self, spec, output_dir, yield_output=False):
181181
url = spec
182182
parsed_url = urlparse(url)
183183
# FIXME: Support determining API URL better
184-
base_url = f'{parsed_url.scheme}://{parsed_url.netloc}'
184+
base_url = f"{parsed_url.scheme}://{parsed_url.netloc}"
185185

186186
yield f"Fetching Dataverse record {url}.\n"
187187

tests/contentproviders/test_dataverse.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from repo2docker.contentproviders import Dataverse
88

9+
910
@pytest.mark.parametrize(
1011
("doi", "resolved"),
1112
[
@@ -45,22 +46,22 @@ def test_detect(doi, resolved):
4546
(
4647
"https://dataverse.harvard.edu/file.xhtml?persistentId=doi:10.7910/DVN/6ZXAGT/3YRRYJ",
4748
"doi:10.7910/DVN/6ZXAGT",
48-
False
49+
False,
4950
),
5051
(
5152
"https://dataverse.harvard.edu/citation?persistentId=doi:10.7910/DVN/TJCLKP",
5253
"doi:10.7910/DVN/TJCLKP",
53-
True
54+
True,
5455
),
5556
(
5657
"https://dataverse.harvard.edu/api/access/datafile/3323458",
5758
"doi:10.7910/DVN/3MJ7IR",
58-
False
59+
False,
5960
),
6061
(
6162
"https://data.cimmyt.org/dataset.xhtml?persistentId=hdl:11529/10016",
6263
"hdl:11529/10016",
63-
False
64+
False,
6465
),
6566
],
6667
)

0 commit comments

Comments
 (0)