Merge branch 'master' of fhm-chicas-code.lancs.ac.uk:jewell/covid19uk

covid/data/case_data.py

@@ -53,7 +53,7 @@ class CasesData:
                 print("Attempting to download...", end="", flush=True)
                 response = requests.get(url)
                 content = json.loads(response.content)
-                df = pd.read_json(json.dumps(content["body"]))
+                df = pd.DataFrame.from_dict(content["body"])
                 print("Success", flush=True)
                 return df
             except (requests.ConnectionError, requests.RequestException) as e:

covid/tasks/inference.py

@@ -355,9 +355,7 @@ if __name__ == "__main__":
     parser.add_argument(
         "-o", "--output", type=str, help="Output file", required=True
     )
-    parser.add_argument(
-        "data_file", type=str, help="Data pickle file", required=True
-    )
+    parser.add_argument("data_file", type=str, help="Data NetCDF file")
     args = parser.parse_args()
 
     with open(args.config, "r") as f: