From cc6048a2857bb9a309f41aa8448a675f4c4baac6 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Tue, 25 Apr 2023 09:09:19 +0100 Subject: [PATCH 1/8] Update pcons.csv Removed "Birmingham, Selly Oak" entry. This is a duplication of another line, but with a second space between , and Selly. --- data/pcons.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/data/pcons.csv b/data/pcons.csv index e0961110..17ba0c37 100644 --- a/data/pcons.csv +++ b/data/pcons.csv @@ -467,7 +467,6 @@ E14000809,"Manchester, Withington",, E14000985,Sutton Coldfield,, E14000777,Leeds Central,, E14000781,Leeds West,, -E14000567,"Birmingham, Selly Oak",,2018-12-01 E14000685,Eastleigh,, E14000886,Pudsey,, E14000779,Leeds North East,, From 715b2bc4190bd5b9b4432a392128a02308e415bc Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Tue, 13 Jun 2023 13:15:26 +0100 Subject: [PATCH 2/8] Updated lookup tables with Cumberland plus Westmorland and Furness --- data/la_lad_hierarchy.csv | 14 ++++++++------ data/lads.csv | 14 ++++++++------ data/las.csv | 2 ++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/data/la_lad_hierarchy.csv b/data/la_lad_hierarchy.csv index 79a5271f..2220966e 100644 --- a/data/la_lad_hierarchy.csv +++ b/data/la_lad_hierarchy.csv @@ -1,6 +1,8 @@ lad_code,lad_name,date_of_introduction,date_of_termination,status,new_la_code,la_name,old_la_code E07000223,Adur,,,live,E10000032,West Sussex,938 -E07000026,Allerdale,,,live,E10000006,Cumbria,909 +E06000063,Cumberland,2023-04-01,,live,E06000063,Cumberland,942 +E06000064,Westmorland and Furness,2023-04-01,,live,E06000064,Westmorland and Furness,943 +E07000026,Allerdale,,2023-03-31,terminated,E10000006,Cumbria,909 E07000032,Amber Valley,,,live,E10000007,Derbyshire,830 E07000224,Arun,,,live,E10000032,West Sussex,938 E07000170,Ashfield,,,live,E10000024,Nottinghamshire,891 @@ -10,7 +12,7 @@ E07000200,Babergh,,,live,E10000029,Suffolk,935 E09000002,Barking and Dagenham,,,live,E09000002,Barking and Dagenham,301 E09000003,Barnet,,,live,E09000003,Barnet,302 E08000016,Barnsley,,,live,E08000016,Barnsley,370 -E07000027,Barrow-in-Furness,,,live,E10000006,Cumbria,909 +E07000027,Barrow-in-Furness,,2023-03-31,terminated,E10000006,Cumbria,909 E07000066,Basildon,,,live,E10000012,Essex,881 E07000084,Basingstoke and Deane,,,live,E10000014,Hampshire,850 E07000171,Bassetlaw,,,live,E10000024,Nottinghamshire,891 @@ -47,7 +49,7 @@ E07000008,Cambridge,,,live,E10000003,Cambridgeshire,873 E09000007,Camden,,,live,E09000007,Camden,202 E07000192,Cannock Chase,,,live,E10000028,Staffordshire,860 E07000106,Canterbury,,,live,E10000016,Kent,886 -E07000028,Carlisle,,,live,E10000006,Cumbria,909 +E07000028,Carlisle,,2023-03-31,terminated,E10000006,Cumbria,909 E07000069,Castle Point,,,live,E10000012,Essex,881 E06000056,Central Bedfordshire,,,live,E06000056,Central Bedfordshire,823 E07000130,Charnwood,,,live,E10000018,Leicestershire,855 @@ -63,7 +65,7 @@ E07000118,Chorley,,,live,E10000017,Lancashire,888 E07000048,Christchurch,,2018-12-01,terminated,E10000009,Dorset,835 E09000001,City of London,,,live,E09000001,City of London,201 E07000071,Colchester,,,live,E10000012,Essex,881 -E07000029,Copeland,,,live,E10000006,Cumbria,909 +E07000029,Copeland,,2023-03-31,terminated,E10000006,Cumbria,909 E07000150,Corby,,2020-04-01,terminated,E10000021,Northamptonshire,928 E06000052,Cornwall,,,live,E06000052,Cornwall,908 E07000079,Cotswold,,,live,E10000013,Gloucestershire,916 @@ -96,7 +98,7 @@ E07000193,East Staffordshire,,,live,E10000028,Staffordshire,860 E07000244,East Suffolk,2019-12-01,,live,E10000029,Suffolk,935 E07000061,Eastbourne,,,live,E10000011,East Sussex,845 E07000086,Eastleigh,,,live,E10000014,Hampshire,850 -E07000030,Eden,,,live,E10000006,Cumbria,909 +E07000030,Eden,,2023-03-31,terminated,E10000006,Cumbria,909 E07000207,Elmbridge,,,live,E10000030,Surrey,936 E09000010,Enfield,,,live,E09000010,Enfield,308 E07000072,Epping Forest,,,live,E10000012,Essex,881 @@ -250,7 +252,7 @@ E06000025,South Gloucestershire,,,live,E06000025,South Gloucestershire,803 E07000044,South Hams,,,live,E10000008,Devon,878 E07000140,South Holland,,,live,E10000019,Lincolnshire,925 E07000141,South Kesteven,,,live,E10000019,Lincolnshire,925 -E07000031,South Lakeland,,,live,E10000006,Cumbria,909 +E07000031,South Lakeland,,2023-03-31,terminated,E10000006,Cumbria,909 E07000149,South Norfolk,,,live,E10000020,Norfolk,926 E07000155,South Northamptonshire,,2020-04-01,terminated,E10000021,Northamptonshire,928 E07000179,South Oxfordshire,,,live,E10000025,Oxfordshire,931 diff --git a/data/lads.csv b/data/lads.csv index 64b4b522..c4c76ee4 100644 --- a/data/lads.csv +++ b/data/lads.csv @@ -20,16 +20,18 @@ E07000011,Huntingdonshire,,,live E07000012,South Cambridgeshire,,,live E06000010,"Kingston upon Hull, City of",,,live E06000011,East Riding of Yorkshire,,,live -E07000026,Allerdale,,,live -E07000027,Barrow-in-Furness,,,live +E06000063,Cumberland,2023-04-01,,live +E06000064,Westmorland and Furness,2023-04-01,,live +E07000026,Allerdale,,2023-03-31,terminated +E07000027,Barrow-in-Furness,,2023-03-31,terminated E06000012,North East Lincolnshire,,,live E06000013,North Lincolnshire,,,live -E07000028,Carlisle,,,live -E07000029,Copeland,,,live +E07000028,Carlisle,,2023-03-31,terminated +E07000029,Copeland,,2023-03-31,terminated E06000014,York,,,live E06000015,Derby,,,live -E07000030,Eden,,,live -E07000031,South Lakeland,,,live +E07000030,Eden,,2023-03-31,terminated +E07000031,South Lakeland,,2023-03-31,terminated E06000016,Leicester,,,live E06000017,Rutland,,,live E07000032,Amber Valley,,,live diff --git a/data/las.csv b/data/las.csv index 2aa3b4af..45435e0c 100644 --- a/data/las.csv +++ b/data/las.csv @@ -159,6 +159,8 @@ E06000054,Wiltshire,01/04/2009,,E12000009,E06,Unitary Authorities,live,865 E06000055,Bedford,01/04/2009,,E12000006,E06,Unitary Authorities,live,822 E06000056,Central Bedfordshire,01/04/2009,,E12000006,E06,Unitary Authorities,live,823 E06000057,Northumberland,01/04/2013,,E12000001,E06,Unitary Authorities,live,929 +E06000063,Cumberland,01/04/2023,,E12000002,E06,Unitary Authorities,live,942 +E06000064,Westmorland and Furness,01/04/2023,,E12000002,E06,Unitary Authorities,live,943 E08000037,Gateshead,01/04/2013,,E12000001,E08,Metropolitan Districts,live,390 E06000058,"Bournemouth, Christchurch and Poole",01/04/2019,,E12000009,E06,Unitary Authorities,live,839 E06000059,Dorset,01/04/2019,,E12000009,E06,Unitary Authorities,live,838 From 3b3d30eebab4d75528fe6ec45548d272d5ef7163 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Tue, 13 Jun 2023 13:27:43 +0100 Subject: [PATCH 3/8] Updated LA-Region lookup --- data/region_la_hierarchy.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/region_la_hierarchy.csv b/data/region_la_hierarchy.csv index a18e069c..31e4a59c 100644 --- a/data/region_la_hierarchy.csv +++ b/data/region_la_hierarchy.csv @@ -22,7 +22,8 @@ "E12000002","North West","x","Cheshire","E10000004" "E12000002","North West","895","Cheshire East","E06000049" "E12000002","North West","896","Cheshire West and Chester","E06000050" -"E12000002","North West","909","Cumbria","E10000006" +"E12000002","North West","942","Cumberland","E06000063" +"E12000002","North West","943","Westmorland and Furness","E06000064" "E12000002","North West","876","Halton","E06000006" "E12000002","North West","340","Knowsley","E08000011" "E12000002","North West","888","Lancashire","E10000017" From e587d032e79eeec8626d33b0a1f0387db9a53532 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Tue, 13 Jun 2023 15:48:00 +0100 Subject: [PATCH 4/8] Updated data with new North Yorkshire and Somerset codes and LADs --- data/la_lad_hierarchy.csv | 9 +++++---- data/lads.csv | 24 +++++++++++++----------- data/las.csv | 6 ++++-- data/region_la_hierarchy.csv | 4 ++-- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/data/la_lad_hierarchy.csv b/data/la_lad_hierarchy.csv index 2220966e..81e36021 100644 --- a/data/la_lad_hierarchy.csv +++ b/data/la_lad_hierarchy.csv @@ -171,7 +171,7 @@ E08000003,Manchester,,,live,E08000003,Manchester,352 E07000174,Mansfield,,,live,E10000024,Nottinghamshire,891 E06000035,Medway,,,live,E06000035,Medway,887 E07000133,Melton,,,live,E10000018,Leicestershire,855 -E07000187,Mendip,,,live,E10000027,Somerset,933 +E07000187,Mendip,,2023-03-31,terminated,E10000027,Somerset,933 E09000024,Merton,,,live,E09000024,Merton,315 E07000042,Mid Devon,,,live,E10000008,Devon,878 E07000203,Mid Suffolk,,,live,E10000029,Suffolk,935 @@ -235,7 +235,7 @@ E07000167,Ryedale,,,live,E10000023,North Yorkshire,815 E08000006,Salford,,,live,E08000006,Salford,355 E08000028,Sandwell,,,live,E08000028,Sandwell,333 E07000168,Scarborough,,,live,E10000023,North Yorkshire,815 -E07000188,Sedgemoor,,,live,E10000027,Somerset,933 +E07000188,Sedgemoor,,2023-03-31,terminated,E10000027,Somerset,933 E08000014,Sefton,,,live,E08000014,Sefton,343 E07000169,Selby,,,live,E10000023,North Yorkshire,815 E07000111,Sevenoaks,,,live,E10000016,Kent,886 @@ -244,7 +244,8 @@ E07000112,Shepway,,2017-12-01,terminated,E10000016,Kent,886 E06000051,Shropshire,,,live,E06000051,Shropshire,893 E06000039,Slough,,,live,E06000039,Slough,871 E08000029,Solihull,,,live,E08000029,Solihull,334 -E07000246,Somerset West and Taunton,2019-12-01,,live,E10000027,Somerset,933 +E07000246,Somerset West and Taunton,2019-12-01,2023-03-31,terminated,E10000027,Somerset,933 +E06000066,Somerset,2023-04-01,,live,E06000066,Somerset,933 E07000006,South Bucks,,2019-12-01,terminated,E10000002,Buckinghamshire,825 E07000012,South Cambridgeshire,,,live,E10000003,Cambridgeshire,873 E07000039,South Derbyshire,,,live,E10000007,Derbyshire,830 @@ -257,7 +258,7 @@ E07000149,South Norfolk,,,live,E10000020,Norfolk,926 E07000155,South Northamptonshire,,2020-04-01,terminated,E10000021,Northamptonshire,928 E07000179,South Oxfordshire,,,live,E10000025,Oxfordshire,931 E07000126,South Ribble,,,live,E10000017,Lancashire,888 -E07000189,South Somerset,,,live,E10000027,Somerset,933 +E07000189,South Somerset,,2023-03-31,terminated,E10000027,Somerset,933 E07000196,South Staffordshire,,,live,E10000028,Staffordshire,860 E08000023,South Tyneside,,,live,E08000023,South Tyneside,393 E06000045,Southampton,,,live,E06000045,Southampton,852 diff --git a/data/lads.csv b/data/lads.csv index c4c76ee4..9f3ea296 100644 --- a/data/lads.csv +++ b/data/lads.csv @@ -188,7 +188,7 @@ E07000243,Stevenage,2015-04-01,,live E07000244,East Suffolk,2019-04-01,,live E07000245,West Suffolk,2019-04-01,,live E07000142,West Lindsey,,,live -E07000246,Somerset West and Taunton,2019-04-01,,live +E07000246,Somerset West and Taunton,2019-04-01,2023-03-31,terminated E07000143,Breckland,,,live E08000001,Bolton,,,live E07000144,Broadland,,,live @@ -203,19 +203,19 @@ E07000148,Norwich,,,live E08000006,Salford,,,live E07000149,South Norfolk,,,live E08000007,Stockport,,,live -E07000163,Craven,,,live +E07000163,Craven,,2023-03-31,terminated E08000008,Tameside,,,live -E07000164,Hambleton,,,live +E07000164,Hambleton,,2023-03-31,terminated E08000009,Trafford,,,live -E07000165,Harrogate,,,live +E07000165,Harrogate,,2023-03-31,terminated E08000010,Wigan,,,live -E07000166,Richmondshire,,,live +E07000166,Richmondshire,,2023-03-31,terminated E08000011,Knowsley,,,live -E07000167,Ryedale,,,live +E07000167,Ryedale,,2023-03-31,terminated E08000012,Liverpool,,,live -E07000168,Scarborough,,,live +E07000168,Scarborough,,2023-03-31,terminated E08000013,St. Helens,,,live -E07000169,Selby,,,live +E07000169,Selby,,2023-03-31,terminated E08000014,Sefton,,,live E07000170,Ashfield,,,live E08000015,Wirral,,,live @@ -232,9 +232,9 @@ E07000178,Oxford,,,live E07000179,South Oxfordshire,,,live E07000180,Vale of White Horse,,,live E07000181,West Oxfordshire,,,live -E07000187,Mendip,,,live -E07000188,Sedgemoor,,,live -E07000189,South Somerset,,,live +E07000187,Mendip,,2023-03-31,terminated +E07000188,Sedgemoor,,2023-03-31,terminated +E07000189,South Somerset,,2023-03-31,terminated E07000192,Cannock Chase,,,live E07000193,East Staffordshire,,,live E07000194,Lichfield,,,live @@ -310,6 +310,8 @@ E09000030,Tower Hamlets,,,live E09000031,Waltham Forest,,,live E09000032,Wandsworth,,,live E09000033,Westminster,,,live +E06000065,North Yorkshire,2023-04-01,,live +E06000066,Somerset,2023-04-01,,live E07000150,Corby,,2020-12-01,terminated E07000151,Daventry,,2020-12-01,terminated E07000152,East Northamptonshire,,2020-12-01,terminated diff --git a/data/las.csv b/data/las.csv index 45435e0c..fcd9d856 100644 --- a/data/las.csv +++ b/data/las.csv @@ -83,11 +83,11 @@ E10000019,Lincolnshire,01/01/2009,,E12000004,E10,Counties,live,925 E10000020,Norfolk,01/01/2009,,E12000006,E10,Counties,live,926 E10000021,Northamptonshire,01/01/2009,31/03/2021,E12000004,E10,Counties,terminated,928 E10000022,Northumberland,01/01/2009,31/03/2009,E12000001,E10,Counties,terminated,x -E10000023,North Yorkshire,01/01/2009,,E12000003,E10,Counties,live,815 +E10000023,North Yorkshire,01/01/2009,31/03/2023,E12000003,E10,Counties,terminated,815 E10000024,Nottinghamshire,01/01/2009,,E12000004,E10,Counties,live,891 E10000025,Oxfordshire,01/01/2009,,E12000008,E10,Counties,live,931 E10000026,Shropshire,01/01/2009,31/03/2009,E12000005,E10,Counties,terminated,x -E10000027,Somerset,01/01/2009,,E12000009,E10,Counties,live,933 +E10000027,Somerset,01/01/2009,31/03/2023,E12000009,E10,Counties,live,933 E10000028,Staffordshire,01/01/2009,,E12000005,E10,Counties,live,860 E10000029,Suffolk,01/01/2009,,E12000006,E10,Counties,live,935 E10000030,Surrey,01/01/2009,,E12000008,E10,Counties,live,936 @@ -161,6 +161,8 @@ E06000056,Central Bedfordshire,01/04/2009,,E12000006,E06,Unitary Authorities,liv E06000057,Northumberland,01/04/2013,,E12000001,E06,Unitary Authorities,live,929 E06000063,Cumberland,01/04/2023,,E12000002,E06,Unitary Authorities,live,942 E06000064,Westmorland and Furness,01/04/2023,,E12000002,E06,Unitary Authorities,live,943 +E06000065,North Yorkshire,01/04/2023,,E12000003,E06,Unitary Authorities,live,815 +E10000027,Somerset,01/04/2023,,E12000009,E06,Unitary Authorities,live,933 E08000037,Gateshead,01/04/2013,,E12000001,E08,Metropolitan Districts,live,390 E06000058,"Bournemouth, Christchurch and Poole",01/04/2019,,E12000009,E06,Unitary Authorities,live,839 E06000059,Dorset,01/04/2019,,E12000009,E06,Unitary Authorities,live,838 diff --git a/data/region_la_hierarchy.csv b/data/region_la_hierarchy.csv index 31e4a59c..58e23240 100644 --- a/data/region_la_hierarchy.csv +++ b/data/region_la_hierarchy.csv @@ -50,7 +50,7 @@ "E12000003","Yorkshire and The Humber","383","Leeds","E08000035" "E12000003","Yorkshire and The Humber","812","North East Lincolnshire","E06000012" "E12000003","Yorkshire and The Humber","813","North Lincolnshire","E06000013" -"E12000003","Yorkshire and The Humber","815","North Yorkshire","E10000023" +"E12000003","Yorkshire and The Humber","815","North Yorkshire","E06000065" "E12000003","Yorkshire and The Humber","372","Rotherham","E08000018" "E12000003","Yorkshire and The Humber","373","Sheffield","E08000019" "E12000003","Yorkshire and The Humber","384","Wakefield","E08000036" @@ -160,7 +160,7 @@ "E12000009","South West","802","North Somerset","E06000024" "E12000009","South West","879","Plymouth","E06000026" "E12000009","South West","836","Poole","E06000029" -"E12000009","South West","933","Somerset","E10000027" +"E12000009","South West","933","Somerset","E06000066" "E12000009","South West","803","South Gloucestershire","E06000025" "E12000009","South West","866","Swindon","E06000030" "E12000009","South West","880","Torbay","E06000027" From 66390b5e13bba1dc394cabf8648fa505b95c3270 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Tue, 13 Jun 2023 16:09:43 +0100 Subject: [PATCH 5/8] Ran tests --- renv.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/renv.lock b/renv.lock index 9cab4eb4..1266df55 100644 --- a/renv.lock +++ b/renv.lock @@ -708,10 +708,10 @@ }, "mgcv": { "Package": "mgcv", - "Version": "1.8-41", + "Version": "1.8-42", "Source": "Repository", "Repository": "CRAN", - "Hash": "6b3904f13346742caa3e82dd0303d4ad", + "Hash": "3460beba7ccc8946249ba35327ba902a", "Requirements": [ "Matrix", "nlme" @@ -737,10 +737,10 @@ }, "nlme": { "Package": "nlme", - "Version": "3.1-161", + "Version": "3.1-162", "Source": "Repository", "Repository": "CRAN", - "Hash": "b49e163093c0ef46fbbfc40bcb87916c", + "Hash": "0984ce8da8da9ead8643c5cbbb60f83e", "Requirements": [ "lattice" ] @@ -1491,7 +1491,7 @@ "Source": "Repository", "Repository": "CRAN", "Hash": "f5baec54606751aa53ac9c0e05848ed6", - "Requirements": [] + "Requirements": [] }, "xtable": { "Package": "xtable", From 77fad09606bde15c892af1108b787d3f5584ccf1 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Tue, 13 Jun 2023 16:50:04 +0100 Subject: [PATCH 6/8] renv update --- renv.lock | 251 +++++++++++++++++++++++++----------------------- renv/activate.R | 2 +- 2 files changed, 130 insertions(+), 123 deletions(-) diff --git a/renv.lock b/renv.lock index 1266df55..d2a3b1bf 100644 --- a/renv.lock +++ b/renv.lock @@ -11,18 +11,18 @@ "Packages": { "BH": { "Package": "BH", - "Version": "1.78.0-0", + "Version": "1.81.0-1", "Source": "Repository", "Repository": "CRAN", - "Hash": "4e348572ffcaa2fb1e610e7a941f6f3a", + "Hash": "68122010f01c4dcfbe58ce7112f2433d", "Requirements": [] }, "DT": { "Package": "DT", - "Version": "0.26", + "Version": "0.28", "Source": "Repository", "Repository": "CRAN", - "Hash": "c66a72c4d3499e14ae179ccb742e740a", + "Hash": "ab745834dfae7eaf71dd0b90f3b66759", "Requirements": [ "crosstalk", "htmltools", @@ -35,18 +35,18 @@ }, "MASS": { "Package": "MASS", - "Version": "7.3-58.1", + "Version": "7.3-60", "Source": "Repository", "Repository": "CRAN", - "Hash": "762e1804143a332333c054759f89a706", + "Hash": "a56a6365b3fa73293ea8d084be0d9bb0", "Requirements": [] }, "Matrix": { "Package": "Matrix", - "Version": "1.5-3", + "Version": "1.5-4.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "4006dffe49958d2dd591c17e61e60591", + "Hash": "38082d362d317745fb932e13956dccbb", "Requirements": [ "lattice" ] @@ -111,10 +111,10 @@ }, "Rcpp": { "Package": "Rcpp", - "Version": "1.0.9", + "Version": "1.0.10", "Source": "Repository", "Repository": "CRAN", - "Hash": "e9c08b94391e9f3f97355841229124f2", + "Hash": "e749cae40fa9ef469b6050959517453c", "Requirements": [] }, "anytime": { @@ -190,10 +190,10 @@ }, "bslib": { "Package": "bslib", - "Version": "0.4.2", + "Version": "0.5.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "a7fbf03946ad741129dc81098722fca1", + "Hash": "1b117970533deb6d4e992c1b34e9d905", "Requirements": [ "base64enc", "cachem", @@ -208,10 +208,10 @@ }, "cachem": { "Package": "cachem", - "Version": "1.0.6", + "Version": "1.0.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "648c5b3d71e6a37e3043617489a0a0e9", + "Hash": "c35768291560ce302c0a6589f92e837d", "Requirements": [ "fastmap", "rlang" @@ -230,20 +230,20 @@ }, "checkmate": { "Package": "checkmate", - "Version": "2.1.0", + "Version": "2.2.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "147e4db6909d8814bb30f671b49d7e06", + "Hash": "ca9c113196136f4a9ca9ce6079c2c99e", "Requirements": [ "backports" ] }, "cli": { "Package": "cli", - "Version": "3.6.0", + "Version": "3.6.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "3177a5a16c243adc199ba33117bd9657", + "Hash": "89e6d8219950eac806ae0c489052048a", "Requirements": [] }, "clipr": { @@ -256,18 +256,18 @@ }, "colorspace": { "Package": "colorspace", - "Version": "2.0-3", + "Version": "2.1-0", "Source": "Repository", "Repository": "CRAN", - "Hash": "bb4341986bc8b914f0f0acf2e4a3f2f7", + "Hash": "f20c47fd52fae58b4e377c37bb8c335b", "Requirements": [] }, "commonmark": { "Package": "commonmark", - "Version": "1.8.1", + "Version": "1.9.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "b6e3e947d1d7ebf3d2bdcea1bde63fe7", + "Hash": "d691c61bff84bd63c383874d2d0c3307", "Requirements": [] }, "config": { @@ -311,18 +311,18 @@ }, "curl": { "Package": "curl", - "Version": "5.0.0", + "Version": "5.0.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "e4f97056611e8e6b8b852d13b7400cf1", + "Hash": "2118af9cb164c8d2dddc7b89eaf732d9", "Requirements": [] }, "data.table": { "Package": "data.table", - "Version": "1.14.6", + "Version": "1.14.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "aecef50008ea7b57c76f1cb5c127fb02", + "Hash": "b4c06e554f33344e044ccd7fdca750a9", "Requirements": [] }, "debugme": { @@ -367,12 +367,13 @@ }, "dplyr": { "Package": "dplyr", - "Version": "1.0.10", + "Version": "1.1.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "539412282059f7f0c07295723d23f987", + "Hash": "dea6970ff715ca541c387de363ff405e", "Requirements": [ "R6", + "cli", "generics", "glue", "lifecycle", @@ -396,18 +397,18 @@ }, "evaluate": { "Package": "evaluate", - "Version": "0.19", + "Version": "0.21", "Source": "Repository", "Repository": "CRAN", - "Hash": "5aac3cd0a3ccb1a738941796b28c26fe", + "Hash": "d59f3b464e8da1aef82dc04b588b8dfb", "Requirements": [] }, "fansi": { "Package": "fansi", - "Version": "1.0.3", + "Version": "1.0.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "83a8afdbe71839506baa9f90eebad7ec", + "Hash": "1d9e7ad3c8312a192dea7d3db0274fde", "Requirements": [] }, "farver": { @@ -420,18 +421,18 @@ }, "fastmap": { "Package": "fastmap", - "Version": "1.1.0", + "Version": "1.1.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "77bd60a6157420d4ffa93b27cf6a58b8", + "Hash": "f7736a18de97dea803bde0a2daaafb27", "Requirements": [] }, "fontawesome": { "Package": "fontawesome", - "Version": "0.4.0", + "Version": "0.5.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "c5a628c2570aa86a96cc6ef739d8bfda", + "Hash": "1e22b8cabbad1eae951a75e9f8b52378", "Requirements": [ "htmltools", "rlang" @@ -439,10 +440,10 @@ }, "fs": { "Package": "fs", - "Version": "1.5.2", + "Version": "1.6.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "7c89603d81793f0d5486d91ab1fc6f1d", + "Hash": "94af08e0aa9675a16fadbb3aaaa90d2a", "Requirements": [] }, "generics": { @@ -455,10 +456,10 @@ }, "ggplot2": { "Package": "ggplot2", - "Version": "3.4.0", + "Version": "3.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "fd2aab12f54400c6bca43687231e246b", + "Hash": "3a147ee02e85a8941aad9909f1b43b7b", "Requirements": [ "MASS", "cli", @@ -484,11 +485,16 @@ }, "gtable": { "Package": "gtable", - "Version": "0.3.1", + "Version": "0.3.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "36b4265fb818f6a342bed217549cd896", - "Requirements": [] + "Hash": "b44addadb528a0d227794121c00572a0", + "Requirements": [ + "cli", + "glue", + "lifecycle", + "rlang" + ] }, "highr": { "Package": "highr", @@ -502,12 +508,11 @@ }, "hms": { "Package": "hms", - "Version": "1.1.2", + "Version": "1.1.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "41100392191e1244b887878b533eea91", + "Hash": "b59377caa7ed00fa41808342002138f9", "Requirements": [ - "ellipsis", "lifecycle", "pkgconfig", "rlang", @@ -516,10 +521,10 @@ }, "htmltools": { "Package": "htmltools", - "Version": "0.5.4", + "Version": "0.5.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "9d27e99cc90bd701c0a7a63e5923f9b7", + "Hash": "ba0240784ad50a62165058a27459304a", "Requirements": [ "base64enc", "digest", @@ -530,10 +535,10 @@ }, "htmlwidgets": { "Package": "htmlwidgets", - "Version": "1.6.1", + "Version": "1.6.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "b677ee5954471eaa974c0d099a343a1a", + "Hash": "a865aa85bcb2697f47505bfd70422471", "Requirements": [ "htmltools", "jsonlite", @@ -544,10 +549,10 @@ }, "httpuv": { "Package": "httpuv", - "Version": "1.6.8", + "Version": "1.6.11", "Source": "Repository", "Repository": "CRAN", - "Hash": "08e611aee165b27f8ff18770285fb535", + "Hash": "838602f54e32c1a0f8cc80708cefcefa", "Requirements": [ "R6", "Rcpp", @@ -557,10 +562,10 @@ }, "httr": { "Package": "httr", - "Version": "1.4.4", + "Version": "1.4.6", "Source": "Repository", "Repository": "CRAN", - "Hash": "57557fac46471f0dbbf44705cc6a5c8c", + "Hash": "7e5e3cbd2a7bc07880c94e22348fb661", "Requirements": [ "R6", "curl", @@ -579,12 +584,13 @@ }, "janitor": { "Package": "janitor", - "Version": "2.1.0", + "Version": "2.2.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "6de84a8c67fb247e721166049c84695f", + "Hash": "5baae149f1082f466df9d1442ba7aa65", "Requirements": [ "dplyr", + "hms", "lifecycle", "lubridate", "magrittr", @@ -609,22 +615,21 @@ }, "jsonlite": { "Package": "jsonlite", - "Version": "1.8.4", + "Version": "1.8.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "a4269a09a9b865579b2635c77e572374", + "Hash": "3ee4d9899e4db3e976fc82b98d24a31a", "Requirements": [] }, "knitr": { "Package": "knitr", - "Version": "1.41", + "Version": "1.43", "Source": "Repository", "Repository": "CRAN", - "Hash": "6d4971f3610e75220534a1befe81bc92", + "Hash": "9775eb076713f627c07ce41d8199d8f6", "Requirements": [ "evaluate", "highr", - "stringr", "xfun", "yaml" ] @@ -639,10 +644,10 @@ }, "later": { "Package": "later", - "Version": "1.3.0", + "Version": "1.3.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "7e7b457d7766bc47f2a5f21cc2984f8e", + "Hash": "40401c9cf2bc2259dfe83311c9384710", "Requirements": [ "Rcpp", "rlang" @@ -650,10 +655,10 @@ }, "lattice": { "Package": "lattice", - "Version": "0.20-45", + "Version": "0.21-8", "Source": "Repository", "Repository": "CRAN", - "Hash": "b64cdbb2b340437c4ee047a1f4c4377b", + "Hash": "0b8a6d63c8770f02a8b5635f3c431e6b", "Requirements": [] }, "lazyeval": { @@ -678,10 +683,10 @@ }, "lubridate": { "Package": "lubridate", - "Version": "1.9.0", + "Version": "1.9.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "2af4550c2f0f7fbe7cbbf3dbf4ea3902", + "Hash": "e25f18436e3efd42c7c590a1c4c15390", "Requirements": [ "generics", "timechange" @@ -747,20 +752,20 @@ }, "openssl": { "Package": "openssl", - "Version": "2.0.5", + "Version": "2.0.6", "Source": "Repository", "Repository": "CRAN", - "Hash": "b04c27110bf367b4daa93f34f3d58e75", + "Hash": "0f7cd2962e3044bb940cca4f4b5cecbe", "Requirements": [ "askpass" ] }, "packrat": { "Package": "packrat", - "Version": "0.9.0", + "Version": "0.9.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "2735eb4b51c302014f53acbb3c80a65f", + "Hash": "481428983c19a7c443f7ea1beff0a2de", "Requirements": [] }, "parsedate": { @@ -773,10 +778,10 @@ }, "pillar": { "Package": "pillar", - "Version": "1.8.1", + "Version": "1.9.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "f2316df30902c81729ae9de95ad5a608", + "Hash": "15da5a8412f317beeee6175fbc76f4bb", "Requirements": [ "cli", "fansi", @@ -824,10 +829,10 @@ }, "png": { "Package": "png", - "Version": "0.1-7", + "Version": "0.1-8", "Source": "Repository", "Repository": "CRAN", - "Hash": "03b7076c234cb3331288919983326c55", + "Hash": "bd54ba8a0a5faded999a7aab6e46b374", "Requirements": [] }, "praise": { @@ -848,10 +853,10 @@ }, "processx": { "Package": "processx", - "Version": "3.8.0", + "Version": "3.8.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "a33ee2d9bf07564efb888ad98410da84", + "Hash": "d75b4059d781336efba24021915902b4", "Requirements": [ "R6", "ps" @@ -886,10 +891,10 @@ }, "ps": { "Package": "ps", - "Version": "1.7.2", + "Version": "1.7.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "68dd03d98a5efd1eb3012436de45ba83", + "Hash": "709d852d33178db54b17c722e5b1e594", "Requirements": [] }, "purrr": { @@ -916,10 +921,10 @@ }, "readr": { "Package": "readr", - "Version": "2.1.3", + "Version": "2.1.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "2dfbfc673ccb3de3d8836b4b3bd23d14", + "Hash": "b5047343b3825f37ad9d3b5d89aa1078", "Requirements": [ "R6", "cli", @@ -954,29 +959,30 @@ }, "renv": { "Package": "renv", - "Version": "0.16.0", + "Version": "0.17.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "c9e8442ab69bc21c9697ecf856c1e6c7", + "Hash": "4543b8cd233ae25c6aba8548be9e747e", "Requirements": [] }, "rlang": { "Package": "rlang", - "Version": "1.0.6", + "Version": "1.1.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "4ed1f8336c8d52c3e750adcdc57228a7", + "Hash": "a85c767b55f0bf9b7ad16c6d7baee5bb", "Requirements": [] }, "rmarkdown": { "Package": "rmarkdown", - "Version": "2.19", + "Version": "2.22", "Source": "Repository", "Repository": "CRAN", - "Hash": "4e29299e1f4c7eabb0b8365b338adf3c", + "Hash": "75a01be060d800ceb14e32c666cacac9", "Requirements": [ "bslib", "evaluate", + "fontawesome", "htmltools", "jquerylib", "jsonlite", @@ -1021,10 +1027,10 @@ }, "sass": { "Package": "sass", - "Version": "0.4.4", + "Version": "0.4.6", "Source": "Repository", "Repository": "CRAN", - "Hash": "c76cbac7ca04ce82d8c38e29729987a3", + "Hash": "cc3ec7dd33982ef56570229b62d6388e", "Requirements": [ "R6", "fs", @@ -1160,10 +1166,10 @@ }, "shinytest": { "Package": "shinytest", - "Version": "1.5.1", + "Version": "1.5.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "e1dd8825e76710c5429d89930c7d95fb", + "Hash": "981229915650258e38ae95947210082d", "Requirements": [ "R6", "assertthat", @@ -1209,10 +1215,10 @@ }, "sourcetools": { "Package": "sourcetools", - "Version": "0.1.7", + "Version": "0.1.7-1", "Source": "Repository", "Repository": "CRAN", - "Hash": "947e4e02a79effa5d512473e10f41797", + "Hash": "5f5a7629f956619d519205ec475fe647", "Requirements": [] }, "sparkline": { @@ -1252,10 +1258,10 @@ }, "styler": { "Package": "styler", - "Version": "1.9.0", + "Version": "1.10.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "1c038945a5e14cce208f5214c1dd167c", + "Hash": "b0911fdb2c682f526f6e9c131fd40a1f", "Requirements": [ "R.cache", "cli", @@ -1269,18 +1275,18 @@ }, "sys": { "Package": "sys", - "Version": "3.4.1", + "Version": "3.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "34c16f1ef796057bfa06d3f4ff818a5d", + "Hash": "3a1be13d68d47a8cd0bfd74739ca1555", "Requirements": [] }, "testthat": { "Package": "testthat", - "Version": "3.1.6", + "Version": "3.1.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "7910146255835c66e9eb272fb215248d", + "Hash": "e0eded5dd915510f8e0d6e6277506203", "Requirements": [ "R6", "brio", @@ -1304,10 +1310,10 @@ }, "tibble": { "Package": "tibble", - "Version": "3.1.8", + "Version": "3.2.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "56b6934ef0f8c68225949a8672fe1a8f", + "Hash": "a84e2cc86d07289b3b6f5069df7a004c", "Requirements": [ "fansi", "lifecycle", @@ -1320,19 +1326,20 @@ }, "tidyr": { "Package": "tidyr", - "Version": "1.2.1", + "Version": "1.3.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "cdb403db0de33ccd1b6f53b83736efa8", + "Hash": "e47debdc7ce599b070c8e78e8ac0cfcf", "Requirements": [ + "cli", "cpp11", "dplyr", - "ellipsis", "glue", "lifecycle", "magrittr", "purrr", "rlang", + "stringr", "tibble", "tidyselect", "vctrs" @@ -1365,30 +1372,30 @@ }, "tinytex": { "Package": "tinytex", - "Version": "0.43", + "Version": "0.45", "Source": "Repository", "Repository": "CRAN", - "Hash": "facc02f3d63ed7dd765513c004c394ce", + "Hash": "e4e357f28c2edff493936b6cb30c3d65", "Requirements": [ "xfun" ] }, "tzdb": { "Package": "tzdb", - "Version": "0.3.0", + "Version": "0.4.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "b2e1cbce7c903eaf23ec05c58e59fb5e", + "Hash": "f561504ec2897f4d46f0c7657e488ae1", "Requirements": [ "cpp11" ] }, "utf8": { "Package": "utf8", - "Version": "1.2.2", + "Version": "1.2.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "c9c462b759a5cc844ae25b5942654d13", + "Hash": "1fe17157424bb09c48a8b3b550c753bc", "Requirements": [] }, "uuid": { @@ -1401,10 +1408,10 @@ }, "vctrs": { "Package": "vctrs", - "Version": "0.5.1", + "Version": "0.6.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "970324f6572b4fd81db507b5d4062cb0", + "Hash": "a745bda7aff4734c17294bb41d4e4607", "Requirements": [ "cli", "glue", @@ -1414,18 +1421,18 @@ }, "viridisLite": { "Package": "viridisLite", - "Version": "0.4.1", + "Version": "0.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "62f4b5da3e08d8e5bcba6cac15603f70", + "Hash": "c826c7c4241b6fc89ff55aaea3fa7491", "Requirements": [] }, "vroom": { "Package": "vroom", - "Version": "1.6.0", + "Version": "1.6.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "64f81fdead6e0d250fb041e175d123ab", + "Hash": "8318e64ffb3a70e652494017ec455561", "Requirements": [ "bit64", "cli", @@ -1445,10 +1452,10 @@ }, "waldo": { "Package": "waldo", - "Version": "0.4.0", + "Version": "0.5.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "035fba89d0c86e2113120f93301b98ad", + "Hash": "2c993415154cdb94649d99ae138ff5e5", "Requirements": [ "cli", "diffobj", @@ -1487,10 +1494,10 @@ }, "xfun": { "Package": "xfun", - "Version": "0.36", + "Version": "0.39", "Source": "Repository", "Repository": "CRAN", - "Hash": "f5baec54606751aa53ac9c0e05848ed6", + "Hash": "8f56e9acb54fb525e66464d57ab58bcb", "Requirements": [] }, "xtable": { @@ -1503,10 +1510,10 @@ }, "yaml": { "Package": "yaml", - "Version": "2.3.6", + "Version": "2.3.7", "Source": "Repository", "Repository": "CRAN", - "Hash": "9b570515751dcbae610f29885e025b41", + "Hash": "0d0056cc5383fbc240ccd0cb584bf436", "Requirements": [] } } diff --git a/renv/activate.R b/renv/activate.R index 019b5a66..c9722849 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,7 +2,7 @@ local({ # the requested version of renv - version <- "0.16.0" + version <- "0.17.3" # the project directory project <- getwd() From 03ed25e517c13ff983e3c0947d22530a038f6803 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Wed, 14 Jun 2023 12:22:04 +0100 Subject: [PATCH 7/8] Fixed errors created by defunct syntax since tidyverse upgrade --- renv/settings.json | 17 ++ server.R | 84 ++++++--- tests/shinytest/UI_tests-expected/011.json | 8 +- tests/shinytest/UI_tests-expected/012.json | 22 +-- tests/shinytest/UI_tests-expected/016.json | 70 +++---- tests/shinytest/UI_tests-expected/020.json | 16 +- tests/shinytest/UI_tests-expected/021.json | 8 +- tests/shinytest/UI_tests-expected/022.json | 210 ++++++++++++++++++++- tests/shinytest/UI_tests-expected/023.json | 10 +- tests/shinytest/UI_tests-expected/026.json | 10 +- 10 files changed, 348 insertions(+), 107 deletions(-) create mode 100644 renv/settings.json diff --git a/renv/settings.json b/renv/settings.json new file mode 100644 index 00000000..c99822db --- /dev/null +++ b/renv/settings.json @@ -0,0 +1,17 @@ +{ + "bioconductor.version": [], + "external.libraries": [], + "ignored.packages": [], + "package.dependency.fields": [ + "Imports", + "Depends", + "LinkingTo" + ], + "r.version": [], + "snapshot.type": "packrat", + "use.cache": true, + "vcs.ignore.cellar": true, + "vcs.ignore.library": true, + "vcs.ignore.local": true, + "vcs.manage.ignores": true +} diff --git a/server.R b/server.R index a96a6851..459f6749 100644 --- a/server.R +++ b/server.R @@ -717,25 +717,40 @@ server <- function(input, output, session) { # Show summary stats table for an indicator showsumstats <- function(parameter, geog_parameter) { args <- expand.grid(ind = parameter, geog = geog_parameter, stringsAsFactors = FALSE) - sumtable <- function(args) { - y <- eval(parse(text = paste0("data$mainFile %>% filter(geographic_level =='", args[2], "') %>% - mutate(across(all_of('", args[1], "'), na_if, '", gssNAvcode, "')) %>% - mutate(across(all_of('", args[1], "'), na_if, '", gssNApcode, "')) %>% - mutate(across(all_of('", args[1], "'), na_if, '", gssNAvcode, "')) %>% - mutate(across(all_of('", args[1], "'), na_if, '", gssRndcode, "')) %>% - mutate(across(all_of('", args[1], "'), as.numeric)) %>% - select(time_period,'", args[1], "') %>% - group_by(time_period) %>% - summarise(across(everything(), list(min = ~ min(.x, na.rm=TRUE), - max = ~ max(.x, na.rm=TRUE), - average = ~ round(mean(.x, na.rm=TRUE),1), - count = ~ n(), - suppressed = ~ sum(is.na(.x))))) %>% - pivot_longer(!time_period, names_to = c('indicator', 'measure'), names_pattern = '(.*)_(.*)') %>% - pivot_wider(names_from = 'time_period') %>% - mutate(geographic_level ='", args[2], "', .before = indicator) %>% - mutate(Change = as.character(0))"))) + indicators <- args[[1]] + geographies <- args[[2]] + y <- data$mainFile %>% + filter(geographic_level %in% geographies) %>% + mutate( + across(get(indicators), na_if, gssNAvcode), + across(get(indicators), na_if, gssNApcode), + across(get(indicators), na_if, gssSupcode), + across(get(indicators), na_if, gssRndcode), + across(get(indicators), as.numeric) + ) %>% + select(time_period, indicators) %>% + group_by(time_period) %>% + summarise( + across( + everything(), + list( + min = ~ min(.x, na.rm = TRUE), + max = ~ max(.x, na.rm = TRUE), + average = ~ round(mean(.x, na.rm = TRUE), 1), + count = ~ n(), + suppressed = ~ sum(is.na(.x)) + ) + ) + ) %>% + pivot_longer( + !time_period, + names_to = c("indicator", "measure"), + names_pattern = "(.*)_(.*)" + ) %>% + pivot_wider(names_from = "time_period") %>% + mutate(geographic_level = geographies, .before = indicator) %>% + mutate(Change = as.character(0)) for (i in 1:nrow(y)) { y[i, ncol(y)] <- (paste(y[i, 4:(ncol(y) - 1)], sep = "", collapse = ",")) @@ -981,19 +996,28 @@ server <- function(input, output, session) { filter(col_type == "Filter") %>% pull(col_name) - cf <- paste(pf, collapse = ", ") - ii <- input$geog_indicator_parameter # "number_of_pupils" - - eval(parse(text = paste0("data$mainFile %>% - mutate(across(all_of('", ii, "'), na_if, '", gssSupcode, "')) %>% - mutate(across(all_of('", ii, "'), na_if, '", gssNApcode, "')) %>% - mutate(across(all_of('", ii, "'), na_if, '", gssNAvcode, "')) %>% - mutate(across(all_of('", ii, "'), na_if, '", gssRndcode, "')) %>% - mutate(across(all_of('", ii, "'), as.numeric)) %>% - group_by(time_period,geographic_level,", cf, ") %>% - summarise(aggregate_number = sum(", ii, ")) %>% - spread(key = geographic_level, value = aggregate_number)"))) + print(pf) + print(ii) + y <- data$mainFile %>% + mutate( + across(get(ii), na_if, gssNAvcode), + across(get(ii), na_if, gssNApcode), + across(get(ii), na_if, gssSupcode), + across(get(ii), na_if, gssNAvcode), + across(get(ii), as.numeric) + ) + print(y) + y <- y %>% + summarise( + across(all_of(ii),sum), + .by=c(time_period,geographic_level,all_of(pf)) + ) + print(y) + y <- y %>% + spread(key = geographic_level, value = ii) + print(y) + return(y) } }) diff --git a/tests/shinytest/UI_tests-expected/011.json b/tests/shinytest/UI_tests-expected/011.json index c251cc57..d90fb795 100644 --- a/tests/shinytest/UI_tests-expected/011.json +++ b/tests/shinytest/UI_tests-expected/011.json @@ -80,9 +80,9 @@ }, { "name": "dt-core-bootstrap", - "version": "1.12.1", + "version": "1.13.4", "src": { - "href": "dt-core-bootstrap-1.12.1" + "href": "dt-core-bootstrap-1.13.4" }, "meta": null, "script": [ @@ -181,9 +181,9 @@ }, { "name": "dt-core-bootstrap", - "version": "1.12.1", + "version": "1.13.4", "src": { - "href": "dt-core-bootstrap-1.12.1" + "href": "dt-core-bootstrap-1.13.4" }, "meta": null, "script": [ diff --git a/tests/shinytest/UI_tests-expected/012.json b/tests/shinytest/UI_tests-expected/012.json index 78f3d6e9..5c6f8bde 100644 --- a/tests/shinytest/UI_tests-expected/012.json +++ b/tests/shinytest/UI_tests-expected/012.json @@ -55,9 +55,9 @@ }, { "name": "dt-core-bootstrap", - "version": "1.12.1", + "version": "1.13.4", "src": { - "href": "dt-core-bootstrap-1.12.1" + "href": "dt-core-bootstrap-1.13.4" }, "meta": null, "script": [ @@ -143,9 +143,9 @@ }, { "name": "dt-core-bootstrap", - "version": "1.12.1", + "version": "1.13.4", "src": { - "href": "dt-core-bootstrap-1.12.1" + "href": "dt-core-bootstrap-1.13.4" }, "meta": null, "script": [ @@ -237,9 +237,9 @@ }, { "name": "dt-core-bootstrap", - "version": "1.12.1", + "version": "1.13.4", "src": { - "href": "dt-core-bootstrap-1.12.1" + "href": "dt-core-bootstrap-1.13.4" }, "meta": null, "script": [ @@ -271,13 +271,13 @@ ] }, "tables": { - "html": "

Filter 1<\/h4>\n\n