Skip to content

Commit 26ccdd1

Browse files
Update package version
1 parent e8284bb commit 26ccdd1

11 files changed

Lines changed: 1388 additions & 1154 deletions

File tree

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,36 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.19.4] - 2025-10-07 16:32:10
9+
10+
### Added
11+
12+
- Regional and country labels for UK constituencies.
13+
14+
## [1.19.3] - 2025-10-02 16:46:59
15+
16+
### Changed
17+
18+
- Relaxed childcare test tolerance to allow ratios within 100% of target (0 to 2.0)
19+
20+
## [1.19.2] - 2025-10-02 16:12:23
21+
22+
### Changed
23+
24+
- Relaxed childcare test tolerance to allow ratios up to 1.6
25+
26+
## [1.19.1] - 2025-10-02 15:18:04
27+
28+
### Changed
29+
30+
- Remove birth_year from FRS dataset generation to allow dynamic calculation
31+
32+
## [1.19.0] - 2025-10-02 14:29:16
33+
34+
### Fixed
35+
36+
- Re-add dividends to calibration target set.
37+
838
## [1.18.0] - 2025-09-30 13:58:18
939

1040
### Changed
@@ -346,6 +376,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
346376

347377

348378

379+
[1.19.4]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.19.3...1.19.4
380+
[1.19.3]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.19.2...1.19.3
381+
[1.19.2]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.19.1...1.19.2
382+
[1.19.1]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.19.0...1.19.1
383+
[1.19.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.18.0...1.19.0
349384
[1.18.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.17.11...1.18.0
350385
[1.17.11]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.17.10...1.17.11
351386
[1.17.10]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.17.9...1.17.10

changelog.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,3 +288,29 @@
288288
- Jupyter Book deployment to GitHub Pages by adding docs workflow and fixing branch
289289
reference
290290
date: 2025-09-30 13:58:18
291+
- bump: minor
292+
changes:
293+
fixed:
294+
- Re-add dividends to calibration target set.
295+
date: 2025-10-02 14:29:16
296+
- bump: patch
297+
changes:
298+
changed:
299+
- Remove birth_year from FRS dataset generation to allow dynamic calculation
300+
date: 2025-10-02 15:18:04
301+
- bump: patch
302+
changes:
303+
changed:
304+
- Relaxed childcare test tolerance to allow ratios up to 1.6
305+
date: 2025-10-02 16:12:23
306+
- bump: patch
307+
changes:
308+
changed:
309+
- Relaxed childcare test tolerance to allow ratios within 100% of target (0 to
310+
2.0)
311+
date: 2025-10-02 16:46:59
312+
- bump: patch
313+
changes:
314+
added:
315+
- Regional and country labels for UK constituencies.
316+
date: 2025-10-07 16:32:10

policyengine_uk_data/datasets/frs.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ def create_frs(
110110
# Add basic personal variables
111111
age = person.age80 + person.age
112112
pe_person["age"] = age
113-
pe_person["birth_year"] = np.ones_like(person.age) * (year - age)
113+
# birth_year should be calculated from age and period in the model,
114+
# not stored as static data (see PolicyEngine/policyengine-uk#1352)
114115
# Age fields are AGE80 (top-coded) and AGE in the adult and child tables, respectively.
115116
pe_person["gender"] = np.where(person.sex == 1, "MALE", "FEMALE")
116117
pe_person["hours_worked"] = np.maximum(person.tothours, 0) * 52

policyengine_uk_data/datasets/spi.py

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,22 @@ def create_spi(
2222
household["household_weight"] = df.FACT
2323
person["dividend_income"] = df.DIVIDENDS
2424
person["gift_aid"] = df.GIFTAID
25-
household["region"] = (
26-
df.GORCODE.map(
27-
{
28-
1: "NORTH_EAST",
29-
2: "NORTH_WEST",
30-
3: "YORKSHIRE",
31-
4: "EAST_MIDLANDS",
32-
5: "WEST_MIDLANDS",
33-
6: "EAST_OF_ENGLAND",
34-
7: "LONDON",
35-
8: "SOUTH_EAST",
36-
9: "SOUTH_WEST",
37-
10: "WALES",
38-
11: "SCOTLAND",
39-
12: "NORTHERN_IRELAND",
40-
}
41-
)
42-
.fillna("SOUTH_EAST")
43-
)
25+
household["region"] = df.GORCODE.map(
26+
{
27+
1: "NORTH_EAST",
28+
2: "NORTH_WEST",
29+
3: "YORKSHIRE",
30+
4: "EAST_MIDLANDS",
31+
5: "WEST_MIDLANDS",
32+
6: "EAST_OF_ENGLAND",
33+
7: "LONDON",
34+
8: "SOUTH_EAST",
35+
9: "SOUTH_WEST",
36+
10: "WALES",
37+
11: "SCOTLAND",
38+
12: "NORTHERN_IRELAND",
39+
}
40+
).fillna("SOUTH_EAST")
4441
household["rent"] = 0
4542
household["tenure_type"] = "OWNED_OUTRIGHT"
4643
household["council_tax"] = 0

0 commit comments

Comments
 (0)