Move datafiles

Author: lloesche

resotodata/__main__.py

@@ -232,17 +232,17 @@ def write_ccfdataset() -> None:
 def write_instances() -> None:
     instances = get_instances()
 
-    instances_file = resource_filename("resotodata", "data/instances.json")
-    print(f"Writing instances dataset to {instances_file}")
-    with open(instances_file, "w") as f:
+    ec2instancesdataset_file = resource_filename("resotodata", "data/ec2instancesdataset.json")
+    print(f"Writing instances dataset to {ec2instancesdataset_file}")
+    with open(ec2instancesdataset_file, "w") as f:
         json.dump(instances, f, indent=4)
         f.write("\n")
 
     strip_instances(instances)
 
-    stripped_instances_file = resource_filename("resotodata", "data/stripped_instances.json")
-    print(f"Writing instances dataset to {stripped_instances_file}")
-    with open(stripped_instances_file, "w") as f:
+    instances_file = resource_filename("resotodata", "data/instances.json")
+    print(f"Writing instances dataset to {instances_file}")
+    with open(instances_file, "w") as f:
         json.dump(instances, f, indent=4)
         f.write("\n")
 

resotodata/cloud.py

@@ -2,5 +2,5 @@
 
 
 regions = LazyLoadedDict("regions.json")
+ec2instancesdataset = LazyLoadedDict("ec2instancesdataset.json")
 instances = LazyLoadedDict("instances.json")
-stripped_instances = LazyLoadedDict("stripped_instances.json")