Merge pull request #1043 from akhmerov/patch-1

yuvipanda · web-flow · commit f07111c4a582 · 2021-07-06T19:40:00.000+05:30
always unpack a single zenodo zip
diff --git a/repo2docker/contentproviders/zenodo.py b/repo2docker/contentproviders/zenodo.py
@@ -63,12 +63,11 @@ def fetch(self, spec, output_dir, yield_output=False):
 
         record = resp.json()
 
-        is_software = deep_get(record, host["type"]).lower() == "software"
         files = deep_get(record, host["filepath"])
         only_one_file = len(files) == 1
         for file_ref in files:
             for line in self.fetch_file(
-                file_ref, host, output_dir, is_software and only_one_file
+                file_ref, host, output_dir, unzip=only_one_file
             ):
                 yield line
 
diff --git a/tests/unit/contentproviders/test_zenodo.py b/tests/unit/contentproviders/test_zenodo.py
@@ -99,7 +99,7 @@ def test_fetch_software_from_github_archive(requests_mock):
                     "links": {"download": "file://{}".format(zen_path)},
                 }
             ],
-            "metadata": {"upload_type": "software"},
+            "metadata": {"upload_type": "other"},
         }
         requests_mock.get("https://zenodo.org/api/records/1234", json=mock_response)
         requests_mock.get(

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ def test_fetch_software_from_github_archive(requests_mock):`
`99`	`99`	`"links": {"download": "file://{}".format(zen_path)},`
`100`	`100`	`}`
`101`	`101`	`],`
`102`		`- "metadata": {"upload_type": "software"},`
	`102`	`+ "metadata": {"upload_type": "other"},`
`103`	`103`	`}`
`104`	`104`	`requests_mock.get("https://zenodo.org/api/records/1234", json=mock_response)`
`105`	`105`	`requests_mock.get(`