Rename labor to labour in LSR parameters (#1607)

vahid-ahmadi · claude · MaxGhenis · web-flow · commit 081be8f2c230 · 2026-05-01T12:34:20.000-04:00
* Rename labor to labour in LSR parameters and variables Use British English spelling throughout the labour supply response module: directory names, file names, parameter labels, descriptions, import paths, and test references. Fixes #853. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Remove unrelated EASY_ISSUES file * Add deprecation alias for legacy labor_supply_responses paths Mirror the two consumed paths (`income_elasticity` and `substitution_elasticity`) under the renamed `labour_supply_responses` tree back to `gov.simulation.labor_supply_responses.*`, so the legacy policyengine-app PolicyRightSidebar (which hard-codes the old paths) keeps working between this PR landing and the matching app PR rebuilding against the new path. Removes the merge-window breakage that would otherwise hit the LSR sliders. Remove this alias in a follow-up release once consumers (the app PR PolicyEngine/policyengine-app#2829) have migrated. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Map legacy LSR parameter changes --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Max Ghenis <mghenis@gmail.com>
diff --git a/changelog.d/853.md b/changelog.d/853.md
@@ -0,0 +1 @@
+- Rename `labor` to `labour` in LSR parameter and variable paths, labels, and descriptions to use British English spelling. The two consumed paths (`gov.simulation.labor_supply_responses.income_elasticity` and `.substitution_elasticity`) remain available as deprecation aliases for one release so downstream consumers — particularly the legacy `policyengine-app` PolicyRightSidebar — keep working until they migrate.
diff --git a/policyengine_uk/parameters/gov/simulation/labor_supply_responses/income_elasticity.yaml b/policyengine_uk/parameters/gov/simulation/labor_supply_responses/income_elasticity.yaml
diff --git a/policyengine_uk/parameters/gov/simulation/labor_supply_responses/substitution_elasticity.yaml b/policyengine_uk/parameters/gov/simulation/labor_supply_responses/substitution_elasticity.yaml
diff --git a/policyengine_uk/parameters/gov/simulation/labour_supply_responses/aliases.py b/policyengine_uk/parameters/gov/simulation/labour_supply_responses/aliases.py
@@ -0,0 +1,34 @@
+"""Deprecation aliases mirroring the renamed `labour_supply_responses` parameters
+under the legacy `labor_supply_responses` path.
+
+`policyengine-app` (legacy) hard-codes
+`gov.simulation.labor_supply_responses.{income_elasticity,substitution_elasticity}`
+in PolicyRightSidebar.jsx. Without this alias the LSR sliders break the
+moment a deployed app rebuilds against this version of policyengine-uk.
+The companion app PR (PolicyEngine/policyengine-app#2829) migrates to the
+new path; remove this alias once that ships.
+"""
+
+from policyengine_core.parameters import ParameterNode
+
+
+_LEGACY_LSR_PATH = "gov.simulation.labor_supply_responses"
+_CANONICAL_LSR_PATH = "gov.simulation.labour_supply_responses"
+
+
+def canonicalize_lsr_parameter_path(path: str) -> str:
+    if path == _LEGACY_LSR_PATH:
+        return _CANONICAL_LSR_PATH
+    if path.startswith(f"{_LEGACY_LSR_PATH}."):
+        return path.replace(_LEGACY_LSR_PATH, _CANONICAL_LSR_PATH, 1)
+    return path
+
+
+def add_lsr_deprecation_aliases(parameters: ParameterNode) -> ParameterNode:
+    simulation = parameters.gov.simulation
+    canonical = simulation.labour_supply_responses
+
+    legacy_node = canonical.clone()
+    legacy_node.name = _LEGACY_LSR_PATH
+    simulation.add_child("labor_supply_responses", legacy_node)
+    return parameters
diff --git a/policyengine_uk/parameters/gov/simulation/labour_supply_responses/bounds/README.md b/policyengine_uk/parameters/gov/simulation/labour_supply_responses/bounds/README.md
diff --git a/policyengine_uk/parameters/gov/simulation/labour_supply_responses/bounds/effective_wage_rate_change.yaml b/policyengine_uk/parameters/gov/simulation/labour_supply_responses/bounds/effective_wage_rate_change.yaml
diff --git a/policyengine_uk/parameters/gov/simulation/labour_supply_responses/bounds/income_change.yaml b/policyengine_uk/parameters/gov/simulation/labour_supply_responses/bounds/income_change.yaml
diff --git a/policyengine_uk/parameters/gov/simulation/labour_supply_responses/income_elasticity.yaml b/policyengine_uk/parameters/gov/simulation/labour_supply_responses/income_elasticity.yaml
@@ -0,0 +1,6 @@
+description: Percent change in labour supply given a 1% change in disposable income. This applies only to employment income.
+values:
+  2020-01-01: 0
+metadata:
+  unit: /1
+  label: Income elasticity of labour supply
diff --git a/policyengine_uk/parameters/gov/simulation/labour_supply_responses/obr_elasticities.yaml b/policyengine_uk/parameters/gov/simulation/labour_supply_responses/obr_elasticities.yaml
@@ -1,4 +1,4 @@
-description: Use the OBR's progression elasticities for the labor supply responses.
+description: Use the OBR's progression elasticities for the labour supply responses.
 values:
   2000-01-01: 0
 metadata:
diff --git a/policyengine_uk/parameters/gov/simulation/labour_supply_responses/substitution_elasticity.yaml b/policyengine_uk/parameters/gov/simulation/labour_supply_responses/substitution_elasticity.yaml
@@ -0,0 +1,6 @@
+description: Percent change in labour supply given a 1% change in the effective marginal wage. This applies only to employment income.
+values:
+  2020-01-01: 0
+metadata:
+  unit: /1
+  label: Substitution elasticity of labour supply
diff --git a/policyengine_uk/simulation.py b/policyengine_uk/simulation.py
@@ -28,6 +28,9 @@
 )
 from policyengine_uk.utils.dependencies import get_variable_dependencies
 from policyengine_uk.reforms import create_structural_reforms_from_parameters
