Update Python version and Makefile for consistency

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).
 
+## [1.19.4] - 2025-10-07 16:32:10
+
+### Added
+
+- Regional and country labels for UK constituencies.
+
+## [1.19.3] - 2025-10-02 16:46:59
+
+### Changed
+
+- Relaxed childcare test tolerance to allow ratios within 100% of target (0 to 2.0)
+
+## [1.19.2] - 2025-10-02 16:12:23
+
+### Changed
+
+- Relaxed childcare test tolerance to allow ratios up to 1.6
+
+## [1.19.1] - 2025-10-02 15:18:04
+
+### Changed
+
+- Remove birth_year from FRS dataset generation to allow dynamic calculation
+
+## [1.19.0] - 2025-10-02 14:29:16
+
+### Fixed
+
+- Re-add dividends to calibration target set.
+
 ## [1.18.0] - 2025-09-30 13:58:18
 
 ### Changed
@@ -346,6 +376,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[1.19.4]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.19.3...1.19.4
+[1.19.3]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.19.2...1.19.3
+[1.19.2]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.19.1...1.19.2
+[1.19.1]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.19.0...1.19.1
+[1.19.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.18.0...1.19.0
 [1.18.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.17.11...1.18.0
 [1.17.11]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.17.10...1.17.11
 [1.17.10]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.17.9...1.17.10

Makefile

@@ -1,30 +1,30 @@
 all: data test
 
 format:
-	black . -l 79
+	uv run black . -l 79
 
 test:
-	pytest .
+	uv run pytest .
 
 install:
 	uv pip install -e ".[dev]" --config-settings editable_mode=compat
 
 download:
-	python policyengine_uk_data/storage/download_private_prerequisites.py
+	uv run python policyengine_uk_data/storage/download_private_prerequisites.py
 
 upload:
-	python policyengine_uk_data/storage/upload_completed_datasets.py
+	uv run python policyengine_uk_data/storage/upload_completed_datasets.py
 
 documentation:
-	pip install --pre "jupyter-book>=2"
+	uv pip install --pre "jupyter-book>=2"
 	jb clean docs && jb build docs
-	python docs/add_plotly_to_book.py docs
+	uv run python docs/add_plotly_to_book.py docs
 
 data:
-	python policyengine_uk_data/datasets/create_datasets.py
+	uv run python policyengine_uk_data/datasets/create_datasets.py
 
 build:
-	python -m build
+	uv run python -m build
 
 publish:
 	twine upload dist/*

changelog.yaml

@@ -288,3 +288,29 @@
     - Jupyter Book deployment to GitHub Pages by adding docs workflow and fixing branch
       reference
   date: 2025-09-30 13:58:18
+- bump: minor
+  changes:
+    fixed:
+    - Re-add dividends to calibration target set.
+  date: 2025-10-02 14:29:16
+- bump: patch
+  changes:
+    changed:
+    - Remove birth_year from FRS dataset generation to allow dynamic calculation
+  date: 2025-10-02 15:18:04
+- bump: patch
+  changes:
+    changed:
+    - Relaxed childcare test tolerance to allow ratios up to 1.6
+  date: 2025-10-02 16:12:23
+- bump: patch
+  changes:
+    changed:
+    - Relaxed childcare test tolerance to allow ratios within 100% of target (0 to
+      2.0)
+  date: 2025-10-02 16:46:59
+- bump: patch
+  changes:
+    added:
+    - Regional and country labels for UK constituencies.
+  date: 2025-10-07 16:32:10

changelog_entry.yaml

@@ -0,0 +1,5 @@
+- bump: patch
+  changes:
+    changed:
+    - Update Black target version from py311 to py313 to match project requirements
+    - Update Makefile commands to consistently use uv run for Python execution

policyengine_uk_data/datasets/frs.py

@@ -110,7 +110,8 @@ def create_frs(
     # Add basic personal variables
     age = person.age80 + person.age
     pe_person["age"] = age
-    pe_person["birth_year"] = np.ones_like(person.age) * (year - age)
+    # birth_year should be calculated from age and period in the model,
+    # not stored as static data (see PolicyEngine/policyengine-uk#1352)
     # Age fields are AGE80 (top-coded) and AGE in the adult and child tables, respectively.
     pe_person["gender"] = np.where(person.sex == 1, "MALE", "FEMALE")
     pe_person["hours_worked"] = np.maximum(person.tothours, 0) * 52