X-Git-Url: https://git.njae.me.uk/?p=covid19.git;a=blobdiff_plain;f=uk_deaths_import.md;h=1d3448643aee4ae3a0c7d5d3c052b109039d7042;hp=baa5ae6647cd89cafbd6388149c1e8920e9cf400;hb=HEAD;hpb=4104f54bfd2a8f5094704f1f78f8abf44dae0534

diff --git a/uk_deaths_import.md b/uk_deaths_import.md
index baa5ae6..1d34486 100644
--- a/uk_deaths_import.md
+++ b/uk_deaths_import.md
@@ -6,7 +6,7 @@ jupyter:
       extension: .md
       format_name: markdown
       format_version: '1.3'
-      jupytext_version: 1.10.2
+      jupytext_version: 1.11.1
   kernelspec:
     display_name: Python 3
     language: python
@@ -57,15 +57,15 @@ engine = create_engine(connection_string)
 ```
 
 ```python Collapsed="false"
-england_wales_filename = 'uk-deaths-data/publishedweek082021.xlsx'
+england_wales_filename = 'uk-deaths-data/publishedweek122021.xlsx'
 ```
 
 ```python Collapsed="false"
-scotland_filename = 'uk-deaths-data/Scottish Government COVID-19 data (10 March 2021).xlsx'
+scotland_filename = 'uk-deaths-data/Scottish Government COVID-19 data (08 April 2021).xlsx'
 ```
 
 ```python
-n_ireland_filename = 'uk-deaths-data/Weekly_Deaths.xlsx'
+n_ireland_filename = 'uk-deaths-data/Weekly_Deaths - w e 2nd April 2021.XLSX'
 ```
 
 ```python Collapsed="false"
@@ -118,7 +118,7 @@ rd = eng_xls.iloc[1:][['Week ended', 'Wales']].reset_index(level=0).rename(
 rd['year'] = 2021
 rd['nation'] = 'Wales'
 rd.dropna(inplace=True)
-rd.head()
+rd.tail()
 ```
 
 ```python
@@ -183,7 +183,7 @@ rd.to_sql(
 ```python
 ni_xls = pd.read_excel(n_ireland_filename, 
                         sheet_name='Table 1',
-                        skiprows=[0, 1, 2, 3],
+                        skiprows=[0, 1, 2],
                         header=0,
                       ).rename(
     columns={'Week Ending (Friday)': 'date_up_to', 'Total Number of Deaths Registered in Week (2021P)': 'deaths',
@@ -191,7 +191,7 @@ ni_xls = pd.read_excel(n_ireland_filename,
 rd = ni_xls[ni_xls['deaths'].notna()][['week', 'date_up_to', 'deaths']]
 rd['year'] = 2021
 rd['nation'] = 'Northern Ireland'
-rd
+rd.tail()
 ```
 
 ```python
@@ -213,7 +213,7 @@ rd.to_sql(
 ```
 
 ```python
-%sql select nation from all_causes_deaths group by nation
+%sql select nation, count(*) from all_causes_deaths group by nation
 ```
 
 ```python