+from policyengine_uk.parameters.gov.simulation.labour_supply_responses.aliases import (
+    canonicalize_lsr_parameter_path,
+)
 
 from .tax_benefit_system import CountryTaxBenefitSystem, DEFAULT_DATASET_ENV_VAR
 
@@ -221,7 +224,10 @@ def apply_parameter_changes(self, changes: dict):
         self.tax_benefit_system.reset_parameters()
 
         for parameter in changes:
-            p: Parameter = self.tax_benefit_system.parameters.get_child(parameter)
+            canonical_parameter = canonicalize_lsr_parameter_path(parameter)
+            p: Parameter = self.tax_benefit_system.parameters.get_child(
+                canonical_parameter
+            )
             if isinstance(changes[parameter], dict):
                 # Time-period specific changes
                 for time_period in changes[parameter]:
diff --git a/policyengine_uk/tax_benefit_system.py b/policyengine_uk/tax_benefit_system.py
@@ -30,6 +30,9 @@
 from policyengine_uk.parameters.gov.economic_assumptions.lag_cpi import (
     add_lagged_cpi,
 )
+from policyengine_uk.parameters.gov.simulation.labour_supply_responses.aliases import (
+    add_lsr_deprecation_aliases,
+)
 from policyengine_uk.utils.parameters import (
     backdate_parameters,
     convert_to_fiscal_year_parameters,
@@ -93,6 +96,7 @@ def process_parameters(self) -> None:
         self.parameters = add_lagged_cpi(self.parameters)
         self.parameters = add_triple_lock(self.parameters)
         self.parameters = create_economic_assumption_indices(self.parameters)
+        self.parameters = add_lsr_deprecation_aliases(self.parameters)
 
         # Create baseline parameters for reform comparisons
         self.parameters.add_child("baseline", self.parameters.clone())
diff --git a/policyengine_uk/tests/behavioral_responses/test_labour_supply_responses.yaml b/policyengine_uk/tests/behavioral_responses/test_labour_supply_responses.yaml
diff --git a/policyengine_uk/tests/test_behavioral_responses.py b/policyengine_uk/tests/test_behavioral_responses.py
@@ -1,5 +1,5 @@
 """
-Tests for behavioral labor supply responses.
+Tests for behavioral labour supply responses.
 
 This test module validates that the behavioral response system works correctly
 and that all the critical fixes are functioning:
@@ -29,15 +29,40 @@
 
 # Load YAML test cases
 yaml_file = (
-    Path(__file__).parent / "behavioral_responses" / "test_labor_supply_responses.yaml"
+    Path(__file__).parent / "behavioral_responses" / "test_labour_supply_responses.yaml"
 )
 with open(yaml_file, "r") as f:
     yaml_content = f.read()
     test_cases = yaml.safe_load(yaml_content)
 
 
 class TestBehavioralResponses:
-    """Test behavioral labor supply responses functionality"""
+    """Test behavioral labour supply responses functionality"""
+
+    @pytest.mark.parametrize(
+        "parameter_path",
+        [
+            "gov.simulation.labour_supply_responses.income_elasticity",
+            "gov.simulation.labor_supply_responses.income_elasticity",
+        ],
+    )
+    def test_lsr_parameter_changes_accept_canonical_and_legacy_paths(
+        self, parameter_path
+    ):
+        """Test that renamed LSR parameters still accept legacy reform paths."""
+        scenario = Scenario(parameter_changes={parameter_path: {"2025": 0.123}})
+        sim = Microsimulation(
+            situation={
+                "people": {"person": {"age": 30, "employment_income": 25_000}},
+                "benunits": {"benunit": {"members": ["person"]}},
+                "households": {"household": {"members": ["person"]}},
+            },
+            scenario=scenario,
+        )
+
+        lsr = sim.tax_benefit_system.parameters.gov.simulation
+        assert lsr.labour_supply_responses.income_elasticity("2025") == 0.123
+        assert lsr.labor_supply_responses.income_elasticity("2025") == 0.123
 
     def test_yaml_file_structure(self):
         """Test that YAML file loads correctly and has expected structure"""
diff --git a/policyengine_uk/tests/test_labour_supply_response_formulas.py b/policyengine_uk/tests/test_labour_supply_response_formulas.py
@@ -6,10 +6,10 @@
 from policyengine_uk.dynamics.progression import (
     calculate_employment_income_change,
 )
-from policyengine_uk.variables.gov.simulation.labor_supply_response.income_elasticity_lsr import (
+from policyengine_uk.variables.gov.simulation.labour_supply_response.income_elasticity_lsr import (
     income_elasticity_lsr,
 )
-from policyengine_uk.variables.gov.simulation.labor_supply_response.substitution_elasticity_lsr import (
+from policyengine_uk.variables.gov.simulation.labour_supply_response.substitution_elasticity_lsr import (
     substitution_elasticity_lsr,
 )
 
@@ -26,7 +26,7 @@ class FakeParameters:
     def __init__(self, income_elasticity=0.1, substitution_elasticity=0.2):
         self.gov = SimpleNamespace(
             simulation=SimpleNamespace(
-                labor_supply_responses=SimpleNamespace(
+                labour_supply_responses=SimpleNamespace(
                     income_elasticity=income_elasticity,
                     substitution_elasticity=substitution_elasticity,
                 )
@@ -67,7 +67,7 @@ def test_substitution_elasticity_lsr_clips_negative_earnings():
     assert np.allclose(result, np.array([0.0, 0.0, 40.0]))
 
 
-def test_progression_labor_supply_response_clips_negative_earnings():
+def test_progression_labour_supply_response_clips_negative_earnings():
     result = calculate_employment_income_change(
         employment_income=np.array([-1_000.0, 0.0, 1_000.0]),
         derivative_changes=pd.DataFrame({"wage_rel_change": [0.1, 0.1, 0.1]}),
diff --git a/policyengine_uk/variables/gov/simulation/labour_supply_response/employment_income_behavioral_response.py b/policyengine_uk/variables/gov/simulation/labour_supply_response/employment_income_behavioral_response.py
@@ -4,12 +4,12 @@
 class employment_income_behavioral_response(Variable):
     value_type = float
     entity = Person
-    label = "income-related labor supply change"
+    label = "income-related labour supply change"
     unit = GBP
     definition_period = YEAR
 
     def formula(person, period, parameters):
-        lsr = parameters(period).gov.simulation.labor_supply_responses
+        lsr = parameters(period).gov.simulation.labour_supply_responses
         simulation = person.simulation
         if simulation.baseline is None:
             return 0  # No reform, no impact
diff --git a/policyengine_uk/variables/gov/simulation/labour_supply_response/income_elasticity_lsr.py b/policyengine_uk/variables/gov/simulation/labour_supply_response/income_elasticity_lsr.py
@@ -4,13 +4,13 @@
 class income_elasticity_lsr(Variable):
     value_type = float
     entity = Person
-    label = "income elasticity of labor supply response"
+    label = "income elasticity of labour supply response"
     unit = GBP
     definition_period = YEAR
     requires_computation_after = "employment_income_behavioral_response"
 
     def formula(person, period, parameters):
-        lsr = parameters(period).gov.simulation.labor_supply_responses
+        lsr = parameters(period).gov.simulation.labour_supply_responses
         employment_income = max_(person("employment_income_before_lsr", period), 0)
         income_change = person("relative_income_change", period)
 
diff --git a/policyengine_uk/variables/gov/simulation/labour_supply_response/relative_income_change.py b/policyengine_uk/variables/gov/simulation/labour_supply_response/relative_income_change.py
@@ -26,7 +26,7 @@ def formula(person, period, parameters):
         net_income = measurement_person.household("household_net_income", period)
         income_change_bound = parameters(
             period
-        ).gov.simulation.labor_supply_responses.bounds.income_change
+        ).gov.simulation.labour_supply_responses.bounds.income_change
         # _c suffix for "clipped"
         baseline_net_income_c = np.clip(baseline_net_income, 1, None)
         net_income_c = np.clip(net_income, 1, None)
diff --git a/policyengine_uk/variables/gov/simulation/labour_supply_response/relative_wage_change.py b/policyengine_uk/variables/gov/simulation/labour_supply_response/relative_wage_change.py
@@ -32,5 +32,5 @@ def formula(person, period, parameters):
         relative_change = (wage_rate_c - baseline_wage_c) / baseline_wage_c
         wage_change_bound = parameters(
             period
-        ).gov.simulation.labor_supply_responses.bounds.effective_wage_rate_change
+        ).gov.simulation.labour_supply_responses.bounds.effective_wage_rate_change
         return np.clip(relative_change, -wage_change_bound, wage_change_bound)
diff --git a/policyengine_uk/variables/gov/simulation/labour_supply_response/substitution_elasticity_lsr.py b/policyengine_uk/variables/gov/simulation/labour_supply_response/substitution_elasticity_lsr.py
@@ -4,13 +4,13 @@
 class substitution_elasticity_lsr(Variable):
     value_type = float
     entity = Person
-    label = "substitution elasticity of labor supply response"
+    label = "substitution elasticity of labour supply response"
     unit = GBP
     definition_period = YEAR
     requires_computation_after = "employment_income_behavioral_response"
 
     def formula(person, period, parameters):
-        lsr = parameters(period).gov.simulation.labor_supply_responses
+        lsr = parameters(period).gov.simulation.labour_supply_responses
         employment_income = max_(person("employment_income_before_lsr", period), 0)
         wage_change = person("relative_wage_change", period)
 
diff --git a/policyengine_uk/variables/input/employment_income_before_lsr.py b/policyengine_uk/variables/input/employment_income_before_lsr.py
@@ -4,7 +4,7 @@
 class employment_income_before_lsr(Variable):
     value_type = float
     entity = Person
-    label = "employment income before labor supply responses"
+    label = "employment income before labour supply responses"
     unit = GBP
     definition_period = YEAR
     uprating = "gov.economic_assumptions.indices.obr.average_earnings"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+- Rename `labor` to `labour` in LSR parameter and variable paths, labels, and descriptions to use British English spelling. The two consumed paths (`gov.simulation.labor_supply_responses.income_elasticity` and `.substitution_elasticity`) remain available as deprecation aliases for one release so downstream consumers — particularly the legacy `policyengine-app` PolicyRightSidebar — keep working until they migrate.
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-description: Use the OBR's progression elasticities for the labor supply responses.`
	`1`	`+description: Use the OBR's progression elasticities for the labour supply responses.`
`2`	`2`	`values:`
`3`	`3`	`2000-01-01: 0`
`4`	`4`	`metadata:`