Merged conflicts

Author: jjacobson95

scripts/push_to_figshare.py

@@ -199,7 +199,7 @@ def write_figshare_details_to_yaml(article_id, project_id, title, version):
             data = yaml.safe_load(f)
         data["figshare"] = f"https://api.figshare.com/v2/articles/{article_id}"
         data["version"] = version
-        with open("/tmp/dataset.yml", "w") as f:
+        with open('/tmp/dataset.yml', 'w') as f:
             yaml.safe_dump(data, f, sort_keys=False)       
 
 
@@ -272,4 +272,4 @@ def main():
     upload_to_figshare(args.token, args.title, args.directory, args.project_id, args.publish, args.version, args.article_id)
 
 if __name__ == "__main__":
-    main()
+    main()