From 80414b10a684115926bce13205d566371f2046c1 Mon Sep 17 00:00:00 2001 From: rossbowen Date: Mon, 20 Nov 2023 17:12:01 +0000 Subject: [PATCH 01/11] Fix up CPIH example --- Pipfile.lock | 281 +++++---- src/store/csv/stub/content/cpih/2022-01/1.csv | 122 ---- src/store/csv/stub/content/cpih/2023-10/1.csv | 592 ++++++++++++++++++ .../csv/stub/content/cpih/2023-10/wrangle.R | 19 + src/store/metadata/stub/content/datasets.json | 531 ++++++++-------- .../{cpih_2022-01.json => cpih_2023-10.json} | 33 +- .../editions/versions/cpih_2022-01.json | 52 -- .../editions/versions/cpih_2023-10.json | 49 ++ 8 files changed, 1074 insertions(+), 605 deletions(-) delete mode 100644 src/store/csv/stub/content/cpih/2022-01/1.csv create mode 100644 src/store/csv/stub/content/cpih/2023-10/1.csv create mode 100644 src/store/csv/stub/content/cpih/2023-10/wrangle.R rename src/store/metadata/stub/content/editions/{cpih_2022-01.json => cpih_2023-10.json} (73%) delete mode 100644 src/store/metadata/stub/content/editions/versions/cpih_2022-01.json create mode 100644 src/store/metadata/stub/content/editions/versions/cpih_2023-10.json diff --git a/Pipfile.lock b/Pipfile.lock index 1236776f..5f2d232f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -42,11 +42,11 @@ }, "certifi": { "hashes": [ - "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082", - "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9" + "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1", + "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474" ], "markers": "python_version >= '3.6'", - "version": "==2023.7.22" + "version": "==2023.11.17" }, "click": { "hashes": [ @@ -126,11 +126,11 @@ }, "httpcore": { "hashes": [ - "sha256:c5e97ef177dca2023d0b9aad98e49507ef5423e9f1d94ffe2cfe250aa28e63b0", - "sha256:fce1ddf9b606cfb98132ab58865c3728c52c8e4c3c46e2aabb3674464a186e92" + "sha256:096cc05bca73b8e459a1fc3dcf585148f63e534eae4339559c9b8a8d6399acc7", + "sha256:9fc092e4799b26174648e54b74ed5f683132a464e95643b226e00c2ed2fa6535" ], "markers": "python_version >= '3.8'", - "version": "==1.0.1" + "version": "==1.0.2" }, "httpx": { "hashes": [ @@ -256,123 +256,122 @@ }, "pydantic": { "hashes": [ - "sha256:94f336138093a5d7f426aac732dcfe7ab4eb4da243c88f891d65deb4a2556ee7", - "sha256:bc3ddf669d234f4220e6e1c4d96b061abe0998185a8d7855c0126782b7abc8c1" + "sha256:0b8be5413c06aadfbe56f6dc1d45c9ed25fd43264414c571135c97dd77c2bedb", + "sha256:dc5244a8939e0d9a68f1f1b5f550b2e1c879912033b1becbedb315accc75441b" ], "markers": "python_version >= '3.7'", - "version": "==2.4.2" + "version": "==2.5.1" }, "pydantic-core": { "hashes": [ - "sha256:042462d8d6ba707fd3ce9649e7bf268633a41018d6a998fb5fbacb7e928a183e", - "sha256:0523aeb76e03f753b58be33b26540880bac5aa54422e4462404c432230543f33", - "sha256:05560ab976012bf40f25d5225a58bfa649bb897b87192a36c6fef1ab132540d7", - "sha256:0675ba5d22de54d07bccde38997e780044dcfa9a71aac9fd7d4d7a1d2e3e65f7", - "sha256:073d4a470b195d2b2245d0343569aac7e979d3a0dcce6c7d2af6d8a920ad0bea", - "sha256:07ec6d7d929ae9c68f716195ce15e745b3e8fa122fc67698ac6498d802ed0fa4", - "sha256:0880e239827b4b5b3e2ce05e6b766a7414e5f5aedc4523be6b68cfbc7f61c5d0", - "sha256:0c27f38dc4fbf07b358b2bc90edf35e82d1703e22ff2efa4af4ad5de1b3833e7", - "sha256:0d8a8adef23d86d8eceed3e32e9cca8879c7481c183f84ed1a8edc7df073af94", - "sha256:0e2a35baa428181cb2270a15864ec6286822d3576f2ed0f4cd7f0c1708472aff", - "sha256:0f8682dbdd2f67f8e1edddcbffcc29f60a6182b4901c367fc8c1c40d30bb0a82", - "sha256:0fa467fd300a6f046bdb248d40cd015b21b7576c168a6bb20aa22e595c8ffcdd", - "sha256:128552af70a64660f21cb0eb4876cbdadf1a1f9d5de820fed6421fa8de07c893", - "sha256:1396e81b83516b9d5c9e26a924fa69164156c148c717131f54f586485ac3c15e", - "sha256:149b8a07712f45b332faee1a2258d8ef1fb4a36f88c0c17cb687f205c5dc6e7d", - "sha256:14ac492c686defc8e6133e3a2d9eaf5261b3df26b8ae97450c1647286750b901", - "sha256:14cfbb00959259e15d684505263d5a21732b31248a5dd4941f73a3be233865b9", - "sha256:14e09ff0b8fe6e46b93d36a878f6e4a3a98ba5303c76bb8e716f4878a3bee92c", - "sha256:154ea7c52e32dce13065dbb20a4a6f0cc012b4f667ac90d648d36b12007fa9f7", - "sha256:15d6bca84ffc966cc9976b09a18cf9543ed4d4ecbd97e7086f9ce9327ea48891", - "sha256:1d40f55222b233e98e3921df7811c27567f0e1a4411b93d4c5c0f4ce131bc42f", - "sha256:25bd966103890ccfa028841a8f30cebcf5875eeac8c4bde4fe221364c92f0c9a", - "sha256:2cf5bb4dd67f20f3bbc1209ef572a259027c49e5ff694fa56bed62959b41e1f9", - "sha256:2e0e2959ef5d5b8dc9ef21e1a305a21a36e254e6a34432d00c72a92fdc5ecda5", - "sha256:320f14bd4542a04ab23747ff2c8a778bde727158b606e2661349557f0770711e", - "sha256:3625578b6010c65964d177626fde80cf60d7f2e297d56b925cb5cdeda6e9925a", - "sha256:39215d809470f4c8d1881758575b2abfb80174a9e8daf8f33b1d4379357e417c", - "sha256:3f0ac9fb8608dbc6eaf17956bf623c9119b4db7dbb511650910a82e261e6600f", - "sha256:417243bf599ba1f1fef2bb8c543ceb918676954734e2dcb82bf162ae9d7bd514", - "sha256:420a692b547736a8d8703c39ea935ab5d8f0d2573f8f123b0a294e49a73f214b", - "sha256:443fed67d33aa85357464f297e3d26e570267d1af6fef1c21ca50921d2976302", - "sha256:48525933fea744a3e7464c19bfede85df4aba79ce90c60b94d8b6e1eddd67096", - "sha256:485a91abe3a07c3a8d1e082ba29254eea3e2bb13cbbd4351ea4e5a21912cc9b0", - "sha256:4a5be350f922430997f240d25f8219f93b0c81e15f7b30b868b2fddfc2d05f27", - "sha256:4d966c47f9dd73c2d32a809d2be529112d509321c5310ebf54076812e6ecd884", - "sha256:524ff0ca3baea164d6d93a32c58ac79eca9f6cf713586fdc0adb66a8cdeab96a", - "sha256:53df009d1e1ba40f696f8995683e067e3967101d4bb4ea6f667931b7d4a01357", - "sha256:5994985da903d0b8a08e4935c46ed8daf5be1cf217489e673910951dc533d430", - "sha256:5cabb9710f09d5d2e9e2748c3e3e20d991a4c5f96ed8f1132518f54ab2967221", - "sha256:5fdb39f67c779b183b0c853cd6b45f7db84b84e0571b3ef1c89cdb1dfc367325", - "sha256:600d04a7b342363058b9190d4e929a8e2e715c5682a70cc37d5ded1e0dd370b4", - "sha256:631cb7415225954fdcc2a024119101946793e5923f6c4d73a5914d27eb3d3a05", - "sha256:63974d168b6233b4ed6a0046296803cb13c56637a7b8106564ab575926572a55", - "sha256:64322bfa13e44c6c30c518729ef08fda6026b96d5c0be724b3c4ae4da939f875", - "sha256:655f8f4c8d6a5963c9a0687793da37b9b681d9ad06f29438a3b2326d4e6b7970", - "sha256:6835451b57c1b467b95ffb03a38bb75b52fb4dc2762bb1d9dbed8de31ea7d0fc", - "sha256:6db2eb9654a85ada248afa5a6db5ff1cf0f7b16043a6b070adc4a5be68c716d6", - "sha256:7c4d1894fe112b0864c1fa75dffa045720a194b227bed12f4be7f6045b25209f", - "sha256:7eb037106f5c6b3b0b864ad226b0b7ab58157124161d48e4b30c4a43fef8bc4b", - "sha256:8282bab177a9a3081fd3d0a0175a07a1e2bfb7fcbbd949519ea0980f8a07144d", - "sha256:82f55187a5bebae7d81d35b1e9aaea5e169d44819789837cdd4720d768c55d15", - "sha256:8572cadbf4cfa95fb4187775b5ade2eaa93511f07947b38f4cd67cf10783b118", - "sha256:8cdbbd92154db2fec4ec973d45c565e767ddc20aa6dbaf50142676484cbff8ee", - "sha256:8f6e6aed5818c264412ac0598b581a002a9f050cb2637a84979859e70197aa9e", - "sha256:92f675fefa977625105708492850bcbc1182bfc3e997f8eecb866d1927c98ae6", - "sha256:962ed72424bf1f72334e2f1e61b68f16c0e596f024ca7ac5daf229f7c26e4208", - "sha256:9badf8d45171d92387410b04639d73811b785b5161ecadabf056ea14d62d4ede", - "sha256:9c120c9ce3b163b985a3b966bb701114beb1da4b0468b9b236fc754783d85aa3", - "sha256:9f6f3e2598604956480f6c8aa24a3384dbf6509fe995d97f6ca6103bb8c2534e", - "sha256:a1254357f7e4c82e77c348dabf2d55f1d14d19d91ff025004775e70a6ef40ada", - "sha256:a1392e0638af203cee360495fd2cfdd6054711f2db5175b6e9c3c461b76f5175", - "sha256:a1c311fd06ab3b10805abb72109f01a134019739bd3286b8ae1bc2fc4e50c07a", - "sha256:a5cb87bdc2e5f620693148b5f8f842d293cae46c5f15a1b1bf7ceeed324a740c", - "sha256:a7a7902bf75779bc12ccfc508bfb7a4c47063f748ea3de87135d433a4cca7a2f", - "sha256:aad7bd686363d1ce4ee930ad39f14e1673248373f4a9d74d2b9554f06199fb58", - "sha256:aafdb89fdeb5fe165043896817eccd6434aee124d5ee9b354f92cd574ba5e78f", - "sha256:ae8a8843b11dc0b03b57b52793e391f0122e740de3df1474814c700d2622950a", - "sha256:b00bc4619f60c853556b35f83731bd817f989cba3e97dc792bb8c97941b8053a", - "sha256:b1f22a9ab44de5f082216270552aa54259db20189e68fc12484873d926426921", - "sha256:b3c01c2fb081fced3bbb3da78510693dc7121bb893a1f0f5f4b48013201f362e", - "sha256:b3dcd587b69bbf54fc04ca157c2323b8911033e827fffaecf0cafa5a892a0904", - "sha256:b4a6db486ac8e99ae696e09efc8b2b9fea67b63c8f88ba7a1a16c24a057a0776", - "sha256:bec7dd208a4182e99c5b6c501ce0b1f49de2802448d4056091f8e630b28e9a52", - "sha256:c0877239307b7e69d025b73774e88e86ce82f6ba6adf98f41069d5b0b78bd1bf", - "sha256:caa48fc31fc7243e50188197b5f0c4228956f97b954f76da157aae7f67269ae8", - "sha256:cfe1090245c078720d250d19cb05d67e21a9cd7c257698ef139bc41cf6c27b4f", - "sha256:d43002441932f9a9ea5d6f9efaa2e21458221a3a4b417a14027a1d530201ef1b", - "sha256:d64728ee14e667ba27c66314b7d880b8eeb050e58ffc5fec3b7a109f8cddbd63", - "sha256:d6495008733c7521a89422d7a68efa0a0122c99a5861f06020ef5b1f51f9ba7c", - "sha256:d8f1ebca515a03e5654f88411420fea6380fc841d1bea08effb28184e3d4899f", - "sha256:d99277877daf2efe074eae6338453a4ed54a2d93fb4678ddfe1209a0c93a2468", - "sha256:da01bec0a26befab4898ed83b362993c844b9a607a86add78604186297eb047e", - "sha256:db9a28c063c7c00844ae42a80203eb6d2d6bbb97070cfa00194dff40e6f545ab", - "sha256:dda81e5ec82485155a19d9624cfcca9be88a405e2857354e5b089c2a982144b2", - "sha256:e357571bb0efd65fd55f18db0a2fb0ed89d0bb1d41d906b138f088933ae618bb", - "sha256:e544246b859f17373bed915182ab841b80849ed9cf23f1f07b73b7c58baee5fb", - "sha256:e562617a45b5a9da5be4abe72b971d4f00bf8555eb29bb91ec2ef2be348cd132", - "sha256:e570ffeb2170e116a5b17e83f19911020ac79d19c96f320cbfa1fa96b470185b", - "sha256:e6f31a17acede6a8cd1ae2d123ce04d8cca74056c9d456075f4f6f85de055607", - "sha256:e9121b4009339b0f751955baf4543a0bfd6bc3f8188f8056b1a25a2d45099934", - "sha256:ebedb45b9feb7258fac0a268a3f6bec0a2ea4d9558f3d6f813f02ff3a6dc6698", - "sha256:ecaac27da855b8d73f92123e5f03612b04c5632fd0a476e469dfc47cd37d6b2e", - "sha256:ecdbde46235f3d560b18be0cb706c8e8ad1b965e5c13bbba7450c86064e96561", - "sha256:ed550ed05540c03f0e69e6d74ad58d026de61b9eaebebbaaf8873e585cbb18de", - "sha256:eeb3d3d6b399ffe55f9a04e09e635554012f1980696d6b0aca3e6cf42a17a03b", - "sha256:ef337945bbd76cce390d1b2496ccf9f90b1c1242a3a7bc242ca4a9fc5993427a", - "sha256:f1365e032a477c1430cfe0cf2856679529a2331426f8081172c4a74186f1d595", - "sha256:f23b55eb5464468f9e0e9a9935ce3ed2a870608d5f534025cd5536bca25b1402", - "sha256:f2e9072d71c1f6cfc79a36d4484c82823c560e6f5599c43c1ca6b5cdbd54f881", - "sha256:f323306d0556351735b54acbf82904fe30a27b6a7147153cbe6e19aaaa2aa429", - "sha256:f36a3489d9e28fe4b67be9992a23029c3cec0babc3bd9afb39f49844a8c721c5", - "sha256:f64f82cc3443149292b32387086d02a6c7fb39b8781563e0ca7b8d7d9cf72bd7", - "sha256:f6defd966ca3b187ec6c366604e9296f585021d922e666b99c47e78738b5666c", - "sha256:f7c2b8eb9fc872e68b46eeaf835e86bccc3a58ba57d0eedc109cbb14177be531", - "sha256:fa7db7558607afeccb33c0e4bf1c9a9a835e26599e76af6fe2fcea45904083a6", - "sha256:fcb83175cc4936a5425dde3356f079ae03c0802bbdf8ff82c035f8a54b333521" + "sha256:056ea7cc3c92a7d2a14b5bc9c9fa14efa794d9f05b9794206d089d06d3433dc7", + "sha256:0653fb9fc2fa6787f2fa08631314ab7fc8070307bd344bf9471d1b7207c24623", + "sha256:076edc972b68a66870cec41a4efdd72a6b655c4098a232314b02d2bfa3bfa157", + "sha256:0a3e51c2be472b7867eb0c5d025b91400c2b73a0823b89d4303a9097e2ec6655", + "sha256:0c7f8e8a7cf8e81ca7d44bea4f181783630959d41b4b51d2f74bc50f348a090f", + "sha256:10904368261e4509c091cbcc067e5a88b070ed9a10f7ad78f3029c175487490f", + "sha256:113752a55a8eaece2e4ac96bc8817f134c2c23477e477d085ba89e3aa0f4dc44", + "sha256:12e05a76b223577a4696c76d7a6b36a0ccc491ffb3c6a8cf92d8001d93ddfd63", + "sha256:136bc7247e97a921a020abbd6ef3169af97569869cd6eff41b6a15a73c44ea9b", + "sha256:1582f01eaf0537a696c846bea92082082b6bfc1103a88e777e983ea9fbdc2a0f", + "sha256:1767bd3f6370458e60c1d3d7b1d9c2751cc1ad743434e8ec84625a610c8b9195", + "sha256:1e2979dc80246e18e348de51246d4c9b410186ffa3c50e77924bec436b1e36cb", + "sha256:1ea992659c03c3ea811d55fc0a997bec9dde863a617cc7b25cfde69ef32e55af", + "sha256:1f2d4516c32255782153e858f9a900ca6deadfb217fd3fb21bb2b60b4e04d04d", + "sha256:2494d20e4c22beac30150b4be3b8339bf2a02ab5580fa6553ca274bc08681a65", + "sha256:260692420028319e201b8649b13ac0988974eeafaaef95d0dfbf7120c38dc000", + "sha256:2646f8270f932d79ba61102a15ea19a50ae0d43b314e22b3f8f4b5fabbfa6e38", + "sha256:27828f0227b54804aac6fb077b6bb48e640b5435fdd7fbf0c274093a7b78b69c", + "sha256:2bc736725f9bd18a60eec0ed6ef9b06b9785454c8d0105f2be16e4d6274e63d0", + "sha256:2c08ac60c3caa31f825b5dbac47e4875bd4954d8f559650ad9e0b225eaf8ed0c", + "sha256:2c83892c7bf92b91d30faca53bb8ea21f9d7e39f0ae4008ef2c2f91116d0464a", + "sha256:354db020b1f8f11207b35360b92d95725621eb92656725c849a61e4b550f4acc", + "sha256:364dba61494e48f01ef50ae430e392f67ee1ee27e048daeda0e9d21c3ab2d609", + "sha256:37dad73a2f82975ed563d6a277fd9b50e5d9c79910c4aec787e2d63547202315", + "sha256:38113856c7fad8c19be7ddd57df0c3e77b1b2336459cb03ee3903ce9d5e236ce", + "sha256:38aed5a1bbc3025859f56d6a32f6e53ca173283cb95348e03480f333b1091e7d", + "sha256:3ad083df8fe342d4d8d00cc1d3c1a23f0dc84fce416eb301e69f1ddbbe124d3f", + "sha256:3c1bf1a7b05a65d3b37a9adea98e195e0081be6b17ca03a86f92aeb8b110f468", + "sha256:3d1dde10bd9962b1434053239b1d5490fc31a2b02d8950a5f731bc584c7a5a0f", + "sha256:44aaf1a07ad0824e407dafc637a852e9a44d94664293bbe7d8ee549c356c8882", + "sha256:44afa3c18d45053fe8d8228950ee4c8eaf3b5a7f3b64963fdeac19b8342c987f", + "sha256:4a70d23eedd88a6484aa79a732a90e36701048a1509078d1b59578ef0ea2cdf5", + "sha256:4aa89919fbd8a553cd7d03bf23d5bc5deee622e1b5db572121287f0e64979476", + "sha256:4cc6bb11f4e8e5ed91d78b9880774fbc0856cb226151b0a93b549c2b26a00c19", + "sha256:536e1f58419e1ec35f6d1310c88496f0d60e4f182cacb773d38076f66a60b149", + "sha256:5402ee0f61e7798ea93a01b0489520f2abfd9b57b76b82c93714c4318c66ca06", + "sha256:56814b41486e2d712a8bc02a7b1f17b87fa30999d2323bbd13cf0e52296813a1", + "sha256:5b73441a1159f1fb37353aaefb9e801ab35a07dd93cb8177504b25a317f4215a", + "sha256:61beaa79d392d44dc19d6f11ccd824d3cccb865c4372157c40b92533f8d76dd0", + "sha256:6c2d118d1b6c9e2d577e215567eedbe11804c3aafa76d39ec1f8bc74e918fd07", + "sha256:6e2f9d76c00e805d47f19c7a96a14e4135238a7551a18bfd89bb757993fd0933", + "sha256:71ed769b58d44e0bc2701aa59eb199b6665c16e8a5b8b4a84db01f71580ec448", + "sha256:7349f99f1ef8b940b309179733f2cad2e6037a29560f1b03fdc6aa6be0a8d03c", + "sha256:75f3f534f33651b73f4d3a16d0254de096f43737d51e981478d580f4b006b427", + "sha256:76fc18653a5c95e5301a52d1b5afb27c9adc77175bf00f73e94f501caf0e05ad", + "sha256:7cb0c397f29688a5bd2c0dbd44451bc44ebb9b22babc90f97db5ec3e5bb69977", + "sha256:7cc24728a1a9cef497697e53b3d085fb4d3bc0ef1ef4d9b424d9cf808f52c146", + "sha256:7e63a56eb7fdee1587d62f753ccd6d5fa24fbeea57a40d9d8beaef679a24bdd6", + "sha256:832d16f248ca0cc96929139734ec32d21c67669dcf8a9f3f733c85054429c012", + "sha256:8488e973547e8fb1b4193fd9faf5236cf1b7cd5e9e6dc7ff6b4d9afdc4c720cb", + "sha256:849cff945284c577c5f621d2df76ca7b60f803cc8663ff01b778ad0af0e39bb9", + "sha256:88ec906eb2d92420f5b074f59cf9e50b3bb44f3cb70e6512099fdd4d88c2f87c", + "sha256:8d3b9c91eeb372a64ec6686c1402afd40cc20f61a0866850f7d989b6bf39a41a", + "sha256:8f5624f0f67f2b9ecaa812e1dfd2e35b256487566585160c6c19268bf2ffeccc", + "sha256:905a12bf088d6fa20e094f9a477bf84bd823651d8b8384f59bcd50eaa92e6a52", + "sha256:92486a04d54987054f8b4405a9af9d482e5100d6fe6374fc3303015983fc8bda", + "sha256:96eb10ef8920990e703da348bb25fedb8b8653b5966e4e078e5be382b430f9e0", + "sha256:96fb679c7ca12a512d36d01c174a4fbfd912b5535cc722eb2c010c7b44eceb8e", + "sha256:98d8b3932f1a369364606417ded5412c4ffb15bedbcf797c31317e55bd5d920e", + "sha256:9dbab442a8d9ca918b4ed99db8d89d11b1f067a7dadb642476ad0889560dac79", + "sha256:9ef3e2e407e4cad2df3c89488a761ed1f1c33f3b826a2ea9a411b0a7d1cccf1b", + "sha256:9ff737f24b34ed26de62d481ef522f233d3c5927279f6b7229de9b0deb3f76b5", + "sha256:a1a39fecb5f0b19faee9a8a8176c805ed78ce45d760259a4ff3d21a7daa4dfc1", + "sha256:a402ae1066be594701ac45661278dc4a466fb684258d1a2c434de54971b006ca", + "sha256:a5c51460ede609fbb4fa883a8fe16e749964ddb459966d0518991ec02eb8dfb9", + "sha256:a8ca13480ce16daad0504be6ce893b0ee8ec34cd43b993b754198a89e2787f7e", + "sha256:ab4a2381005769a4af2ffddae74d769e8a4aae42e970596208ec6d615c6fb080", + "sha256:aeafc7f5bbddc46213707266cadc94439bfa87ecf699444de8be044d6d6eb26f", + "sha256:aecd5ed096b0e5d93fb0367fd8f417cef38ea30b786f2501f6c34eabd9062c38", + "sha256:af452e69446fadf247f18ac5d153b1f7e61ef708f23ce85d8c52833748c58075", + "sha256:af46f0b7a1342b49f208fed31f5a83b8495bb14b652f621e0a6787d2f10f24ee", + "sha256:b02b5e1f54c3396c48b665050464803c23c685716eb5d82a1d81bf81b5230da4", + "sha256:b28996872b48baf829ee75fa06998b607c66a4847ac838e6fd7473a6b2ab68e7", + "sha256:b7692f539a26265cece1e27e366df5b976a6db6b1f825a9e0466395b314ee48b", + "sha256:ba44fad1d114539d6a1509966b20b74d2dec9a5b0ee12dd7fd0a1bb7b8785e5f", + "sha256:bf15145b1f8056d12c67255cd3ce5d317cd4450d5ee747760d8d088d85d12a2d", + "sha256:c3dc2920cc96f9aa40c6dc54256e436cc95c0a15562eb7bd579e1811593c377e", + "sha256:c54af5069da58ea643ad34ff32fd6bc4eebb8ae0fef9821cd8919063e0aeeaab", + "sha256:c5ea0153482e5b4d601c25465771c7267c99fddf5d3f3bdc238ef930e6d051cf", + "sha256:c9ffd823c46e05ef3eb28b821aa7bc501efa95ba8880b4a1380068e32c5bed47", + "sha256:ca55c9671bb637ce13d18ef352fd32ae7aba21b4402f300a63f1fb1fd18e0364", + "sha256:caa94726791e316f0f63049ee00dff3b34a629b0d099f3b594770f7d0d8f1f56", + "sha256:cc956f78651778ec1ab105196e90e0e5f5275884793ab67c60938c75bcca3989", + "sha256:ccbf355b7276593c68fa824030e68cb29f630c50e20cb11ebb0ee450ae6b3d08", + "sha256:cf08b43d1d5d1678f295f0431a4a7e1707d4652576e1d0f8914b5e0213bfeee5", + "sha256:d06c78074646111fb01836585f1198367b17d57c9f427e07aaa9ff499003e58d", + "sha256:d2b53e1f851a2b406bbb5ac58e16c4a5496038eddd856cc900278fa0da97f3fc", + "sha256:d41df8e10b094640a6b234851b624b76a41552f637b9fb34dc720b9fe4ef3be4", + "sha256:d7abd17a838a52140e3aeca271054e321226f52df7e0a9f0da8f91ea123afe98", + "sha256:de52ddfa6e10e892d00f747bf7135d7007302ad82e243cf16d89dd77b03b649d", + "sha256:df33902464410a1f1a0411a235f0a34e7e129f12cb6340daca0f9d1390f5fe10", + "sha256:e16aaf788f1de5a85c8f8fcc9c1ca1dd7dd52b8ad30a7889ca31c7c7606615b8", + "sha256:e3ad4968711fb379a67c8c755beb4dae8b721a83737737b7bcee27c05400b047", + "sha256:e483b8b913fcd3b48badec54185c150cb7ab0e6487914b84dc7cde2365e0c892", + "sha256:e71f666c3bf019f2490a47dddb44c3ccea2e69ac882f7495c68dc14d4065eac2", + "sha256:ea1498ce4491236d1cffa0eee9ad0968b6ecb0c1cd711699c5677fc689905f00", + "sha256:eaab9dc009e22726c62fe3b850b797e7f0e7ba76d245284d1064081f512c7226", + "sha256:ec79dbe23702795944d2ae4c6925e35a075b88acd0d20acde7c77a817ebbce94", + "sha256:f1b92e72babfd56585c75caf44f0b15258c58e6be23bc33f90885cebffde3400", + "sha256:f1f46700402312bdc31912f6fc17f5ecaaaa3bafe5487c48f07c800052736289", + "sha256:f518eac285c9632be337323eef9824a856f2680f943a9b68ac41d5f5bad7df7c", + "sha256:f86f20a9d5bee1a6ede0f2757b917bac6908cde0f5ad9fcb3606db1e2968bcf5", + "sha256:f8fc652c354d3362e2932a79d5ac4bbd7170757a41a62c4fe0f057d29f10bebb", + "sha256:fe272a72c7ed29f84c42fedd2d06c2f9858dc0c00dae3b34ba15d6d8ae0fbaaf", + "sha256:fe863491664c6720d65ae438d4efaa5eca766565a53adb53bf14bc3246c72fe0" ], "markers": "python_version >= '3.7'", - "version": "==2.10.1" + "version": "==2.14.3" }, "pyld": { "hashes": [ @@ -402,7 +401,7 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==1.16.0" }, "sniffio": { @@ -484,11 +483,11 @@ }, "certifi": { "hashes": [ - "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082", - "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9" + "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1", + "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474" ], "markers": "python_version >= '3.6'", - "version": "==2023.7.22" + "version": "==2023.11.17" }, "charset-normalizer": { "hashes": [ @@ -803,11 +802,11 @@ }, "platformdirs": { "hashes": [ - "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3", - "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e" + "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b", + "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731" ], "markers": "python_version >= '3.7'", - "version": "==3.11.0" + "version": "==4.0.0" }, "pluggy": { "hashes": [ @@ -918,27 +917,27 @@ }, "ruff": { "hashes": [ - "sha256:171276c1df6c07fa0597fb946139ced1c2978f4f0b8254f201281729981f3c17", - "sha256:17ef33cd0bb7316ca65649fc748acc1406dfa4da96a3d0cde6d52f2e866c7b39", - "sha256:32d47fc69261c21a4c48916f16ca272bf2f273eb635d91c65d5cd548bf1f3d96", - "sha256:5cbec0ef2ae1748fb194f420fb03fb2c25c3258c86129af7172ff8f198f125ab", - "sha256:721f4b9d3b4161df8dc9f09aa8562e39d14e55a4dbaa451a8e55bdc9590e20f4", - "sha256:82bfcb9927e88c1ed50f49ac6c9728dab3ea451212693fe40d08d314663e412f", - "sha256:9b97fd6da44d6cceb188147b68db69a5741fbc736465b5cea3928fdac0bc1aeb", - "sha256:a00a7ec893f665ed60008c70fe9eeb58d210e6b4d83ec6654a9904871f982a2a", - "sha256:a4894dddb476597a0ba4473d72a23151b8b3b0b5f958f2cf4d3f1c572cdb7af7", - "sha256:a8c11206b47f283cbda399a654fd0178d7a389e631f19f51da15cbe631480c5b", - "sha256:aafb9d2b671ed934998e881e2c0f5845a4295e84e719359c71c39a5363cccc91", - "sha256:b2c205827b3f8c13b4a432e9585750b93fd907986fe1aec62b2a02cf4401eee6", - "sha256:bb408e3a2ad8f6881d0f2e7ad70cddb3ed9f200eb3517a91a245bbe27101d379", - "sha256:c21fe20ee7d76206d290a76271c1af7a5096bc4c73ab9383ed2ad35f852a0087", - "sha256:f20dc5e5905ddb407060ca27267c7174f532375c08076d1a953cf7bb016f5a24", - "sha256:f80c73bba6bc69e4fdc73b3991db0b546ce641bdcd5b07210b8ad6f64c79f1ab", - "sha256:fa29e67b3284b9a79b1a85ee66e293a94ac6b7bb068b307a8a373c3d343aa8ec" + "sha256:03910e81df0d8db0e30050725a5802441c2022ea3ae4fe0609b76081731accbc", + "sha256:05991ee20d4ac4bb78385360c684e4b417edd971030ab12a4fbd075ff535050e", + "sha256:137852105586dcbf80c1717facb6781555c4e99f520c9c827bd414fac67ddfb6", + "sha256:1610e14750826dfc207ccbcdd7331b6bd285607d4181df9c1c6ae26646d6848a", + "sha256:1b09f29b16c6ead5ea6b097ef2764b42372aebe363722f1605ecbcd2b9207184", + "sha256:1cf5f701062e294f2167e66d11b092bba7af6a057668ed618a9253e1e90cfd76", + "sha256:3a0cd909d25f227ac5c36d4e7e681577275fb74ba3b11d288aff7ec47e3ae745", + "sha256:4558b3e178145491e9bc3b2ee3c4b42f19d19384eaa5c59d10acf6e8f8b57e33", + "sha256:491262006e92f825b145cd1e52948073c56560243b55fb3b4ecb142f6f0e9543", + "sha256:5c549ed437680b6105a1299d2cd30e4964211606eeb48a0ff7a93ef70b902248", + "sha256:683aa5bdda5a48cb8266fcde8eea2a6af4e5700a392c56ea5fb5f0d4bfdc0240", + "sha256:87455a0c1f739b3c069e2f4c43b66479a54dea0276dd5d4d67b091265f6fd1dc", + "sha256:88b8cdf6abf98130991cbc9f6438f35f6e8d41a02622cc5ee130a02a0ed28703", + "sha256:bd98138a98d48a1c36c394fd6b84cd943ac92a08278aa8ac8c0fdefcf7138f35", + "sha256:e8fd1c62a47aa88a02707b5dd20c5ff20d035d634aa74826b42a1da77861b5ff", + "sha256:ea284789861b8b5ca9d5443591a92a397ac183d4351882ab52f6296b4fdd5462", + "sha256:fd89b45d374935829134a082617954120d7a1470a9f0ec0e7f3ead983edc48cc" ], "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==0.1.5" + "version": "==0.1.6" }, "tomli": { "hashes": [ diff --git a/src/store/csv/stub/content/cpih/2022-01/1.csv b/src/store/csv/stub/content/cpih/2022-01/1.csv deleted file mode 100644 index 0be66083..00000000 --- a/src/store/csv/stub/content/cpih/2022-01/1.csv +++ /dev/null @@ -1,122 +0,0 @@ -Period,CPIH,CPI,OOH -P1Y/2012-01-01,3.2,3.6,1.7 -P1Y/2012-02-01,3.1,3.4,1.8 -P1Y/2012-03-01,3.1,3.5,1.7 -P1Y/2012-04-01,2.8,3,1.7 -P1Y/2012-05-01,2.5,2.8,1.6 -P1Y/2012-06-01,2.3,2.4,1.6 -P1Y/2012-07-01,2.4,2.6,1.6 -P1Y/2012-08-01,2.3,2.5,1.7 -P1Y/2012-09-01,2.1,2.2,1.7 -P1Y/2012-10-01,2.4,2.7,1.6 -P1Y/2012-11-01,2.4,2.7,1.7 -P1Y/2012-12-01,2.4,2.7,1.6 -P1Y/2013-01-01,2.4,2.7,1.5 -P1Y/2013-02-01,2.5,2.8,1.5 -P1Y/2013-03-01,2.5,2.8,1.5 -P1Y/2013-04-01,2.2,2.4,1.5 -P1Y/2013-05-01,2.4,2.7,1.5 -P1Y/2013-06-01,2.6,2.9,1.4 -P1Y/2013-07-01,2.5,2.8,1.5 -P1Y/2013-08-01,2.4,2.7,1.4 -P1Y/2013-09-01,2.4,2.7,1.2 -P1Y/2013-10-01,2,2.2,1.3 -P1Y/2013-11-01,1.9,2.1,1.4 -P1Y/2013-12-01,1.9,2,1.3 -P1Y/2014-01-01,1.8,1.9,1.3 -P1Y/2014-02-01,1.6,1.7,1.3 -P1Y/2014-03-01,1.5,1.6,1.2 -P1Y/2014-04-01,1.7,1.8,1.3 -P1Y/2014-05-01,1.5,1.5,1.3 -P1Y/2014-06-01,1.8,1.9,1.4 -P1Y/2014-07-01,1.6,1.6,1.5 -P1Y/2014-08-01,1.5,1.5,1.6 -P1Y/2014-09-01,1.3,1.2,1.7 -P1Y/2014-10-01,1.3,1.3,1.7 -P1Y/2014-11-01,1.1,1,1.6 -P1Y/2014-12-01,0.7,0.5,1.7 -P1Y/2015-01-01,0.5,0.3,1.9 -P1Y/2015-02-01,0.4,0,1.9 -P1Y/2015-03-01,0.3,0,2 -P1Y/2015-04-01,0.3,-0.1,1.9 -P1Y/2015-05-01,0.4,0.1,1.8 -P1Y/2015-06-01,0.3,0,1.9 -P1Y/2015-07-01,0.5,0.1,1.8 -P1Y/2015-08-01,0.4,0,1.8 -P1Y/2015-09-01,0.2,-0.1,1.8 -P1Y/2015-10-01,0.2,-0.1,1.8 -P1Y/2015-11-01,0.4,0.1,1.9 -P1Y/2015-12-01,0.5,0.2,1.9 -P1Y/2016-01-01,0.6,0.3,2 -P1Y/2016-02-01,0.6,0.3,2 -P1Y/2016-03-01,0.8,0.5,2.1 -P1Y/2016-04-01,0.7,0.3,2.2 -P1Y/2016-05-01,0.7,0.3,2.3 -P1Y/2016-06-01,0.8,0.5,2.3 -P1Y/2016-07-01,0.9,0.6,2.4 -P1Y/2016-08-01,1,0.6,2.4 -P1Y/2016-09-01,1.3,1,2.4 -P1Y/2016-10-01,1.3,0.9,2.7 -P1Y/2016-11-01,1.5,1.2,2.6 -P1Y/2016-12-01,1.8,1.6,2.6 -P1Y/2017-01-01,1.9,1.8,2.5 -P1Y/2017-02-01,2.3,2.3,2.5 -P1Y/2017-03-01,2.3,2.3,2.4 -P1Y/2017-04-01,2.6,2.7,2.2 -P1Y/2017-05-01,2.7,2.9,2.1 -P1Y/2017-06-01,2.6,2.6,2 -P1Y/2017-07-01,2.6,2.6,2 -P1Y/2017-08-01,2.7,2.9,1.9 -P1Y/2017-09-01,2.8,3,1.9 -P1Y/2017-10-01,2.8,3,1.6 -P1Y/2017-11-01,2.8,3.1,1.5 -P1Y/2017-12-01,2.7,3,1.3 -P1Y/2018-01-01,2.7,3,1.2 -P1Y/2018-02-01,2.5,2.7,1.2 -P1Y/2018-03-01,2.3,2.5,1.2 -P1Y/2018-04-01,2.2,2.4,1.2 -P1Y/2018-05-01,2.3,2.4,1.1 -P1Y/2018-06-01,2.3,2.4,1.1 -P1Y/2018-07-01,2.3,2.5,1.1 -P1Y/2018-08-01,2.4,2.7,1 -P1Y/2018-09-01,2.2,2.4,1 -P1Y/2018-10-01,2.2,2.4,1.1 -P1Y/2018-11-01,2.2,2.3,1.1 -P1Y/2018-12-01,2,2.1,1.2 -P1Y/2019-01-01,1.8,1.8,1.1 -P1Y/2019-02-01,1.8,1.9,1.1 -P1Y/2019-03-01,1.8,1.9,1.1 -P1Y/2019-04-01,2,2.1,1.2 -P1Y/2019-05-01,1.9,2,1.2 -P1Y/2019-06-01,1.9,2,1.2 -P1Y/2019-07-01,2,2.1,1.2 -P1Y/2019-08-01,1.7,1.7,1.1 -P1Y/2019-09-01,1.7,1.7,1.1 -P1Y/2019-10-01,1.5,1.5,1.2 -P1Y/2019-11-01,1.5,1.5,1.2 -P1Y/2019-12-01,1.4,1.3,1.2 -P1Y/2020-01-01,1.8,1.8,1.3 -P1Y/2020-02-01,1.7,1.7,1.2 -P1Y/2020-03-01,1.5,1.5,1.3 -P1Y/2020-04-01,0.9,0.8,1.1 -P1Y/2020-05-01,0.7,0.5,1.1 -P1Y/2020-06-01,0.8,0.6,1.2 -P1Y/2020-07-01,1.1,1,1.1 -P1Y/2020-08-01,0.5,0.2,1.1 -P1Y/2020-09-01,0.7,0.5,1.2 -P1Y/2020-10-01,0.9,0.7,1.2 -P1Y/2020-11-01,0.6,0.3,1.2 -P1Y/2020-12-01,0.8,0.6,1.3 -P1Y/2021-01-01,0.9,0.7,1.3 -P1Y/2021-02-01,0.7,0.4,1.4 -P1Y/2021-03-01,1,0.7,1.3 -P1Y/2021-04-01,1.6,1.5,1.4 -P1Y/2021-05-01,2.1,2.1,1.5 -P1Y/2021-06-01,2.4,2.5,1.6 -P1Y/2021-07-01,2.1,2,1.6 -P1Y/2021-08-01,3,3.2,1.7 -P1Y/2021-09-01,2.9,3.1,1.8 -P1Y/2021-10-01,3.8,4.2,1.9 -P1Y/2021-11-01,4.6,5.1,2.1 -P1Y/2021-12-01,4.8,5.4,2.2 -P1Y/2022-01-01,4.9,5.5,2.4 \ No newline at end of file diff --git a/src/store/csv/stub/content/cpih/2023-10/1.csv b/src/store/csv/stub/content/cpih/2023-10/1.csv new file mode 100644 index 00000000..12383233 --- /dev/null +++ b/src/store/csv/stub/content/cpih/2023-10/1.csv @@ -0,0 +1,592 @@ +geography,geography_name,date,cpih_annual_rate +K02000001,United Kingdom,1989,5.7 +K02000001,United Kingdom,1990,8.0 +K02000001,United Kingdom,1991,7.5 +K02000001,United Kingdom,1992,4.6 +K02000001,United Kingdom,1993,2.6 +K02000001,United Kingdom,1994,2.2 +K02000001,United Kingdom,1995,2.7 +K02000001,United Kingdom,1996,2.9 +K02000001,United Kingdom,1997,2.2 +K02000001,United Kingdom,1998,1.8 +K02000001,United Kingdom,1999,1.7 +K02000001,United Kingdom,2000,1.2 +K02000001,United Kingdom,2001,1.6 +K02000001,United Kingdom,2002,1.5 +K02000001,United Kingdom,2003,1.4 +K02000001,United Kingdom,2004,1.4 +K02000001,United Kingdom,2005,2.1 +K02000001,United Kingdom,2006,2.5 +K02000001,United Kingdom,2007,2.4 +K02000001,United Kingdom,2008,3.5 +K02000001,United Kingdom,2009,2.0 +K02000001,United Kingdom,2010,2.5 +K02000001,United Kingdom,2011,3.8 +K02000001,United Kingdom,2012,2.6 +K02000001,United Kingdom,2013,2.3 +K02000001,United Kingdom,2014,1.5 +K02000001,United Kingdom,2015,0.4 +K02000001,United Kingdom,2016,1.0 +K02000001,United Kingdom,2017,2.6 +K02000001,United Kingdom,2018,2.3 +K02000001,United Kingdom,2019,1.7 +K02000001,United Kingdom,2020,1.0 +K02000001,United Kingdom,2021,2.5 +K02000001,United Kingdom,2022,7.9 +K02000001,United Kingdom,1989-Q1,5.8 +K02000001,United Kingdom,1989-Q2,5.8 +K02000001,United Kingdom,1989-Q3,5.6 +K02000001,United Kingdom,1989-Q4,5.7 +K02000001,United Kingdom,1990-Q1,6.1 +K02000001,United Kingdom,1990-Q2,8.0 +K02000001,United Kingdom,1990-Q3,8.8 +K02000001,United Kingdom,1990-Q4,9.2 +K02000001,United Kingdom,1991-Q1,8.4 +K02000001,United Kingdom,1991-Q2,7.7 +K02000001,United Kingdom,1991-Q3,7.3 +K02000001,United Kingdom,1991-Q4,6.5 +K02000001,United Kingdom,1992-Q1,6.3 +K02000001,United Kingdom,1992-Q2,5.0 +K02000001,United Kingdom,1992-Q3,4.0 +K02000001,United Kingdom,1992-Q4,3.3 +K02000001,United Kingdom,1993-Q1,3.1 +K02000001,United Kingdom,1993-Q2,2.3 +K02000001,United Kingdom,1993-Q3,2.5 +K02000001,United Kingdom,1993-Q4,2.2 +K02000001,United Kingdom,1994-Q1,2.4 +K02000001,United Kingdom,1994-Q2,2.4 +K02000001,United Kingdom,1994-Q3,2.1 +K02000001,United Kingdom,1994-Q4,2.1 +K02000001,United Kingdom,1995-Q1,2.4 +K02000001,United Kingdom,1995-Q2,2.5 +K02000001,United Kingdom,1995-Q3,2.9 +K02000001,United Kingdom,1995-Q4,3.0 +K02000001,United Kingdom,1996-Q1,3.0 +K02000001,United Kingdom,1996-Q2,2.8 +K02000001,United Kingdom,1996-Q3,2.7 +K02000001,United Kingdom,1996-Q4,2.9 +K02000001,United Kingdom,1997-Q1,2.4 +K02000001,United Kingdom,1997-Q2,2.1 +K02000001,United Kingdom,1997-Q3,2.3 +K02000001,United Kingdom,1997-Q4,2.1 +K02000001,United Kingdom,1998-Q1,1.8 +K02000001,United Kingdom,1998-Q2,2.0 +K02000001,United Kingdom,1998-Q3,1.7 +K02000001,United Kingdom,1998-Q4,1.7 +K02000001,United Kingdom,1999-Q1,2.0 +K02000001,United Kingdom,1999-Q2,1.8 +K02000001,United Kingdom,1999-Q3,1.6 +K02000001,United Kingdom,1999-Q4,1.5 +K02000001,United Kingdom,2000-Q1,1.1 +K02000001,United Kingdom,2000-Q2,1.0 +K02000001,United Kingdom,2000-Q3,1.2 +K02000001,United Kingdom,2000-Q4,1.4 +K02000001,United Kingdom,2001-Q1,1.3 +K02000001,United Kingdom,2001-Q2,1.8 +K02000001,United Kingdom,2001-Q3,1.8 +K02000001,United Kingdom,2001-Q4,1.4 +K02000001,United Kingdom,2002-Q1,1.7 +K02000001,United Kingdom,2002-Q2,1.3 +K02000001,United Kingdom,2002-Q3,1.3 +K02000001,United Kingdom,2002-Q4,1.6 +K02000001,United Kingdom,2003-Q1,1.5 +K02000001,United Kingdom,2003-Q2,1.3 +K02000001,United Kingdom,2003-Q3,1.4 +K02000001,United Kingdom,2003-Q4,1.3 +K02000001,United Kingdom,2004-Q1,1.3 +K02000001,United Kingdom,2004-Q2,1.3 +K02000001,United Kingdom,2004-Q3,1.3 +K02000001,United Kingdom,2004-Q4,1.5 +K02000001,United Kingdom,2005-Q1,1.8 +K02000001,United Kingdom,2005-Q2,1.9 +K02000001,United Kingdom,2005-Q3,2.4 +K02000001,United Kingdom,2005-Q4,2.2 +K02000001,United Kingdom,2006-Q1,2.1 +K02000001,United Kingdom,2006-Q2,2.4 +K02000001,United Kingdom,2006-Q3,2.5 +K02000001,United Kingdom,2006-Q4,2.7 +K02000001,United Kingdom,2007-Q1,2.8 +K02000001,United Kingdom,2007-Q2,2.6 +K02000001,United Kingdom,2007-Q3,2.0 +K02000001,United Kingdom,2007-Q4,2.3 +K02000001,United Kingdom,2008-Q1,2.5 +K02000001,United Kingdom,2008-Q2,3.3 +K02000001,United Kingdom,2008-Q3,4.5 +K02000001,United Kingdom,2008-Q4,3.7 +K02000001,United Kingdom,2009-Q1,2.9 +K02000001,United Kingdom,2009-Q2,2.0 +K02000001,United Kingdom,2009-Q3,1.4 +K02000001,United Kingdom,2009-Q4,1.6 +K02000001,United Kingdom,2010-Q1,2.4 +K02000001,United Kingdom,2010-Q2,2.5 +K02000001,United Kingdom,2010-Q3,2.3 +K02000001,United Kingdom,2010-Q4,2.7 +K02000001,United Kingdom,2011-Q1,3.5 +K02000001,United Kingdom,2011-Q2,3.8 +K02000001,United Kingdom,2011-Q3,4.0 +K02000001,United Kingdom,2011-Q4,4.0 +K02000001,United Kingdom,2012-Q1,3.1 +K02000001,United Kingdom,2012-Q2,2.5 +K02000001,United Kingdom,2012-Q3,2.2 +K02000001,United Kingdom,2012-Q4,2.4 +K02000001,United Kingdom,2013-Q1,2.5 +K02000001,United Kingdom,2013-Q2,2.4 +K02000001,United Kingdom,2013-Q3,2.4 +K02000001,United Kingdom,2013-Q4,1.9 +K02000001,United Kingdom,2014-Q1,1.6 +K02000001,United Kingdom,2014-Q2,1.6 +K02000001,United Kingdom,2014-Q3,1.5 +K02000001,United Kingdom,2014-Q4,1.1 +K02000001,United Kingdom,2015-Q1,0.4 +K02000001,United Kingdom,2015-Q2,0.3 +K02000001,United Kingdom,2015-Q3,0.4 +K02000001,United Kingdom,2015-Q4,0.4 +K02000001,United Kingdom,2016-Q1,0.7 +K02000001,United Kingdom,2016-Q2,0.7 +K02000001,United Kingdom,2016-Q3,1.0 +K02000001,United Kingdom,2016-Q4,1.5 +K02000001,United Kingdom,2017-Q1,2.2 +K02000001,United Kingdom,2017-Q2,2.6 +K02000001,United Kingdom,2017-Q3,2.7 +K02000001,United Kingdom,2017-Q4,2.8 +K02000001,United Kingdom,2018-Q1,2.5 +K02000001,United Kingdom,2018-Q2,2.2 +K02000001,United Kingdom,2018-Q3,2.3 +K02000001,United Kingdom,2018-Q4,2.1 +K02000001,United Kingdom,2019-Q1,1.8 +K02000001,United Kingdom,2019-Q2,2.0 +K02000001,United Kingdom,2019-Q3,1.8 +K02000001,United Kingdom,2019-Q4,1.4 +K02000001,United Kingdom,2020-Q1,1.7 +K02000001,United Kingdom,2020-Q2,0.8 +K02000001,United Kingdom,2020-Q3,0.8 +K02000001,United Kingdom,2020-Q4,0.8 +K02000001,United Kingdom,2021-Q1,0.9 +K02000001,United Kingdom,2021-Q2,2.1 +K02000001,United Kingdom,2021-Q3,2.7 +K02000001,United Kingdom,2021-Q4,4.4 +K02000001,United Kingdom,2022-Q1,5.5 +K02000001,United Kingdom,2022-Q2,7.9 +K02000001,United Kingdom,2022-Q3,8.7 +K02000001,United Kingdom,2022-Q4,9.4 +K02000001,United Kingdom,2023-Q1,9.0 +K02000001,United Kingdom,2023-Q2,7.7 +K02000001,United Kingdom,2023-Q3,6.3 +K02000001,United Kingdom,1989-01,5.7 +K02000001,United Kingdom,1989-02,5.8 +K02000001,United Kingdom,1989-03,5.9 +K02000001,United Kingdom,1989-04,5.6 +K02000001,United Kingdom,1989-05,5.9 +K02000001,United Kingdom,1989-06,5.8 +K02000001,United Kingdom,1989-07,5.7 +K02000001,United Kingdom,1989-08,5.5 +K02000001,United Kingdom,1989-09,5.7 +K02000001,United Kingdom,1989-10,5.8 +K02000001,United Kingdom,1989-11,5.7 +K02000001,United Kingdom,1989-12,5.8 +K02000001,United Kingdom,1990-01,5.9 +K02000001,United Kingdom,1990-02,6.3 +K02000001,United Kingdom,1990-03,6.2 +K02000001,United Kingdom,1990-04,7.7 +K02000001,United Kingdom,1990-05,8.2 +K02000001,United Kingdom,1990-06,8.2 +K02000001,United Kingdom,1990-07,8.2 +K02000001,United Kingdom,1990-08,8.9 +K02000001,United Kingdom,1990-09,9.2 +K02000001,United Kingdom,1990-10,9.2 +K02000001,United Kingdom,1990-11,9.2 +K02000001,United Kingdom,1990-12,9.2 +K02000001,United Kingdom,1991-01,8.6 +K02000001,United Kingdom,1991-02,8.2 +K02000001,United Kingdom,1991-03,8.3 +K02000001,United Kingdom,1991-04,8.0 +K02000001,United Kingdom,1991-05,7.5 +K02000001,United Kingdom,1991-06,7.7 +K02000001,United Kingdom,1991-07,7.5 +K02000001,United Kingdom,1991-08,7.5 +K02000001,United Kingdom,1991-09,6.9 +K02000001,United Kingdom,1991-10,6.5 +K02000001,United Kingdom,1991-11,6.5 +K02000001,United Kingdom,1991-12,6.5 +K02000001,United Kingdom,1992-01,6.2 +K02000001,United Kingdom,1992-02,6.3 +K02000001,United Kingdom,1992-03,6.2 +K02000001,United Kingdom,1992-04,5.2 +K02000001,United Kingdom,1992-05,5.1 +K02000001,United Kingdom,1992-06,4.6 +K02000001,United Kingdom,1992-07,4.5 +K02000001,United Kingdom,1992-08,3.7 +K02000001,United Kingdom,1992-09,3.7 +K02000001,United Kingdom,1992-10,3.5 +K02000001,United Kingdom,1992-11,3.3 +K02000001,United Kingdom,1992-12,3.2 +K02000001,United Kingdom,1993-01,3.0 +K02000001,United Kingdom,1993-02,3.1 +K02000001,United Kingdom,1993-03,3.2 +K02000001,United Kingdom,1993-04,2.6 +K02000001,United Kingdom,1993-05,2.3 +K02000001,United Kingdom,1993-06,2.2 +K02000001,United Kingdom,1993-07,2.3 +K02000001,United Kingdom,1993-08,2.6 +K02000001,United Kingdom,1993-09,2.7 +K02000001,United Kingdom,1993-10,2.4 +K02000001,United Kingdom,1993-11,2.1 +K02000001,United Kingdom,1993-12,2.3 +K02000001,United Kingdom,1994-01,2.6 +K02000001,United Kingdom,1994-02,2.4 +K02000001,United Kingdom,1994-03,2.2 +K02000001,United Kingdom,1994-04,2.4 +K02000001,United Kingdom,1994-05,2.4 +K02000001,United Kingdom,1994-06,2.3 +K02000001,United Kingdom,1994-07,2.1 +K02000001,United Kingdom,1994-08,2.2 +K02000001,United Kingdom,1994-09,1.9 +K02000001,United Kingdom,1994-10,1.8 +K02000001,United Kingdom,1994-11,2.1 +K02000001,United Kingdom,1994-12,2.2 +K02000001,United Kingdom,1995-01,2.4 +K02000001,United Kingdom,1995-02,2.3 +K02000001,United Kingdom,1995-03,2.4 +K02000001,United Kingdom,1995-04,2.3 +K02000001,United Kingdom,1995-05,2.6 +K02000001,United Kingdom,1995-06,2.7 +K02000001,United Kingdom,1995-07,2.8 +K02000001,United Kingdom,1995-08,2.7 +K02000001,United Kingdom,1995-09,3.0 +K02000001,United Kingdom,1995-10,3.0 +K02000001,United Kingdom,1995-11,2.9 +K02000001,United Kingdom,1995-12,3.1 +K02000001,United Kingdom,1996-01,2.9 +K02000001,United Kingdom,1996-02,3.0 +K02000001,United Kingdom,1996-03,3.0 +K02000001,United Kingdom,1996-04,2.8 +K02000001,United Kingdom,1996-05,2.8 +K02000001,United Kingdom,1996-06,2.8 +K02000001,United Kingdom,1996-07,2.7 +K02000001,United Kingdom,1996-08,2.7 +K02000001,United Kingdom,1996-09,2.7 +K02000001,United Kingdom,1996-10,3.0 +K02000001,United Kingdom,1996-11,3.1 +K02000001,United Kingdom,1996-12,2.8 +K02000001,United Kingdom,1997-01,2.6 +K02000001,United Kingdom,1997-02,2.4 +K02000001,United Kingdom,1997-03,2.2 +K02000001,United Kingdom,1997-04,2.1 +K02000001,United Kingdom,1997-05,2.1 +K02000001,United Kingdom,1997-06,2.1 +K02000001,United Kingdom,1997-07,2.4 +K02000001,United Kingdom,1997-08,2.3 +K02000001,United Kingdom,1997-09,2.2 +K02000001,United Kingdom,1997-10,2.2 +K02000001,United Kingdom,1997-11,2.1 +K02000001,United Kingdom,1997-12,1.9 +K02000001,United Kingdom,1998-01,1.8 +K02000001,United Kingdom,1998-02,1.8 +K02000001,United Kingdom,1998-03,1.9 +K02000001,United Kingdom,1998-04,2.1 +K02000001,United Kingdom,1998-05,2.2 +K02000001,United Kingdom,1998-06,1.9 +K02000001,United Kingdom,1998-07,1.7 +K02000001,United Kingdom,1998-08,1.6 +K02000001,United Kingdom,1998-09,1.7 +K02000001,United Kingdom,1998-10,1.6 +K02000001,United Kingdom,1998-11,1.7 +K02000001,United Kingdom,1998-12,1.9 +K02000001,United Kingdom,1999-01,2.0 +K02000001,United Kingdom,1999-02,1.9 +K02000001,United Kingdom,1999-03,2.1 +K02000001,United Kingdom,1999-04,2.0 +K02000001,United Kingdom,1999-05,1.7 +K02000001,United Kingdom,1999-06,1.8 +K02000001,United Kingdom,1999-07,1.7 +K02000001,United Kingdom,1999-08,1.6 +K02000001,United Kingdom,1999-09,1.6 +K02000001,United Kingdom,1999-10,1.5 +K02000001,United Kingdom,1999-11,1.5 +K02000001,United Kingdom,1999-12,1.5 +K02000001,United Kingdom,2000-01,1.2 +K02000001,United Kingdom,2000-02,1.2 +K02000001,United Kingdom,2000-03,1.0 +K02000001,United Kingdom,2000-04,0.9 +K02000001,United Kingdom,2000-05,1.0 +K02000001,United Kingdom,2000-06,1.2 +K02000001,United Kingdom,2000-07,1.2 +K02000001,United Kingdom,2000-08,1.0 +K02000001,United Kingdom,2000-09,1.3 +K02000001,United Kingdom,2000-10,1.4 +K02000001,United Kingdom,2000-11,1.5 +K02000001,United Kingdom,2000-12,1.2 +K02000001,United Kingdom,2001-01,1.2 +K02000001,United Kingdom,2001-02,1.2 +K02000001,United Kingdom,2001-03,1.3 +K02000001,United Kingdom,2001-04,1.5 +K02000001,United Kingdom,2001-05,1.9 +K02000001,United Kingdom,2001-06,1.9 +K02000001,United Kingdom,2001-07,1.7 +K02000001,United Kingdom,2001-08,2.1 +K02000001,United Kingdom,2001-09,1.7 +K02000001,United Kingdom,2001-10,1.6 +K02000001,United Kingdom,2001-11,1.2 +K02000001,United Kingdom,2001-12,1.4 +K02000001,United Kingdom,2002-01,1.8 +K02000001,United Kingdom,2002-02,1.7 +K02000001,United Kingdom,2002-03,1.7 +K02000001,United Kingdom,2002-04,1.6 +K02000001,United Kingdom,2002-05,1.2 +K02000001,United Kingdom,2002-06,1.1 +K02000001,United Kingdom,2002-07,1.4 +K02000001,United Kingdom,2002-08,1.3 +K02000001,United Kingdom,2002-09,1.2 +K02000001,United Kingdom,2002-10,1.5 +K02000001,United Kingdom,2002-11,1.6 +K02000001,United Kingdom,2002-12,1.7 +K02000001,United Kingdom,2003-01,1.4 +K02000001,United Kingdom,2003-02,1.6 +K02000001,United Kingdom,2003-03,1.6 +K02000001,United Kingdom,2003-04,1.5 +K02000001,United Kingdom,2003-05,1.3 +K02000001,United Kingdom,2003-06,1.2 +K02000001,United Kingdom,2003-07,1.3 +K02000001,United Kingdom,2003-08,1.4 +K02000001,United Kingdom,2003-09,1.3 +K02000001,United Kingdom,2003-10,1.3 +K02000001,United Kingdom,2003-11,1.3 +K02000001,United Kingdom,2003-12,1.3 +K02000001,United Kingdom,2004-01,1.5 +K02000001,United Kingdom,2004-02,1.4 +K02000001,United Kingdom,2004-03,1.2 +K02000001,United Kingdom,2004-04,1.1 +K02000001,United Kingdom,2004-05,1.4 +K02000001,United Kingdom,2004-06,1.5 +K02000001,United Kingdom,2004-07,1.4 +K02000001,United Kingdom,2004-08,1.4 +K02000001,United Kingdom,2004-09,1.2 +K02000001,United Kingdom,2004-10,1.3 +K02000001,United Kingdom,2004-11,1.5 +K02000001,United Kingdom,2004-12,1.8 +K02000001,United Kingdom,2005-01,1.7 +K02000001,United Kingdom,2005-02,1.7 +K02000001,United Kingdom,2005-03,2.0 +K02000001,United Kingdom,2005-04,1.9 +K02000001,United Kingdom,2005-05,1.9 +K02000001,United Kingdom,2005-06,2.0 +K02000001,United Kingdom,2005-07,2.3 +K02000001,United Kingdom,2005-08,2.4 +K02000001,United Kingdom,2005-09,2.5 +K02000001,United Kingdom,2005-10,2.4 +K02000001,United Kingdom,2005-11,2.2 +K02000001,United Kingdom,2005-12,2.1 +K02000001,United Kingdom,2006-01,2.2 +K02000001,United Kingdom,2006-02,2.2 +K02000001,United Kingdom,2006-03,2.0 +K02000001,United Kingdom,2006-04,2.2 +K02000001,United Kingdom,2006-05,2.4 +K02000001,United Kingdom,2006-06,2.6 +K02000001,United Kingdom,2006-07,2.5 +K02000001,United Kingdom,2006-08,2.6 +K02000001,United Kingdom,2006-09,2.5 +K02000001,United Kingdom,2006-10,2.5 +K02000001,United Kingdom,2006-11,2.8 +K02000001,United Kingdom,2006-12,2.9 +K02000001,United Kingdom,2007-01,2.7 +K02000001,United Kingdom,2007-02,2.7 +K02000001,United Kingdom,2007-03,2.9 +K02000001,United Kingdom,2007-04,2.7 +K02000001,United Kingdom,2007-05,2.5 +K02000001,United Kingdom,2007-06,2.5 +K02000001,United Kingdom,2007-07,2.0 +K02000001,United Kingdom,2007-08,2.0 +K02000001,United Kingdom,2007-09,2.0 +K02000001,United Kingdom,2007-10,2.3 +K02000001,United Kingdom,2007-11,2.2 +K02000001,United Kingdom,2007-12,2.3 +K02000001,United Kingdom,2008-01,2.4 +K02000001,United Kingdom,2008-02,2.6 +K02000001,United Kingdom,2008-03,2.6 +K02000001,United Kingdom,2008-04,3.0 +K02000001,United Kingdom,2008-05,3.3 +K02000001,United Kingdom,2008-06,3.7 +K02000001,United Kingdom,2008-07,4.2 +K02000001,United Kingdom,2008-08,4.4 +K02000001,United Kingdom,2008-09,4.8 +K02000001,United Kingdom,2008-10,4.2 +K02000001,United Kingdom,2008-11,3.8 +K02000001,United Kingdom,2008-12,3.0 +K02000001,United Kingdom,2009-01,2.9 +K02000001,United Kingdom,2009-02,3.1 +K02000001,United Kingdom,2009-03,2.8 +K02000001,United Kingdom,2009-04,2.3 +K02000001,United Kingdom,2009-05,2.1 +K02000001,United Kingdom,2009-06,1.7 +K02000001,United Kingdom,2009-07,1.6 +K02000001,United Kingdom,2009-08,1.4 +K02000001,United Kingdom,2009-09,1.0 +K02000001,United Kingdom,2009-10,1.2 +K02000001,United Kingdom,2009-11,1.5 +K02000001,United Kingdom,2009-12,2.1 +K02000001,United Kingdom,2010-01,2.6 +K02000001,United Kingdom,2010-02,2.1 +K02000001,United Kingdom,2010-03,2.4 +K02000001,United Kingdom,2010-04,2.7 +K02000001,United Kingdom,2010-05,2.5 +K02000001,United Kingdom,2010-06,2.4 +K02000001,United Kingdom,2010-07,2.3 +K02000001,United Kingdom,2010-08,2.4 +K02000001,United Kingdom,2010-09,2.4 +K02000001,United Kingdom,2010-10,2.5 +K02000001,United Kingdom,2010-11,2.6 +K02000001,United Kingdom,2010-12,3.1 +K02000001,United Kingdom,2011-01,3.4 +K02000001,United Kingdom,2011-02,3.7 +K02000001,United Kingdom,2011-03,3.5 +K02000001,United Kingdom,2011-04,3.8 +K02000001,United Kingdom,2011-05,3.8 +K02000001,United Kingdom,2011-06,3.6 +K02000001,United Kingdom,2011-07,3.8 +K02000001,United Kingdom,2011-08,3.9 +K02000001,United Kingdom,2011-09,4.5 +K02000001,United Kingdom,2011-10,4.3 +K02000001,United Kingdom,2011-11,4.1 +K02000001,United Kingdom,2011-12,3.7 +K02000001,United Kingdom,2012-01,3.2 +K02000001,United Kingdom,2012-02,3.1 +K02000001,United Kingdom,2012-03,3.1 +K02000001,United Kingdom,2012-04,2.8 +K02000001,United Kingdom,2012-05,2.5 +K02000001,United Kingdom,2012-06,2.3 +K02000001,United Kingdom,2012-07,2.4 +K02000001,United Kingdom,2012-08,2.3 +K02000001,United Kingdom,2012-09,2.1 +K02000001,United Kingdom,2012-10,2.4 +K02000001,United Kingdom,2012-11,2.4 +K02000001,United Kingdom,2012-12,2.4 +K02000001,United Kingdom,2013-01,2.4 +K02000001,United Kingdom,2013-02,2.5 +K02000001,United Kingdom,2013-03,2.5 +K02000001,United Kingdom,2013-04,2.2 +K02000001,United Kingdom,2013-05,2.4 +K02000001,United Kingdom,2013-06,2.6 +K02000001,United Kingdom,2013-07,2.5 +K02000001,United Kingdom,2013-08,2.4 +K02000001,United Kingdom,2013-09,2.4 +K02000001,United Kingdom,2013-10,2.0 +K02000001,United Kingdom,2013-11,1.9 +K02000001,United Kingdom,2013-12,1.9 +K02000001,United Kingdom,2014-01,1.8 +K02000001,United Kingdom,2014-02,1.6 +K02000001,United Kingdom,2014-03,1.5 +K02000001,United Kingdom,2014-04,1.7 +K02000001,United Kingdom,2014-05,1.5 +K02000001,United Kingdom,2014-06,1.8 +K02000001,United Kingdom,2014-07,1.6 +K02000001,United Kingdom,2014-08,1.5 +K02000001,United Kingdom,2014-09,1.3 +K02000001,United Kingdom,2014-10,1.3 +K02000001,United Kingdom,2014-11,1.1 +K02000001,United Kingdom,2014-12,0.7 +K02000001,United Kingdom,2015-01,0.5 +K02000001,United Kingdom,2015-02,0.4 +K02000001,United Kingdom,2015-03,0.3 +K02000001,United Kingdom,2015-04,0.3 +K02000001,United Kingdom,2015-05,0.4 +K02000001,United Kingdom,2015-06,0.3 +K02000001,United Kingdom,2015-07,0.5 +K02000001,United Kingdom,2015-08,0.4 +K02000001,United Kingdom,2015-09,0.2 +K02000001,United Kingdom,2015-10,0.2 +K02000001,United Kingdom,2015-11,0.4 +K02000001,United Kingdom,2015-12,0.5 +K02000001,United Kingdom,2016-01,0.6 +K02000001,United Kingdom,2016-02,0.6 +K02000001,United Kingdom,2016-03,0.8 +K02000001,United Kingdom,2016-04,0.7 +K02000001,United Kingdom,2016-05,0.7 +K02000001,United Kingdom,2016-06,0.8 +K02000001,United Kingdom,2016-07,0.9 +K02000001,United Kingdom,2016-08,1.0 +K02000001,United Kingdom,2016-09,1.3 +K02000001,United Kingdom,2016-10,1.3 +K02000001,United Kingdom,2016-11,1.5 +K02000001,United Kingdom,2016-12,1.8 +K02000001,United Kingdom,2017-01,1.9 +K02000001,United Kingdom,2017-02,2.3 +K02000001,United Kingdom,2017-03,2.3 +K02000001,United Kingdom,2017-04,2.6 +K02000001,United Kingdom,2017-05,2.7 +K02000001,United Kingdom,2017-06,2.6 +K02000001,United Kingdom,2017-07,2.6 +K02000001,United Kingdom,2017-08,2.7 +K02000001,United Kingdom,2017-09,2.8 +K02000001,United Kingdom,2017-10,2.8 +K02000001,United Kingdom,2017-11,2.8 +K02000001,United Kingdom,2017-12,2.7 +K02000001,United Kingdom,2018-01,2.7 +K02000001,United Kingdom,2018-02,2.5 +K02000001,United Kingdom,2018-03,2.3 +K02000001,United Kingdom,2018-04,2.2 +K02000001,United Kingdom,2018-05,2.3 +K02000001,United Kingdom,2018-06,2.3 +K02000001,United Kingdom,2018-07,2.3 +K02000001,United Kingdom,2018-08,2.4 +K02000001,United Kingdom,2018-09,2.2 +K02000001,United Kingdom,2018-10,2.2 +K02000001,United Kingdom,2018-11,2.2 +K02000001,United Kingdom,2018-12,2.0 +K02000001,United Kingdom,2019-01,1.8 +K02000001,United Kingdom,2019-02,1.8 +K02000001,United Kingdom,2019-03,1.8 +K02000001,United Kingdom,2019-04,2.0 +K02000001,United Kingdom,2019-05,1.9 +K02000001,United Kingdom,2019-06,1.9 +K02000001,United Kingdom,2019-07,2.0 +K02000001,United Kingdom,2019-08,1.7 +K02000001,United Kingdom,2019-09,1.7 +K02000001,United Kingdom,2019-10,1.5 +K02000001,United Kingdom,2019-11,1.5 +K02000001,United Kingdom,2019-12,1.4 +K02000001,United Kingdom,2020-01,1.8 +K02000001,United Kingdom,2020-02,1.7 +K02000001,United Kingdom,2020-03,1.5 +K02000001,United Kingdom,2020-04,0.9 +K02000001,United Kingdom,2020-05,0.7 +K02000001,United Kingdom,2020-06,0.8 +K02000001,United Kingdom,2020-07,1.1 +K02000001,United Kingdom,2020-08,0.5 +K02000001,United Kingdom,2020-09,0.7 +K02000001,United Kingdom,2020-10,0.9 +K02000001,United Kingdom,2020-11,0.6 +K02000001,United Kingdom,2020-12,0.8 +K02000001,United Kingdom,2021-01,0.9 +K02000001,United Kingdom,2021-02,0.7 +K02000001,United Kingdom,2021-03,1.0 +K02000001,United Kingdom,2021-04,1.6 +K02000001,United Kingdom,2021-05,2.1 +K02000001,United Kingdom,2021-06,2.4 +K02000001,United Kingdom,2021-07,2.1 +K02000001,United Kingdom,2021-08,3.0 +K02000001,United Kingdom,2021-09,2.9 +K02000001,United Kingdom,2021-10,3.8 +K02000001,United Kingdom,2021-11,4.6 +K02000001,United Kingdom,2021-12,4.8 +K02000001,United Kingdom,2022-01,4.9 +K02000001,United Kingdom,2022-02,5.5 +K02000001,United Kingdom,2022-03,6.2 +K02000001,United Kingdom,2022-04,7.8 +K02000001,United Kingdom,2022-05,7.9 +K02000001,United Kingdom,2022-06,8.2 +K02000001,United Kingdom,2022-07,8.8 +K02000001,United Kingdom,2022-08,8.6 +K02000001,United Kingdom,2022-09,8.8 +K02000001,United Kingdom,2022-10,9.6 +K02000001,United Kingdom,2022-11,9.3 +K02000001,United Kingdom,2022-12,9.2 +K02000001,United Kingdom,2023-01,8.8 +K02000001,United Kingdom,2023-02,9.2 +K02000001,United Kingdom,2023-03,8.9 +K02000001,United Kingdom,2023-04,7.8 +K02000001,United Kingdom,2023-05,7.9 +K02000001,United Kingdom,2023-06,7.3 +K02000001,United Kingdom,2023-07,6.4 +K02000001,United Kingdom,2023-08,6.3 +K02000001,United Kingdom,2023-09,6.3 +K02000001,United Kingdom,2023-10,4.7 diff --git a/src/store/csv/stub/content/cpih/2023-10/wrangle.R b/src/store/csv/stub/content/cpih/2023-10/wrangle.R new file mode 100644 index 00000000..edc6d269 --- /dev/null +++ b/src/store/csv/stub/content/cpih/2023-10/wrangle.R @@ -0,0 +1,19 @@ +library(dplyr) +library(lubridate) +library(readr) +library(stringr) + + +df <- read_csv("https://www.ons.gov.uk/generator?format=csv&uri=/economy/inflationandpriceindices/timeseries/l55o/mm23") + +df <- df[-(1:7), ] |> + rename(date = Title, cpih_annual_rate = `CPIH ANNUAL RATE 00: ALL ITEMS 2015=100`) |> + mutate(geography = "K02000001", geography_name = "United Kingdom", .before = everything()) |> + mutate(date = case_when( + str_detect(date, "^\\d{4}$") ~ date, + str_detect(date, "^\\d{4} [A-Z]{3}$") ~ ym(date, quiet = TRUE) |> format("%Y-%m"), + str_detect(date, "^\\d{4} Q[1-4]$") ~ str_replace_all(date, " ", "-"), + TRUE ~ NA + )) + +write_csv(df, "src/store/csv/stub/content/cpih/2022-01/1.csv") diff --git a/src/store/metadata/stub/content/datasets.json b/src/store/metadata/stub/content/datasets.json index 78565ba8..443eb345 100644 --- a/src/store/metadata/stub/content/datasets.json +++ b/src/store/metadata/stub/content/datasets.json @@ -1,274 +1,271 @@ { - "@context": "https://staging.idpd.uk/ns#", - "@type": ["dcat:Catalog", "hydra:Collection"], - "@id": "https://staging.idpd.uk/datasets", - "datasets": [ - { - "@id": "https://staging.idpd.uk/datasets/cpih", - "@type": "dcat:DatasetSeries", - "identifier": "cpih", - "title": "Consumer Price Inflation including owner occupiers' housing costs (CPIH)", - "summary": "The Consumer Prices Index including owner occupiers' housing costs (CPIH) is a measure of inflation that includes costs associated with...", - "description": "The Consumer Prices Index including owner occupiers' housing costs (CPIH) is a measure of inflation that includes costs associated with...", - "issued": "2017-01-01T00:00:00", - "modified": "2017-01-01T00:00:00", - "next_release": "2019-04-19T09:30:00Z", - "publisher": "https://staging.idpd.uk/publishers/office-for-national-statistics", - "creator": "https://staging.idpd.uk/publishers/office-for-national-statistics", - "contact_point": { - "name": "Consumer Price Inflation Enquiries", - "email": "mailto:cpih@ons.gov.uk" - }, - "topics": [ - "https://staging.idpd.uk/topics/economy", - "https://staging.idpd.uk/topics/prices"], - "frequency": "monthly", - "keywords": [ - "inflation", - "consumer price inflation", - "cpi", - "cpih", - "consumer price index", - "consumer price index including owner occupiers' housing costs" - ], - "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", - "spatial_resolution":["E01", "E92"], - "spatial_coverage": "E92000001", - "temporal_resolution": ["P1M","P3M","P1Y"], - "temporal_coverage": { - "start": "2005-01-01T00:00:00Z", - "end": "2019-03-01T00:00:00Z" - }, - "editions_url": "https://staging.idpd.uk/datasets/cpih/editions", - "editions": [ - { - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2022-01", - "issued": "2017-02-21T09:30:00Z", - "modified": "2017-02-21T09:30:00Z" - } - ] - }, + "@context": "https://staging.idpd.uk/ns#", + "@type": ["dcat:Catalog", "hydra:Collection"], + "@id": "https://staging.idpd.uk/datasets", + "datasets": [ + { + "@id": "https://staging.idpd.uk/datasets/cpih", + "@type": "dcat:DatasetSeries", + "identifier": "cpih", + "title": "Consumer Price Inflation including owner occupiers' housing costs (CPIH)", + "summary": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation.", + "description": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation. CPIH is the most comprehensive measure of inflation. It extends Consumer Prices Index to include a measure of the costs associated with owning, maintaining and living in one's own home, known as owner occupiers' housing costs (OOH), along with council tax.", + "issued": "2023-12-20T07:00:00Z", + "modified": "2023-11-15T07:00:00Z", + "next_release": "2023-12-20T07:00:00Z", + "publisher": "https://staging.idpd.uk/publishers/office-for-national-statistics", + "creator": "https://staging.idpd.uk/publishers/office-for-national-statistics", + "contact_point": { + "name": "Consumer Price Inflation Enquiries", + "email": "mailto:cpih@ons.gov.uk" + }, + "topics": [ + "https://staging.idpd.uk/topics/economy", + "https://staging.idpd.uk/topics/prices" + ], + "frequency": "monthly", + "keywords": [ + "inflation", + "consumer price inflation", + "cpi", + "cpih", + "consumer price index", + "consumer price index including owner occupiers' housing costs" + ], + "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", + "spatial_resolution": ["E01", "E92"], + "spatial_coverage": "E92000001", + "temporal_resolution": ["P1M", "P3M", "P1Y"], + "temporal_coverage": { + "start": "2005-01-01T00:00:00Z", + "end": "2023-10-01T00:00:00Z" + }, + "editions_url": "https://staging.idpd.uk/datasets/cpih/editions", + "editions": [ { - "@id": "https://staging.idpd.uk/datasets/a16mu", - "@type": "dcat:DatasetSeries", - "identifier": "a16mu", - "title": "Modelled unemployment rate aged 16 years and over", - "summary": "Modelled unemployment rate for people aged 16 years and over, Great Britain, 07/2004-06/2005 to 07/2022-06/2023.", - "description": "This dataset shows modelled-based estimates for the proportion of people aged 16 years and over without a job who have been actively seeking work within the last four weeks and are available to start work within the next two weeks", - "issued": "2023-11-06T12:25:28", - "modified": "2023-11-06T12:25:28", - "next_release": "2024-11-06T12:00:00", - "publisher": "https://staging.idpd.uk/publishers/office-for-national-statistics", - "creator": "https://staging.idpd.uk/publishers/office-for-national-statistics", - "contact_point": { - "name": "Debra Leaker", - "email": "mailto:labour.market@ons.gov.uk" - }, - "topics": [ - "https://staging.idpd.uk/topics/labour-market-and-welfare"], - "frequency": "annual", - "keywords": [ - "subnational", - "county", - "local-authority", - "unemployment", - "labour-market", - "region", - "annual-population-survey" - ], - "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", - "spatial_resolution":["N09", "S12", "W06", "E92", "K02"], - "spatial_coverage": "K02000001", - "temporal_resolution": ["P1Y"], - "temporal_coverage": { - "start": "2004-07-01T00:00:00Z", - "end": "2023-06-04T00:00:00Z" - }, - "editions_url": "https://staging.idpd.uk/datasets/a16mu/editions", - "editions": [ - { - "@id": "https://staging.idpd.uk/datasets/a16mu/editions/2023-11", - "issued": "2023-11-06T12:25:28Z", - "modified": "2023-11-06T12:25:28Z" - } - ] - }, + "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10", + "issued": "2017-02-21T09:30:00Z", + "modified": "2023-11-15T07:00:00Z" + } + ] + }, + { + "@id": "https://staging.idpd.uk/datasets/a16mu", + "@type": "dcat:DatasetSeries", + "identifier": "a16mu", + "title": "Modelled unemployment rate aged 16 years and over", + "summary": "Modelled unemployment rate for people aged 16 years and over, Great Britain, 07/2004-06/2005 to 07/2022-06/2023.", + "description": "This dataset shows modelled-based estimates for the proportion of people aged 16 years and over without a job who have been actively seeking work within the last four weeks and are available to start work within the next two weeks", + "issued": "2023-11-06T12:25:28", + "modified": "2023-11-06T12:25:28", + "next_release": "2024-11-06T12:00:00", + "publisher": "https://staging.idpd.uk/publishers/office-for-national-statistics", + "creator": "https://staging.idpd.uk/publishers/office-for-national-statistics", + "contact_point": { + "name": "Debra Leaker", + "email": "mailto:labour.market@ons.gov.uk" + }, + "topics": ["https://staging.idpd.uk/topics/labour-market-and-welfare"], + "frequency": "annual", + "keywords": [ + "subnational", + "county", + "local-authority", + "unemployment", + "labour-market", + "region", + "annual-population-survey" + ], + "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", + "spatial_resolution": ["N09", "S12", "W06", "E92", "K02"], + "spatial_coverage": "K02000001", + "temporal_resolution": ["P1Y"], + "temporal_coverage": { + "start": "2004-07-01T00:00:00Z", + "end": "2023-06-04T00:00:00Z" + }, + "editions_url": "https://staging.idpd.uk/datasets/a16mu/editions", + "editions": [ { - "@id": "https://staging.idpd.uk/datasets/gdhi", - "@type": "dcat:DatasetSeries", - "identifier": "gdhi", - "title": "Gross disposable household income per head", - "summary": "Estimate of the amount of money each individual within a household has available for spending or saving after they have paid taxes and received any direct benefits, UK, 1997-2021.", - "description": "This dataset shows an estimate of the amount of money each individual within a household has available for spending or saving after they have paid taxes and received any direct benefits, in the UK, for 1997-2021.", - "issued": "2023-03-31T12:12:48", - "modified": "2023-11-02T14:26:00", - "next_release": "2024-03-31T12:00:00Z", - "publisher": "https://staging.idpd.uk/publishers/office-for-national-statistics", - "creator": "https://staging.idpd.uk/publishers/office-for-national-statistics", - "contact_point": { - "name": "Trevor Fenton", - "email": "mailto:regionalaccounts@ons.gov.uk" - }, - "topics": [ - "https://staging.idpd.uk/topics/economy"], - "frequency": "annual", - "keywords": [ - "money", - "spending", - "saving", - "region", - "local-authority", - "subnational" - ], - "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", - "spatial_resolution":["N09", "S12", "W06", "E92", "K02"], - "spatial_coverage": "K02000001", - "temporal_resolution": ["P1Y"], - "temporal_coverage": { - "start": "1997-01-01T09:00:00Z", - "end": "1997-01-01T09:00:00Z" - }, - "editions_url": "https://staging.idpd.uk/datasets/gdhi/editions", - "editions": [ - { - "@id": "https://staging.idpd.uk/datasets/gdhi/editions/2023-03", - "issued": "2023-03-31T12:12:48Z", - "modified": "2023-11-02T14:26:00Z" - } - ] - }, + "@id": "https://staging.idpd.uk/datasets/a16mu/editions/2023-11", + "issued": "2023-11-06T12:25:28Z", + "modified": "2023-11-06T12:25:28Z" + } + ] + }, + { + "@id": "https://staging.idpd.uk/datasets/gdhi", + "@type": "dcat:DatasetSeries", + "identifier": "gdhi", + "title": "Gross disposable household income per head", + "summary": "Estimate of the amount of money each individual within a household has available for spending or saving after they have paid taxes and received any direct benefits, UK, 1997-2021.", + "description": "This dataset shows an estimate of the amount of money each individual within a household has available for spending or saving after they have paid taxes and received any direct benefits, in the UK, for 1997-2021.", + "issued": "2023-03-31T12:12:48", + "modified": "2023-11-02T14:26:00", + "next_release": "2024-03-31T12:00:00Z", + "publisher": "https://staging.idpd.uk/publishers/office-for-national-statistics", + "creator": "https://staging.idpd.uk/publishers/office-for-national-statistics", + "contact_point": { + "name": "Trevor Fenton", + "email": "mailto:regionalaccounts@ons.gov.uk" + }, + "topics": ["https://staging.idpd.uk/topics/economy"], + "frequency": "annual", + "keywords": [ + "money", + "spending", + "saving", + "region", + "local-authority", + "subnational" + ], + "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", + "spatial_resolution": ["N09", "S12", "W06", "E92", "K02"], + "spatial_coverage": "K02000001", + "temporal_resolution": ["P1Y"], + "temporal_coverage": { + "start": "1997-01-01T09:00:00Z", + "end": "1997-01-01T09:00:00Z" + }, + "editions_url": "https://staging.idpd.uk/datasets/gdhi/editions", + "editions": [ { - "@id": "https://staging.idpd.uk/datasets/beis-local-authority-greenhouse-gas-emissions", - "@type": "dcat:DatasetSeries", - "identifier": "beis-local-authority-greenhouse-gas-emissions", - "title": "Local authority greenhouse gas emissions", - "summary": "UK local authority estimates of greenhouse gas emissions", - "description": "These statistics provide a breakdown of greenhouse gas emissions across the UK, using...", - "issued": "2023-06-29T00:00:00", - "modified": "2023-06-29T00:00:00", - "next_release": "2023-07-06T09:30:00Z", - "publisher": "https://staging.idpd.uk/publishers/department-for-energy-security-and-net-zero", - "creator": "https://staging.idpd.uk/publishers/department-for-energy-security-and-net-zero", - "theme": "http://gss-data.org.uk/def/gdp#climate-change", - "contact_point": { - "name": "UK local authority and regional estimates of greenhouse gas emissions", - "email": "mailto:GreenhouseGas.Statistics@energysecurity.gov.uk" - }, - "topics": [ - "https://staging.idpd.uk/topics/emissions", - "https://staging.idpd.uk/topics/greenhouse-gas"], - "frequency": "monthly", - "keywords": [ - "emissions", - "greenhouse-gas", - "carbon-dioxide", - "local-authority", - "country" - ], - "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", - "spatial_resolution": ["E01", "E92"], - "spatial_coverage": "E92000001", - "temporal_resolution": ["P1M", "P3M", "P1Y"], - "temporal_coverage": { - "start": "2005-01-01T00:00:00Z", - "end": "2022-07-01T00:00:00Z" - }, - "editions_url": "https://staging.idpd.uk/datasets/beis-local-authority-greenhouse-gas-emissions/editions", - "editions": [ - { - "@id": "https://staging.idpd.uk/datasets/beis-local-authority-greenhouse-gas-emissions/editions/2022-07", - "issued": "2023-07-06T09:30:00Z", - "modified": "2023-07-06T09:30:00Z" - } - ] - }, + "@id": "https://staging.idpd.uk/datasets/gdhi/editions/2023-03", + "issued": "2023-03-31T12:12:48Z", + "modified": "2023-11-02T14:26:00Z" + } + ] + }, + { + "@id": "https://staging.idpd.uk/datasets/beis-local-authority-greenhouse-gas-emissions", + "@type": "dcat:DatasetSeries", + "identifier": "beis-local-authority-greenhouse-gas-emissions", + "title": "Local authority greenhouse gas emissions", + "summary": "UK local authority estimates of greenhouse gas emissions", + "description": "These statistics provide a breakdown of greenhouse gas emissions across the UK, using...", + "issued": "2023-06-29T00:00:00", + "modified": "2023-06-29T00:00:00", + "next_release": "2023-07-06T09:30:00Z", + "publisher": "https://staging.idpd.uk/publishers/department-for-energy-security-and-net-zero", + "creator": "https://staging.idpd.uk/publishers/department-for-energy-security-and-net-zero", + "theme": "http://gss-data.org.uk/def/gdp#climate-change", + "contact_point": { + "name": "UK local authority and regional estimates of greenhouse gas emissions", + "email": "mailto:GreenhouseGas.Statistics@energysecurity.gov.uk" + }, + "topics": [ + "https://staging.idpd.uk/topics/emissions", + "https://staging.idpd.uk/topics/greenhouse-gas" + ], + "frequency": "monthly", + "keywords": [ + "emissions", + "greenhouse-gas", + "carbon-dioxide", + "local-authority", + "country" + ], + "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", + "spatial_resolution": ["E01", "E92"], + "spatial_coverage": "E92000001", + "temporal_resolution": ["P1M", "P3M", "P1Y"], + "temporal_coverage": { + "start": "2005-01-01T00:00:00Z", + "end": "2022-07-01T00:00:00Z" + }, + "editions_url": "https://staging.idpd.uk/datasets/beis-local-authority-greenhouse-gas-emissions/editions", + "editions": [ { - "@id": "https://staging.idpd.uk/datasets/4gc", - "@type": "dcat:DatasetSeries", - "identifier": "4gc", - "title": "4G Coverage", - "summary": "Percentage of geographic areas with 4G signal outdoors from at least 1 operator (signal threshold: 105dBm), UK, September 2022.", - "description": "This dataset shows the percentage of geographic areas with 4G signal outdoors from at least 1 operator (signal threshold: 105dBm), in the UK, for September 2022.", - "issued": "2023-03-31T12:10:00", - "modified": "2023-10-23T15:55:00", - "next_release": "2023-11-24T09:30:00Z", - "publisher": "https://staging.idpd.uk/publishers/office-for-national-statistics", - "creator": "https://staging.idpd.uk/publishers/ofcom", - "contact_point": { - "name": "Ofcom Open Data", - "email": "mailto:open.data@ofcom.org.uk" - }, - "topics": [ - "https://staging.idpd.uk/topics/communication", - "https://staging.idpd.uk/topics/it-and-internet-industry"], - "frequency": "monthly", - "keywords": [ - "broadband-mobile-coverage", - "connectivity", - "local-authority", - "subnational" - ], - "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", - "spatial_resolution":["N09", "S12", "W06", "E92", "K02"], - "spatial_coverage": "K02000001", - "temporal_resolution": ["P1M"], - "temporal_coverage": { - "start": "2022-09-01T00:00:00Z", - "end": "2022-09-30T23:59:00Z" - }, - "editions_url": "https://staging.idpd.uk/datasets/4gc/editions", - "editions": [ - { - "@id": "https://staging.idpd.uk/datasets/4gc/editions/2023-09", - "issued": "2023-08-24T09:30:00Z", - "modified": "2023-08-24T09:30:00Z" - } - ] - }, + "@id": "https://staging.idpd.uk/datasets/beis-local-authority-greenhouse-gas-emissions/editions/2022-07", + "issued": "2023-07-06T09:30:00Z", + "modified": "2023-07-06T09:30:00Z" + } + ] + }, + { + "@id": "https://staging.idpd.uk/datasets/4gc", + "@type": "dcat:DatasetSeries", + "identifier": "4gc", + "title": "4G Coverage", + "summary": "Percentage of geographic areas with 4G signal outdoors from at least 1 operator (signal threshold: 105dBm), UK, September 2022.", + "description": "This dataset shows the percentage of geographic areas with 4G signal outdoors from at least 1 operator (signal threshold: 105dBm), in the UK, for September 2022.", + "issued": "2023-03-31T12:10:00", + "modified": "2023-10-23T15:55:00", + "next_release": "2023-11-24T09:30:00Z", + "publisher": "https://staging.idpd.uk/publishers/office-for-national-statistics", + "creator": "https://staging.idpd.uk/publishers/ofcom", + "contact_point": { + "name": "Ofcom Open Data", + "email": "mailto:open.data@ofcom.org.uk" + }, + "topics": [ + "https://staging.idpd.uk/topics/communication", + "https://staging.idpd.uk/topics/it-and-internet-industry" + ], + "frequency": "monthly", + "keywords": [ + "broadband-mobile-coverage", + "connectivity", + "local-authority", + "subnational" + ], + "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", + "spatial_resolution": ["N09", "S12", "W06", "E92", "K02"], + "spatial_coverage": "K02000001", + "temporal_resolution": ["P1M"], + "temporal_coverage": { + "start": "2022-09-01T00:00:00Z", + "end": "2022-09-30T23:59:00Z" + }, + "editions_url": "https://staging.idpd.uk/datasets/4gc/editions", + "editions": [ { - "@id": "https://staging.idpd.uk/datasets/beis-2005-to-2019-local-authority-carbon-dioxide-co2-emissions", - "@type": "dcat:DatasetSeries", - "identifier": "beis-2005-to-2019-local-authority-carbon-dioxide-co2-emissions", - "title": "2005 to 2019 local authority carbon dioxide (CO2) emissions", - "summary": "These statistics provide the most reliable and consistent breakdown of CO2 emissions across the country, using nationally available data sets going back to 2005.\n\nThe main data sources are the UK National Atmospheric Emissions Inventory and the BEIS National Statistics of energy consumption for local authority areas. All emissions included in the national inventory are covered, except aviation, shipping and military transport, for which there is no obvious basis for allocation to local areas.", - "description": "These statistics provide the most reliable and consistent breakdown of CO2 emissions across the country, using nationally available data sets going back to 2005.\n\nThe main data sources are the UK National Atmospheric Emissions Inventory and the BEIS National Statistics of energy consumption for local authority areas. All emissions included in the national inventory are covered, except aviation, shipping and military transport, for which there is no obvious basis for allocation to local areas.", - "issued": "2021-06-24T08:30:00", - "modified": "2022-08-18T10:51:00", - "next_release": "2024-04-19T09:30:00Z", - "publisher": "https://staging.idpd.uk/publishers/department-for-energy-security-and-net-zero", - "creator": "https://staging.idpd.uk/publishers/department-for-energy-security-and-net-zero", - "contact_point": { - "name": "Department for Business, Energy & Industrial Strategy", - "email": "mailto:Climatechange.Statistics@beis.gov.uk" - }, - "topics": [ - "https://staging.idpd.uk/topics/climate-change", - "https://staging.idpd.uk/topics/carbon-emissions"], - "frequency": "irregular", - "keywords": [ - "carbon", - "emissions", - "local authority", - "beis" - ], - "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", - "spatial_resolution":["K02"], - "spatial_coverage": "K02000001", - "temporal_resolution": ["P1Y"], - "temporal_coverage": { - "start": "2005-01-01T00:00:00Z", - "end": "2019-12-31T00:00:00Z" - }, - "editions_url": "https://staging.idpd.uk/datasets/beis-2005-to-2019-local-authority-carbon-dioxide-co2-emissions/editions", - "editions": [ - { - "@id": "https://staging.idpd.uk/datasets/beis-2005-to-2019-local-authority-carbon-dioxide-co2-emissions/editions/2005-2019", - "issued": "2021-06-24T08:30:00Z", - "modified": "2022-08-18T10:51:00Z" - } - ] - } + "@id": "https://staging.idpd.uk/datasets/4gc/editions/2023-09", + "issued": "2023-08-24T09:30:00Z", + "modified": "2023-08-24T09:30:00Z" + } + ] + }, + { + "@id": "https://staging.idpd.uk/datasets/beis-2005-to-2019-local-authority-carbon-dioxide-co2-emissions", + "@type": "dcat:DatasetSeries", + "identifier": "beis-2005-to-2019-local-authority-carbon-dioxide-co2-emissions", + "title": "2005 to 2019 local authority carbon dioxide (CO2) emissions", + "summary": "These statistics provide the most reliable and consistent breakdown of CO2 emissions across the country, using nationally available data sets going back to 2005.\n\nThe main data sources are the UK National Atmospheric Emissions Inventory and the BEIS National Statistics of energy consumption for local authority areas. All emissions included in the national inventory are covered, except aviation, shipping and military transport, for which there is no obvious basis for allocation to local areas.", + "description": "These statistics provide the most reliable and consistent breakdown of CO2 emissions across the country, using nationally available data sets going back to 2005.\n\nThe main data sources are the UK National Atmospheric Emissions Inventory and the BEIS National Statistics of energy consumption for local authority areas. All emissions included in the national inventory are covered, except aviation, shipping and military transport, for which there is no obvious basis for allocation to local areas.", + "issued": "2021-06-24T08:30:00", + "modified": "2022-08-18T10:51:00", + "next_release": "2024-04-19T09:30:00Z", + "publisher": "https://staging.idpd.uk/publishers/department-for-energy-security-and-net-zero", + "creator": "https://staging.idpd.uk/publishers/department-for-energy-security-and-net-zero", + "contact_point": { + "name": "Department for Business, Energy & Industrial Strategy", + "email": "mailto:Climatechange.Statistics@beis.gov.uk" + }, + "topics": [ + "https://staging.idpd.uk/topics/climate-change", + "https://staging.idpd.uk/topics/carbon-emissions" ], - "offset": 0, - "count": 6 -} \ No newline at end of file + "frequency": "irregular", + "keywords": ["carbon", "emissions", "local authority", "beis"], + "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", + "spatial_resolution": ["K02"], + "spatial_coverage": "K02000001", + "temporal_resolution": ["P1Y"], + "temporal_coverage": { + "start": "2005-01-01T00:00:00Z", + "end": "2019-12-31T00:00:00Z" + }, + "editions_url": "https://staging.idpd.uk/datasets/beis-2005-to-2019-local-authority-carbon-dioxide-co2-emissions/editions", + "editions": [ + { + "@id": "https://staging.idpd.uk/datasets/beis-2005-to-2019-local-authority-carbon-dioxide-co2-emissions/editions/2005-2019", + "issued": "2021-06-24T08:30:00Z", + "modified": "2022-08-18T10:51:00Z" + } + ] + } + ], + "offset": 0, + "count": 6 +} diff --git a/src/store/metadata/stub/content/editions/cpih_2022-01.json b/src/store/metadata/stub/content/editions/cpih_2023-10.json similarity index 73% rename from src/store/metadata/stub/content/editions/cpih_2022-01.json rename to src/store/metadata/stub/content/editions/cpih_2023-10.json index c2c15211..6cee0584 100644 --- a/src/store/metadata/stub/content/editions/cpih_2022-01.json +++ b/src/store/metadata/stub/content/editions/cpih_2023-10.json @@ -5,49 +5,36 @@ "title": "Consumer Price Inflation including owner occupiers' housing costs (CPIH)", "editions": [ { - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2022-01", + "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10", "@type": "dcat:Dataset", "in_series": "https://staging.idpd.uk/datasets/cpih", "identifier": "2022-01", "title": "Consumer Prices Index including owner occupiers' housing costs (CPIH)", - "summary": "The Consumer Prices Index including owner occupiers' housing costs (CPIH) is a...", - "description": "The Consumer Prices Index...", + "summary": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation.", + "description": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation. CPIH is the most comprehensive measure of inflation. It extends Consumer Prices Index to include a measure of the costs associated with owning, maintaining and living in one's own home, known as owner occupiers' housing costs (OOH), along with council tax.", "publisher": "https://staging.idpd.uk/office-for-national-statistics", "creator": "office-for-national-statistics", "contact_point": { "name": "Consumer Price Inflation Enquiries", "email": "mailto:cpih@ons.gov.uk" }, - "topics": [ - "https://staging.idpd.uk/topics/economy" - ], + "topics": ["https://staging.idpd.uk/topics/economy"], "frequency": "monthly", - "keywords": [ - "inflation", - "consumer price index", - "CPIH" - ], + "keywords": ["inflation", "consumer price index", "CPIH"], "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", "issued": "2017-02-21T09:30:00Z", "modified": "2017-02-21T09:30:00Z", - "spatial_resolution": [ - "E01", - "E92" - ], + "spatial_resolution": ["E01", "E92"], "spatial_coverage": "E92000001", - "temporal_resolution": [ - "P1M", - "P3M", - "P1Y" - ], + "temporal_resolution": ["P1M", "P3M", "P1Y"], "temporal_coverage": { "start": "1981-01-01T00:00:00Z", "end": "2022-01-31T00:00:00Z" }, - "versions_url": "https://staging.idpd.uk/datasets/cpih/editions/2022-01/versions", + "versions_url": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions", "versions": [ { - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2022-01/versions/1", + "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", "issued": "2017-01-01T00:00:00", "modified": "2017-01-01T00:00:00" } @@ -85,4 +72,4 @@ ], "count": 1, "offset": 0 -} \ No newline at end of file +} diff --git a/src/store/metadata/stub/content/editions/versions/cpih_2022-01.json b/src/store/metadata/stub/content/editions/versions/cpih_2022-01.json deleted file mode 100644 index 0b140bc4..00000000 --- a/src/store/metadata/stub/content/editions/versions/cpih_2022-01.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "@context": "https://staging.idpd.uk/ns#", - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2022-01/versions", - "@type": "hydra:Collection", - "title": "Consumer Price Inflation including owner occupiers' housing costs (CPIH)", - "versions": [ - { - "@type": [ - "dcat:Distribution", - "csvw:Table" - ], - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2022-01/versions/1", - "identifier": "1", - "issued": "2017-01-01T00:00:00", - "title": "Consumer Prices Index including owner occupiers' housing costs (CPIH)", - "summary": "The Consumer Prices Index including owner occupiers' housing costs (CPIH) is a...", - "description": "The Consumer Prices Index...", - "download_url": "https://staging.idpd.uk/datasets/cpih/editions/2022-01/versions/1.csv", - "media_type": "text/csv", - "table_schema": { - "columns": [ - { - "name": "Period", - "datatype": "xsd:datetime", - "titles": "Time period", - "description": "The time period associated with the observation." - }, - { - "name": "CPIH", - "datatype": "xsd:decimal", - "titles": "Consumer Price Index including Housing (CPIH)", - "description": "The consumer price index including housing for the given time period." - }, - { - "name": "CPI", - "datatype": "xsd:decimal", - "titles": "Consumer Price Index (CPI)", - "description": "The consumer price index including for the given time period." - }, - { - "name": "OOH", - "datatype": "xsd:decimal", - "titles": "Owner occupiers’ housing costs", - "description": "An index of owner occupiers' housing costs for the given time period." - } - ] - } - } - ], - "count": 1, - "offset": 0 -} \ No newline at end of file diff --git a/src/store/metadata/stub/content/editions/versions/cpih_2023-10.json b/src/store/metadata/stub/content/editions/versions/cpih_2023-10.json new file mode 100644 index 00000000..01592aed --- /dev/null +++ b/src/store/metadata/stub/content/editions/versions/cpih_2023-10.json @@ -0,0 +1,49 @@ +{ + "@context": "https://staging.idpd.uk/ns#", + "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", + "@type": "hydra:Collection", + "title": "Consumer Price Inflation including owner occupiers' housing costs (CPIH)", + "versions": [ + { + "@type": ["dcat:Distribution", "csvw:Table"], + "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", + "identifier": "1", + "issued": "2023-11-19T07:00:00Z", + "title": "Consumer Prices Index including owner occupiers' housing costs (CPIH)", + "summary": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation.", + "description": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation. CPIH is the most comprehensive measure of inflation. It extends Consumer Prices Index to include a measure of the costs associated with owning, maintaining and living in one's own home, known as owner occupiers' housing costs (OOH), along with council tax.", + "download_url": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1.csv", + "media_type": "text/csv", + "table_schema": { + "columns": [ + { + "name": "geography", + "datatype": "string", + "titles": "geography", + "description": "The code associated with the geography." + }, + { + "name": "geography_name", + "datatype": "string", + "titles": "geography_name", + "description": "The name associated with the geography." + }, + { + "name": "date", + "datatype": "gYearMonth", + "titles": "date", + "description": "The date associated with the observation." + }, + { + "name": "cpih_annual_rate", + "datatype": "number", + "titles": "cpih_annual_rate", + "description": "The Consumer Prices Index including owner occupiers' housing costs (CPIH) percentage change over 12 months." + } + ] + } + } + ], + "count": 1, + "offset": 0 +} From b3170f8a6b073972a55488028c17e6eebdb44944 Mon Sep 17 00:00:00 2001 From: rossbowen Date: Mon, 20 Nov 2023 17:19:42 +0000 Subject: [PATCH 02/11] Amend tests to consider new CPIH edition --- src/store/csv/stub/content/cpih/2023-10/wrangle.R | 2 +- tests/fixtures/editions.py | 4 ++-- tests/fixtures/versions.py | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/store/csv/stub/content/cpih/2023-10/wrangle.R b/src/store/csv/stub/content/cpih/2023-10/wrangle.R index edc6d269..f0119647 100644 --- a/src/store/csv/stub/content/cpih/2023-10/wrangle.R +++ b/src/store/csv/stub/content/cpih/2023-10/wrangle.R @@ -16,4 +16,4 @@ df <- df[-(1:7), ] |> TRUE ~ NA )) -write_csv(df, "src/store/csv/stub/content/cpih/2022-01/1.csv") +write_csv(df, "src/store/csv/stub/content/cpih/2023-10/1.csv") diff --git a/tests/fixtures/editions.py b/tests/fixtures/editions.py index 694c4783..83e2e303 100644 --- a/tests/fixtures/editions.py +++ b/tests/fixtures/editions.py @@ -10,7 +10,7 @@ def edition_test_data(): we'd expect returned from store.get_edition(). """ file_path = pathlib.Path( - "src/store/metadata/stub/content/editions/cpih_2022-01.json" + "src/store/metadata/stub/content/editions/cpih_2023-10.json" ) with open(file_path, "r") as json_file: edition = json.load(json_file)["editions"][0] @@ -25,7 +25,7 @@ def editions_test_data(): we'd expect returned from store.get_editions(). """ file_path = pathlib.Path( - "src/store/metadata/stub/content/editions/cpih_2022-01.json" + "src/store/metadata/stub/content/editions/cpih_2023-10.json" ) with open(file_path, "r") as json_file: return json.load(json_file) diff --git a/tests/fixtures/versions.py b/tests/fixtures/versions.py index dc06e7a0..70bc8589 100644 --- a/tests/fixtures/versions.py +++ b/tests/fixtures/versions.py @@ -11,13 +11,14 @@ def version_test_data(): we'd expect returned from store.get_versions(). """ file_path = pathlib.Path( - "src/store/metadata/stub/content/editions/versions/cpih_2022-01.json" + "src/store/metadata/stub/content/editions/versions/cpih_2023-10.json" ) with open(file_path, "r") as json_file: version = json.load(json_file)["versions"][0] version["@context"] = "https://staging.idpd.uk/ns#" return version + @pytest.fixture def versions_test_data(): """ @@ -25,7 +26,7 @@ def versions_test_data(): we'd expect returned from store.get_versions(). """ file_path = pathlib.Path( - "src/store/metadata/stub/content/editions/versions/cpih_2022-01.json" + "src/store/metadata/stub/content/editions/versions/cpih_2023-10.json" ) with open(file_path, "r") as json_file: return json.load(json_file) From 6b579c5ddff3d91ce26b8f8df19cd1487526fd09 Mon Sep 17 00:00:00 2001 From: rossbowen Date: Mon, 20 Nov 2023 17:22:50 +0000 Subject: [PATCH 03/11] Remove R code --- .../csv/stub/content/cpih/2023-10/wrangle.R | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 src/store/csv/stub/content/cpih/2023-10/wrangle.R diff --git a/src/store/csv/stub/content/cpih/2023-10/wrangle.R b/src/store/csv/stub/content/cpih/2023-10/wrangle.R deleted file mode 100644 index f0119647..00000000 --- a/src/store/csv/stub/content/cpih/2023-10/wrangle.R +++ /dev/null @@ -1,19 +0,0 @@ -library(dplyr) -library(lubridate) -library(readr) -library(stringr) - - -df <- read_csv("https://www.ons.gov.uk/generator?format=csv&uri=/economy/inflationandpriceindices/timeseries/l55o/mm23") - -df <- df[-(1:7), ] |> - rename(date = Title, cpih_annual_rate = `CPIH ANNUAL RATE 00: ALL ITEMS 2015=100`) |> - mutate(geography = "K02000001", geography_name = "United Kingdom", .before = everything()) |> - mutate(date = case_when( - str_detect(date, "^\\d{4}$") ~ date, - str_detect(date, "^\\d{4} [A-Z]{3}$") ~ ym(date, quiet = TRUE) |> format("%Y-%m"), - str_detect(date, "^\\d{4} Q[1-4]$") ~ str_replace_all(date, " ", "-"), - TRUE ~ NA - )) - -write_csv(df, "src/store/csv/stub/content/cpih/2023-10/1.csv") From 8a80debb70d5a54d9f3ae6e3412a029c611d7560 Mon Sep 17 00:00:00 2001 From: rossbowen Date: Mon, 20 Nov 2023 17:27:25 +0000 Subject: [PATCH 04/11] More test amends --- .../stub/content/editions/cpih_2022-01.json | 75 +++++++++++++++++++ .../stub/content/editions/cpih_2023-10.json | 7 +- tests/store/csv/test_csv_stub.py | 4 +- .../oxigraph/test_oxigraph_edition.py | 10 +-- .../oxigraph/test_oxigraph_version.py | 9 ++- 5 files changed, 90 insertions(+), 15 deletions(-) create mode 100644 src/store/metadata/stub/content/editions/cpih_2022-01.json diff --git a/src/store/metadata/stub/content/editions/cpih_2022-01.json b/src/store/metadata/stub/content/editions/cpih_2022-01.json new file mode 100644 index 00000000..75c0fe92 --- /dev/null +++ b/src/store/metadata/stub/content/editions/cpih_2022-01.json @@ -0,0 +1,75 @@ +{ + "@context": "https://staging.idpd.uk/ns#", + "@id": "https://staging.idpd.uk/datasets/cpih/editions", + "@type": "hydra:Collection", + "title": "Consumer Price Inflation including owner occupiers' housing costs (CPIH)", + "editions": [ + { + "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10", + "@type": "dcat:Dataset", + "in_series": "https://staging.idpd.uk/datasets/cpih", + "identifier": "2023-10", + "title": "Consumer Prices Index including owner occupiers' housing costs (CPIH)", + "summary": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation.", + "description": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation. CPIH is the most comprehensive measure of inflation. It extends Consumer Prices Index to include a measure of the costs associated with owning, maintaining and living in one's own home, known as owner occupiers' housing costs (OOH), along with council tax.", + "publisher": "https://staging.idpd.uk/office-for-national-statistics", + "creator": "office-for-national-statistics", + "contact_point": { + "name": "Consumer Price Inflation Enquiries", + "email": "mailto:cpih@ons.gov.uk" + }, + "topics": ["https://staging.idpd.uk/topics/economy"], + "frequency": "monthly", + "keywords": ["inflation", "consumer price index", "CPIH"], + "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", + "issued": "2017-02-21T09:30:00Z", + "modified": "2017-02-21T09:30:00Z", + "spatial_resolution": ["E01", "E92"], + "spatial_coverage": "E92000001", + "temporal_resolution": ["P1M", "P3M", "P1Y"], + "temporal_coverage": { + "start": "1981-01-01T00:00:00Z", + "end": "2023-10-31T00:00:00Z" + }, + "versions_url": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions", + "versions": [ + { + "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", + "issued": "2017-01-01T00:00:00", + "modified": "2017-01-01T00:00:00" + } + ], + "next_release": "2017-03-11T09:30:00Z", + "table_schema": { + "columns": [ + { + "name": "Period", + "datatype": "xsd:datetime", + "titles": "Time period", + "description": "The time period associated with the observation." + }, + { + "name": "CPIH", + "datatype": "xsd:decimal", + "titles": "Consumer Price Index including Housing (CPIH)", + "description": "The consumer price index including housing for the given time period." + }, + { + "name": "CPI", + "datatype": "xsd:decimal", + "titles": "Consumer Price Index (CPI)", + "description": "The consumer price index including for the given time period." + }, + { + "name": "OOH", + "datatype": "xsd:decimal", + "titles": "Owner occupiers’ housing costs", + "description": "An index of owner occupiers' housing costs for the given time period." + } + ] + } + } + ], + "count": 1, + "offset": 0 +} diff --git a/src/store/metadata/stub/content/editions/cpih_2023-10.json b/src/store/metadata/stub/content/editions/cpih_2023-10.json index 6cee0584..c3a7e8ee 100644 --- a/src/store/metadata/stub/content/editions/cpih_2023-10.json +++ b/src/store/metadata/stub/content/editions/cpih_2023-10.json @@ -8,7 +8,7 @@ "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10", "@type": "dcat:Dataset", "in_series": "https://staging.idpd.uk/datasets/cpih", - "identifier": "2022-01", + "identifier": "2023-10", "title": "Consumer Prices Index including owner occupiers' housing costs (CPIH)", "summary": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation.", "description": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation. CPIH is the most comprehensive measure of inflation. It extends Consumer Prices Index to include a measure of the costs associated with owning, maintaining and living in one's own home, known as owner occupiers' housing costs (OOH), along with council tax.", @@ -29,14 +29,13 @@ "temporal_resolution": ["P1M", "P3M", "P1Y"], "temporal_coverage": { "start": "1981-01-01T00:00:00Z", - "end": "2022-01-31T00:00:00Z" + "end": "2023-10-31T00:00:00Z" }, "versions_url": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions", "versions": [ { "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", - "issued": "2017-01-01T00:00:00", - "modified": "2017-01-01T00:00:00" + "issued": "2017-01-01T00:00:00" } ], "next_release": "2017-03-11T09:30:00Z", diff --git a/tests/store/csv/test_csv_stub.py b/tests/store/csv/test_csv_stub.py index fc512f26..41f45e1b 100644 --- a/tests/store/csv/test_csv_stub.py +++ b/tests/store/csv/test_csv_stub.py @@ -18,7 +18,7 @@ def test_csv_stub_returns_csv_without_file_extentions(): the ".csv" file extensions. """ csv_store = StubCsvStore() - assert isinstance(csv_store.get_version("cpih", "2022-01", "1.csv"), FileResponse) + assert isinstance(csv_store.get_version("cpih", "2023-10", "1.csv"), FileResponse) def test_csv_stub_returns_csv_with_file_extentions(): @@ -28,7 +28,7 @@ def test_csv_stub_returns_csv_with_file_extentions(): the ".csv" file extension. """ csv_store = StubCsvStore() - assert isinstance(csv_store.get_version("cpih", "2022-01", "1"), FileResponse) + assert isinstance(csv_store.get_version("cpih", "2023-10", "1"), FileResponse) def test_csv_stub_returns_none(): diff --git a/tests/store/metadata/oxigraph/test_oxigraph_edition.py b/tests/store/metadata/oxigraph/test_oxigraph_edition.py index 39e66b8d..55d3927e 100644 --- a/tests/store/metadata/oxigraph/test_oxigraph_edition.py +++ b/tests/store/metadata/oxigraph/test_oxigraph_edition.py @@ -16,13 +16,13 @@ def test_oxigraph_get_edition_returns_valid_structure(): store = OxigraphMetadataStore() - edition = store.get_edition("cpih", "2022-01") + edition = store.get_edition("cpih", "2023-10") edition_schema = schemas.Edition(**edition) - assert edition_schema.id == "https://staging.idpd.uk/datasets/cpih/editions/2022-01" + assert edition_schema.id == "https://staging.idpd.uk/datasets/cpih/editions/2023-10" assert edition_schema.type == "dcat:Dataset" assert edition_schema.description == "The Consumer Prices Index..." - assert edition_schema.identifier == "2022-01" + assert edition_schema.identifier == "2023-10" assert len(edition_schema.table_schema.columns) == 4 @@ -35,10 +35,10 @@ def test_oxigraph_get_edition_with_context_returns_valid_structure(): store = OxigraphMetadataStore() - edition = store.get_edition("cpih", "2022-01") + edition = store.get_edition("cpih", "2023-10") edition_schema = schemas.EditionWithContext(**edition) - assert edition_schema.id == "https://staging.idpd.uk/datasets/cpih/editions/2022-01" + assert edition_schema.id == "https://staging.idpd.uk/datasets/cpih/editions/2023-10" assert edition_schema.type == "dcat:Dataset" assert edition_schema.context == "https://staging.idpd.uk/ns#" diff --git a/tests/store/metadata/oxigraph/test_oxigraph_version.py b/tests/store/metadata/oxigraph/test_oxigraph_version.py index b2b9efaa..7633b0e0 100644 --- a/tests/store/metadata/oxigraph/test_oxigraph_version.py +++ b/tests/store/metadata/oxigraph/test_oxigraph_version.py @@ -15,13 +15,13 @@ def test_oxigraph_get_version_returns_valid_structure(): """ store = OxigraphMetadataStore() - version = store.get_version("cpih", "2022-01", "1") + version = store.get_version("cpih", "2023-10", "1") version_schema = schemas.Version(**version) version_schema_context = schemas.VersionWithContext(**version) assert ( version_schema.id - == "https://staging.idpd.uk/datasets/cpih/editions/2022-01/versions/1" + == "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1" ) assert "dcat:Distribution" in version_schema.type assert "csvw:Table" in version_schema.type @@ -38,14 +38,15 @@ def test_oxigraph_get_version_returns_valid_structure(): assert version_schema.description == "The Consumer Prices Index..." assert ( version_schema.download_url - == "https://staging.idpd.uk/datasets/cpih/editions/2022-01/versions/1.csv" + == "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1.csv" ) assert version_schema.media_type == "text/csv" assert len(version_schema.table_schema.columns) == 4 assert version_schema_context.context == "https://staging.idpd.uk/ns#" + def test_version_schema_validation(): """Confirm that the schema validation is working as intended i.e raises ValidationError with wrong structure""" with pytest.raises(ValidationError): - schemas.VersionWithContext(**{"I": "break"}) \ No newline at end of file + schemas.VersionWithContext(**{"I": "break"}) From 1202961aa92d8c1b250413299eec3199473269ce Mon Sep 17 00:00:00 2001 From: rossbowen Date: Mon, 20 Nov 2023 17:43:16 +0000 Subject: [PATCH 05/11] Remove old edition --- .../stub/content/editions/cpih_2022-01.json | 75 ------------------- 1 file changed, 75 deletions(-) delete mode 100644 src/store/metadata/stub/content/editions/cpih_2022-01.json diff --git a/src/store/metadata/stub/content/editions/cpih_2022-01.json b/src/store/metadata/stub/content/editions/cpih_2022-01.json deleted file mode 100644 index 75c0fe92..00000000 --- a/src/store/metadata/stub/content/editions/cpih_2022-01.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "@context": "https://staging.idpd.uk/ns#", - "@id": "https://staging.idpd.uk/datasets/cpih/editions", - "@type": "hydra:Collection", - "title": "Consumer Price Inflation including owner occupiers' housing costs (CPIH)", - "editions": [ - { - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10", - "@type": "dcat:Dataset", - "in_series": "https://staging.idpd.uk/datasets/cpih", - "identifier": "2023-10", - "title": "Consumer Prices Index including owner occupiers' housing costs (CPIH)", - "summary": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation.", - "description": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation. CPIH is the most comprehensive measure of inflation. It extends Consumer Prices Index to include a measure of the costs associated with owning, maintaining and living in one's own home, known as owner occupiers' housing costs (OOH), along with council tax.", - "publisher": "https://staging.idpd.uk/office-for-national-statistics", - "creator": "office-for-national-statistics", - "contact_point": { - "name": "Consumer Price Inflation Enquiries", - "email": "mailto:cpih@ons.gov.uk" - }, - "topics": ["https://staging.idpd.uk/topics/economy"], - "frequency": "monthly", - "keywords": ["inflation", "consumer price index", "CPIH"], - "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", - "issued": "2017-02-21T09:30:00Z", - "modified": "2017-02-21T09:30:00Z", - "spatial_resolution": ["E01", "E92"], - "spatial_coverage": "E92000001", - "temporal_resolution": ["P1M", "P3M", "P1Y"], - "temporal_coverage": { - "start": "1981-01-01T00:00:00Z", - "end": "2023-10-31T00:00:00Z" - }, - "versions_url": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions", - "versions": [ - { - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", - "issued": "2017-01-01T00:00:00", - "modified": "2017-01-01T00:00:00" - } - ], - "next_release": "2017-03-11T09:30:00Z", - "table_schema": { - "columns": [ - { - "name": "Period", - "datatype": "xsd:datetime", - "titles": "Time period", - "description": "The time period associated with the observation." - }, - { - "name": "CPIH", - "datatype": "xsd:decimal", - "titles": "Consumer Price Index including Housing (CPIH)", - "description": "The consumer price index including housing for the given time period." - }, - { - "name": "CPI", - "datatype": "xsd:decimal", - "titles": "Consumer Price Index (CPI)", - "description": "The consumer price index including for the given time period." - }, - { - "name": "OOH", - "datatype": "xsd:decimal", - "titles": "Owner occupiers’ housing costs", - "description": "An index of owner occupiers' housing costs for the given time period." - } - ] - } - } - ], - "count": 1, - "offset": 0 -} From 1386a9df8747146892a46159aff60fe926d3704b Mon Sep 17 00:00:00 2001 From: rossbowen Date: Mon, 20 Nov 2023 17:48:59 +0000 Subject: [PATCH 06/11] Fix modified date of edition --- src/store/metadata/stub/content/editions/cpih_2023-10.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/store/metadata/stub/content/editions/cpih_2023-10.json b/src/store/metadata/stub/content/editions/cpih_2023-10.json index c3a7e8ee..da97583c 100644 --- a/src/store/metadata/stub/content/editions/cpih_2023-10.json +++ b/src/store/metadata/stub/content/editions/cpih_2023-10.json @@ -35,10 +35,11 @@ "versions": [ { "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", - "issued": "2017-01-01T00:00:00" + "issued": "2023-11-16T07:00:00Z", + "modified": "2023-11-16T07:00:00Z" } ], - "next_release": "2017-03-11T09:30:00Z", + "next_release": "2023-12-20T07:00:00Z", "table_schema": { "columns": [ { From 67456e8da9c7d1ff45d7533393754b1c3d73aba0 Mon Sep 17 00:00:00 2001 From: mike Date: Mon, 20 Nov 2023 17:58:36 +0000 Subject: [PATCH 07/11] tweak data --- .../stub/content/editions/cpih_2022-01.json | 75 ------------------- .../stub/content/editions/cpih_2023-10.json | 3 +- 2 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 src/store/metadata/stub/content/editions/cpih_2022-01.json diff --git a/src/store/metadata/stub/content/editions/cpih_2022-01.json b/src/store/metadata/stub/content/editions/cpih_2022-01.json deleted file mode 100644 index 75c0fe92..00000000 --- a/src/store/metadata/stub/content/editions/cpih_2022-01.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "@context": "https://staging.idpd.uk/ns#", - "@id": "https://staging.idpd.uk/datasets/cpih/editions", - "@type": "hydra:Collection", - "title": "Consumer Price Inflation including owner occupiers' housing costs (CPIH)", - "editions": [ - { - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10", - "@type": "dcat:Dataset", - "in_series": "https://staging.idpd.uk/datasets/cpih", - "identifier": "2023-10", - "title": "Consumer Prices Index including owner occupiers' housing costs (CPIH)", - "summary": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation.", - "description": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation. CPIH is the most comprehensive measure of inflation. It extends Consumer Prices Index to include a measure of the costs associated with owning, maintaining and living in one's own home, known as owner occupiers' housing costs (OOH), along with council tax.", - "publisher": "https://staging.idpd.uk/office-for-national-statistics", - "creator": "office-for-national-statistics", - "contact_point": { - "name": "Consumer Price Inflation Enquiries", - "email": "mailto:cpih@ons.gov.uk" - }, - "topics": ["https://staging.idpd.uk/topics/economy"], - "frequency": "monthly", - "keywords": ["inflation", "consumer price index", "CPIH"], - "licence": "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", - "issued": "2017-02-21T09:30:00Z", - "modified": "2017-02-21T09:30:00Z", - "spatial_resolution": ["E01", "E92"], - "spatial_coverage": "E92000001", - "temporal_resolution": ["P1M", "P3M", "P1Y"], - "temporal_coverage": { - "start": "1981-01-01T00:00:00Z", - "end": "2023-10-31T00:00:00Z" - }, - "versions_url": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions", - "versions": [ - { - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", - "issued": "2017-01-01T00:00:00", - "modified": "2017-01-01T00:00:00" - } - ], - "next_release": "2017-03-11T09:30:00Z", - "table_schema": { - "columns": [ - { - "name": "Period", - "datatype": "xsd:datetime", - "titles": "Time period", - "description": "The time period associated with the observation." - }, - { - "name": "CPIH", - "datatype": "xsd:decimal", - "titles": "Consumer Price Index including Housing (CPIH)", - "description": "The consumer price index including housing for the given time period." - }, - { - "name": "CPI", - "datatype": "xsd:decimal", - "titles": "Consumer Price Index (CPI)", - "description": "The consumer price index including for the given time period." - }, - { - "name": "OOH", - "datatype": "xsd:decimal", - "titles": "Owner occupiers’ housing costs", - "description": "An index of owner occupiers' housing costs for the given time period." - } - ] - } - } - ], - "count": 1, - "offset": 0 -} diff --git a/src/store/metadata/stub/content/editions/cpih_2023-10.json b/src/store/metadata/stub/content/editions/cpih_2023-10.json index c3a7e8ee..73391fa2 100644 --- a/src/store/metadata/stub/content/editions/cpih_2023-10.json +++ b/src/store/metadata/stub/content/editions/cpih_2023-10.json @@ -35,7 +35,8 @@ "versions": [ { "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", - "issued": "2017-01-01T00:00:00" + "issued": "2017-01-01T00:00:00", + "modified": "2023-11-15T07:00:00Z" } ], "next_release": "2017-03-11T09:30:00Z", From 7894f203bfbd60e338fa7e48658d01f44d2b1076 Mon Sep 17 00:00:00 2001 From: rossbowen Date: Mon, 20 Nov 2023 17:58:38 +0000 Subject: [PATCH 08/11] Amend edition table schema --- .../stub/content/editions/cpih_2023-10.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/store/metadata/stub/content/editions/cpih_2023-10.json b/src/store/metadata/stub/content/editions/cpih_2023-10.json index da97583c..bb21d526 100644 --- a/src/store/metadata/stub/content/editions/cpih_2023-10.json +++ b/src/store/metadata/stub/content/editions/cpih_2023-10.json @@ -43,28 +43,28 @@ "table_schema": { "columns": [ { - "name": "Period", - "datatype": "xsd:datetime", - "titles": "Time period", - "description": "The time period associated with the observation." + "name": "geography", + "datatype": "string", + "titles": "geography", + "description": "The code associated with the geography." }, { - "name": "CPIH", - "datatype": "xsd:decimal", - "titles": "Consumer Price Index including Housing (CPIH)", - "description": "The consumer price index including housing for the given time period." + "name": "geography_name", + "datatype": "string", + "titles": "geography_name", + "description": "The name associated with the geography." }, { - "name": "CPI", - "datatype": "xsd:decimal", - "titles": "Consumer Price Index (CPI)", - "description": "The consumer price index including for the given time period." + "name": "date", + "datatype": "gYearMonth", + "titles": "date", + "description": "The date associated with the observation." }, { - "name": "OOH", - "datatype": "xsd:decimal", - "titles": "Owner occupiers’ housing costs", - "description": "An index of owner occupiers' housing costs for the given time period." + "name": "cpih_annual_rate", + "datatype": "number", + "titles": "cpih_annual_rate", + "description": "The Consumer Prices Index including owner occupiers' housing costs (CPIH) percentage change over 12 months." } ] } From 7f6ab1498599954ae67d23fb2c61e3dbac61102b Mon Sep 17 00:00:00 2001 From: mike Date: Mon, 20 Nov 2023 18:18:12 +0000 Subject: [PATCH 09/11] correct --- .../metadata/stub/content/editions/versions/cpih_2023-10.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/metadata/stub/content/editions/versions/cpih_2023-10.json b/src/store/metadata/stub/content/editions/versions/cpih_2023-10.json index 01592aed..0c949062 100644 --- a/src/store/metadata/stub/content/editions/versions/cpih_2023-10.json +++ b/src/store/metadata/stub/content/editions/versions/cpih_2023-10.json @@ -1,6 +1,6 @@ { "@context": "https://staging.idpd.uk/ns#", - "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions/1", + "@id": "https://staging.idpd.uk/datasets/cpih/editions/2023-10/versions", "@type": "hydra:Collection", "title": "Consumer Price Inflation including owner occupiers' housing costs (CPIH)", "versions": [ From 7a41b90ff10ef045f215f858df66e0a24977df2d Mon Sep 17 00:00:00 2001 From: mike Date: Mon, 20 Nov 2023 18:41:25 +0000 Subject: [PATCH 10/11] long form creator --- src/main.py | 2 +- src/store/metadata/stub/content/editions/cpih_2023-10.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index bd46430d..6adb9b0f 100644 --- a/src/main.py +++ b/src/main.py @@ -316,7 +316,7 @@ def get_dataset_edition_version_by_id( This endpoint returns detailed information about a specific version of a dataset based on its unique identifier. """ - if request.headers["Accept"] == CSV: + if request.headers["Accept"] == CSV or BROWSABLE: csv_data = csv_store.get_version(dataset_id, edition_id, version_id) if csv_data is not None: response.status_code = status.HTTP_200_OK diff --git a/src/store/metadata/stub/content/editions/cpih_2023-10.json b/src/store/metadata/stub/content/editions/cpih_2023-10.json index 6f848ee7..61668ee9 100644 --- a/src/store/metadata/stub/content/editions/cpih_2023-10.json +++ b/src/store/metadata/stub/content/editions/cpih_2023-10.json @@ -13,7 +13,7 @@ "summary": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation.", "description": "The Consumer Prices Index (CPI), Consumer Prices Index including owner occupiers' housing costs (CPIH), and owner occupiers' housing costs (OOH) inflation. CPIH is the most comprehensive measure of inflation. It extends Consumer Prices Index to include a measure of the costs associated with owning, maintaining and living in one's own home, known as owner occupiers' housing costs (OOH), along with council tax.", "publisher": "https://staging.idpd.uk/office-for-national-statistics", - "creator": "office-for-national-statistics", + "creator": "https://staging.idpd.uk/office-for-national-statistics", "contact_point": { "name": "Consumer Price Inflation Enquiries", "email": "mailto:cpih@ons.gov.uk" From fe7c74ec0e2e1c18c612e450ebba84a0d2f5fe6e Mon Sep 17 00:00:00 2001 From: mike Date: Mon, 20 Nov 2023 18:42:35 +0000 Subject: [PATCH 11/11] not browsable --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 6adb9b0f..bd46430d 100644 --- a/src/main.py +++ b/src/main.py @@ -316,7 +316,7 @@ def get_dataset_edition_version_by_id( This endpoint returns detailed information about a specific version of a dataset based on its unique identifier. """ - if request.headers["Accept"] == CSV or BROWSABLE: + if request.headers["Accept"] == CSV: csv_data = csv_store.get_version(dataset_id, edition_id, version_id) if csv_data is not None: response.status_code = status.HTTP_200_OK