Merge branch 'master' into master

PolicyEngine · Sep 14, 2023 · 416e32f · 416e32f
2 parents e22ab8a + 71b2059
commit 416e32f
Show file tree

Hide file tree

Showing 16 changed files with 6,660 additions and 1,220 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,36 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.55.4] - 2023-09-14 15:25:24
+
+### Fixed
+
+- TOC entry for NI documentation.
+
+## [0.55.3] - 2023-09-14 13:53:16
+
+### Added
+
+- Documentation example.
+
+## [0.55.2] - 2023-08-24 14:59:45
+
+### Added
+
+- Documentation for fuel duty.
+
+## [0.55.1] - 2023-08-12 17:36:09
+
+### Fixed
+
+- Temporarily remove PIP, DLA and minimum wage parameters from the app.
+
+## [0.55.0] - 2023-08-07 16:52:20
+
+### Added
+
+- Updates values for universal credit from 2016 to 2023
+
 ## [0.54.0] - 2023-07-21 12:20:43
 
 ### Changed
@@ -989,6 +1019,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[0.55.4]: https://github.com/PolicyEngine/openfisca-uk/compare/0.55.3...0.55.4
+[0.55.3]: https://github.com/PolicyEngine/openfisca-uk/compare/0.55.2...0.55.3
+[0.55.2]: https://github.com/PolicyEngine/openfisca-uk/compare/0.55.1...0.55.2
+[0.55.1]: https://github.com/PolicyEngine/openfisca-uk/compare/0.55.0...0.55.1
+[0.55.0]: https://github.com/PolicyEngine/openfisca-uk/compare/0.54.0...0.55.0
 [0.54.0]: https://github.com/PolicyEngine/openfisca-uk/compare/0.53.0...0.54.0
 [0.53.0]: https://github.com/PolicyEngine/openfisca-uk/compare/0.52.0...0.53.0
 [0.52.0]: https://github.com/PolicyEngine/openfisca-uk/compare/0.51.1...0.52.0

diff --git a/changelog.yaml b/changelog.yaml
@@ -821,3 +821,28 @@
     changed:
     - Calibration updated with new DWP statistics.
   date: 2023-07-21 12:20:43
+- bump: minor
+  changes:
+    added:
+    - Updates values for universal credit from 2016 to 2023
+  date: 2023-08-07 16:52:20
+- bump: patch
+  changes:
+    fixed:
+    - Temporarily remove PIP, DLA and minimum wage parameters from the app.
+  date: 2023-08-12 17:36:09
+- bump: patch
+  changes:
+    added:
+    - Documentation for fuel duty.
+  date: 2023-08-24 14:59:45
+- bump: patch
+  changes:
+    added:
+    - Documentation example.
+  date: 2023-09-14 13:53:16
+- bump: patch
+  changes:
+    fixed:
+    - TOC entry for NI documentation.
+  date: 2023-09-14 15:25:24
diff --git a/docs/book/_config.yml b/docs/book/_config.yml
@@ -16,6 +16,8 @@ sphinx:
       - https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js
     html_theme: furo
     pygments_style: default
+    html_css_files:
+      - style.css
   extra_extensions:
     - "sphinx.ext.autodoc"
     - "sphinxarg.ext"

diff --git a/docs/book/_static/style.css b/docs/book/_static/style.css
@@ -0,0 +1,9 @@
+@import url('https://fonts.googleapis.com/css2?family=Roboto+Serif:[email protected]&family=Roboto:wght@300&display=swap');
+
+h1, h2, h3, h4, h5, h6 {
+    font-family: "Roboto";
+}
+
+body {
+    font-family: "Roboto Serif";
+}
diff --git a/docs/book/_toc.yml b/docs/book/_toc.yml
@@ -10,8 +10,13 @@ parts:
     chapters:
       - file: programs/gov/hmrc/child-benefit
       - file: programs/gov/dwp/universal-credit
+      - file: programs/gov/hmrc/national-insurance
+      - file: programs/gov/hmrc/fuel-duty
       - file: programs/contrib/ubi-center/carbon-tax
       - file: programs/gov/ofgem/energy-price-guarantee
   - caption: Using the model
     chapters:
       - file: usage/getting-started
+  - caption: Examples
+    chapters:
+      - file: examples/income-sources