[tz] Modify conandata.yml scheme to conform to CCI standards

conan-io · Jan 13, 2024 · b52af15 · b52af15
1 parent 3cafb14
commit b52af15
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/recipes/tz/all/conandata.yml b/recipes/tz/all/conandata.yml
@@ -1,6 +1,8 @@
 sources:
   "2023c":
-    url: "https://github.com/eggert/tz/archive/refs/tags/2023c.tar.gz"
-    sha256: "9aa20ef838183e58f09acca92098cf6aa6d8e229aecf24e098c3af2a38e596f8"
-    windows_zones_url: "https://raw.githubusercontent.com/unicode-org/cldr/fd8ca965e03ca3cf07a0487678e0a1e002646ec0/common/supplemental/windowsZones.xml"
-    windows_zones_sha256: "e5720d0d82a0a62687184bf0d9472f3cf0f7ef8b930ad40f3ae7386d8cb57213"
+    "sources":
+      url: "https://github.com/eggert/tz/archive/refs/tags/2023c.tar.gz"
+      sha256: "9aa20ef838183e58f09acca92098cf6aa6d8e229aecf24e098c3af2a38e596f8"
+    "windows_zones":
+      url: "https://raw.githubusercontent.com/unicode-org/cldr/fd8ca965e03ca3cf07a0487678e0a1e002646ec0/common/supplemental/windowsZones.xml"
+      sha256: "e5720d0d82a0a62687184bf0d9472f3cf0f7ef8b930ad40f3ae7386d8cb57213"
diff --git a/recipes/tz/all/conanfile.py b/recipes/tz/all/conanfile.py
@@ -44,18 +44,8 @@ def build_requirements(self):
                     self.tool_requires("msys2/cci.latest")
 
     def source(self):
-        get(
-            self,
-            url=self.conan_data["sources"][self.version]["url"],
-            sha256=self.conan_data["sources"][self.version]["sha256"],
-            strip_root=True
-        )
-        download(
-            self,
-            url=self.conan_data["sources"][self.version]["windows_zones_url"],
-            filename="windowsZones.xml",
-            sha256=self.conan_data["sources"][self.version]["windows_zones_sha256"],
-        )
+        get(self, **self.conan_data["sources"][self.version]["sources"], strip_root=True)
+        download(self, **self.conan_data["sources"][self.version]["windows_zones"], filename="windowsZones.xml")
 
     def generate(self):
         tc = AutotoolsToolchain(self)