policyengine-uk 2.35.0__py3-none-any.whl → 2.36.0__py3-none-any.whl

policyengine_uk/variables/gov/dwp/attendance_allowance_reported.py

@@ -7,4 +7,4 @@ class attendance_allowance_reported(Variable):
     label = "Attendance Allowance (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/basic_state_pension.py

@@ -24,6 +24,6 @@ class basic_state_pension(Variable):
             min_(reported, maximum_basic_sp),
             0,
         )
-        triple_lock = parameters.gov.dwp.state_pension.triple_lock.index
+        triple_lock = parameters.gov.economic_assumptions.indices.triple_lock
         uprating_since_data_year = triple_lock(period) / triple_lock(data_year)
         return amount_in_data_year * uprating_since_data_year * WEEKS_IN_YEAR

policyengine_uk/variables/gov/dwp/bsp_reported.py

@@ -7,4 +7,4 @@ class bsp_reported(Variable):
     label = "Bereavement Support Payment (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/carers_allowance_reported.py

@@ -7,4 +7,4 @@ class carers_allowance_reported(Variable):
     label = "Carer's Allowance (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/child_tax_credit_reported.py

@@ -7,4 +7,4 @@ class child_tax_credit_reported(Variable):
     label = "Working Tax Credit"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/dla/dla_m_reported.py

@@ -7,4 +7,4 @@ class dla_m_reported(Variable):
     label = "DLA (mobility) (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/dla/dla_sc_reported.py

@@ -7,4 +7,4 @@ class dla_sc_reported(Variable):
     label = "DLA (self-care) (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/esa_contrib_reported.py

@@ -7,4 +7,4 @@ class esa_contrib_reported(Variable):
     label = "Employment and Support Allowance (contribution-based) (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/esa_income_reported.py

@@ -7,4 +7,4 @@ class esa_income_reported(Variable):
     label = "ESA (income-based) (reported amount)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/housing_benefit/housing_benefit_reported.py

@@ -7,4 +7,4 @@ class housing_benefit_reported(Variable):
     label = "reported Housing Benefit amount"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/iidb_reported.py

@@ -7,4 +7,4 @@ class iidb_reported(Variable):
     label = "Industrial Injuries Disablement Benefit (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/incapacity_benefit_reported.py

@@ -7,4 +7,4 @@ class incapacity_benefit_reported(Variable):
     label = "Incapacity Benefit (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/income_support_reported.py

@@ -7,4 +7,4 @@ class income_support_reported(Variable):
     label = "Income Support (reported amount)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/jsa_contrib_reported.py

@@ -7,4 +7,4 @@ class jsa_contrib_reported(Variable):
     label = "Job Seeker's Allowance (contribution-based) (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/jsa_income_reported.py

@@ -7,4 +7,4 @@ class jsa_income_reported(Variable):
     label = "JSA (income-based) (reported amount)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/maternity_allowance_reported.py

@@ -7,4 +7,4 @@ class maternity_allowance_reported(Variable):
     label = "Maternity allowance"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/pension_credit/pension_credit_reported.py

@@ -7,4 +7,4 @@ class pension_credit_reported(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/pip/pip_dl_reported.py

@@ -8,4 +8,4 @@ class pip_dl_reported(Variable):
     label = "PIP (daily living) (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/pip/pip_m_reported.py

@@ -8,4 +8,4 @@ class pip_m_reported(Variable):
     label = "PIP (mobility) (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/sda_reported.py

@@ -7,4 +7,4 @@ class sda_reported(Variable):
     label = "Severe Disablement Allowance (reported)"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/state_pension_reported.py

@@ -7,7 +7,7 @@ class state_pension_reported(Variable):
     label = "Reported income from the State Pension"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"
 
     def formula_2022(person, period, parameters):
         return person("state_pension_reported", period.last_year)

policyengine_uk/variables/gov/dwp/universal_credit/universal_credit_reported.py

@@ -8,4 +8,4 @@ class universal_credit_reported(Variable):
     documentation = "Reported amount of Universal Credit"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/winter_fuel_allowance_reported.py

@@ -7,4 +7,4 @@ class winter_fuel_allowance_reported(Variable):
     label = "Winter fuel allowance"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/dwp/working_tax_credit_reported.py

@@ -7,4 +7,4 @@ class working_tax_credit_reported(Variable):
     label = "Working Tax Credit"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/gov_tax.py

@@ -34,6 +34,7 @@ class gov_tax(Variable):
         "high_income_incident_tax_change",
         "ni_employer",
         "student_loan_repayments",
+        "vat",
     ]
 
     def formula(household, period, parameters):

policyengine_uk/variables/gov/hmrc/capital_gains_tax/capital_gains_before_response.py

@@ -8,4 +8,4 @@ class capital_gains_before_response(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.non_labour_income"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/gov/hmrc/child_benefit_reported.py

@@ -8,4 +8,4 @@ class child_benefit_reported(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/gov/hmrc/student_loan_repayments.py

@@ -7,4 +7,4 @@ class student_loan_repayments(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.average_earnings"
+    uprating = "gov.economic_assumptions.indices.obr.average_earnings"

policyengine_uk/variables/household/demographic/household_weight.py

@@ -7,5 +7,5 @@ class household_weight(Variable):
     entity = Household
     label = "Weight factor for the household"
     definition_period = YEAR
-    uprating = "gov.ons.population"
+    uprating = "gov.economic_assumptions.indices.ons.population"
     default_value = 1

policyengine_uk/variables/household/income/capital_gains.py

@@ -9,7 +9,7 @@ class capital_gains(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.non_labour_income"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"
     adds = [
         "capital_gains_before_response",
         "capital_gains_behavioural_response",

policyengine_uk/variables/household/income/inflation_adjustment.py

@@ -13,7 +13,9 @@ class inflation_adjustment(Variable):
     unit = "/1"
 
     def formula(household, period, parameters):
-        cpi = parameters.gov.obr.consumer_price_index
+        cpi = (
+            parameters.gov.economic_assumptions.indices.obr.consumer_price_index
+        )
         current_period_cpi = cpi(period)
         now_cpi = cpi(datetime.datetime.now().strftime("%Y-01-01"))
         return now_cpi / current_period_cpi

policyengine_uk/variables/household/income/statutory_maternity_pay.py

@@ -9,4 +9,4 @@ class statutory_maternity_pay(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/household/income/statutory_paternity_pay.py

@@ -9,4 +9,4 @@ class statutory_paternity_pay(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/household/income/statutory_sick_pay.py

@@ -9,4 +9,4 @@ class statutory_sick_pay(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/household/wealth/gross_financial_wealth.py

@@ -7,4 +7,4 @@ class gross_financial_wealth(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "household.wealth.financial_assets"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/household/wealth/net_financial_wealth.py

@@ -7,4 +7,4 @@ class net_financial_wealth(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "household.wealth.financial_assets"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/household/wealth/savings.py

@@ -8,4 +8,4 @@ class savings(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "household.wealth.financial_assets"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/consumption/alcohol_and_tobacco_consumption.py

@@ -11,4 +11,4 @@ class alcohol_and_tobacco_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/childcare_expenses.py

@@ -10,4 +10,4 @@ class childcare_expenses(Variable):
     documentation = "Total amount spent on childcare"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/clothing_and_footwear_consumption.py

@@ -11,4 +11,4 @@ class clothing_and_footwear_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/communication_consumption.py

@@ -11,4 +11,4 @@ class communication_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/diesel_spending.py

@@ -10,4 +10,4 @@ class diesel_spending(Variable):
     value_type = float
     unit = GBP
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/education_consumption.py

@@ -11,4 +11,4 @@ class education_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/energy.py

@@ -11,4 +11,4 @@ class domestic_energy_consumption(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/food_and_non_alcoholic_beverages_consumption.py

@@ -11,4 +11,4 @@ class food_and_non_alcoholic_beverages_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/health_consumption.py

@@ -11,4 +11,4 @@ class health_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/household_furnishings_consumption.py

@@ -11,4 +11,4 @@ class household_furnishings_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/housing_water_and_electricity_consumption.py

@@ -13,4 +13,4 @@ class housing_water_and_electricity_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/miscellaneous_consumption.py

@@ -11,4 +11,4 @@ class miscellaneous_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/petrol_spending.py

@@ -10,4 +10,4 @@ class petrol_spending(Variable):
     value_type = float
     unit = GBP
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/property/council_tax.py

@@ -9,4 +9,4 @@ class council_tax(Variable):
     definition_period = YEAR
     unit = GBP
     quantity_type = FLOW
-    uprating: str = "gov.obr.council_tax"
+    uprating = "gov.economic_assumptions.indices.obr.council_tax"

policyengine_uk/variables/input/consumption/property/employee_pension_contributions.py

@@ -7,4 +7,4 @@ class employee_pension_contributions(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.average_earnings"
+    uprating = "gov.economic_assumptions.indices.obr.average_earnings"

policyengine_uk/variables/input/consumption/property/employer_pension_contributions.py

@@ -8,4 +8,4 @@ class employer_pension_contributions(Variable):
     documentation = "Total amount spent on employer pension contributions"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.average_earnings"
+    uprating = "gov.economic_assumptions.indices.obr.average_earnings"

policyengine_uk/variables/input/consumption/property/maintenance_expenses.py

@@ -7,4 +7,4 @@ class maintenance_expenses(Variable):
     label = "maintenance expenses"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/property/mortgage_capital_repayment.py

@@ -7,4 +7,4 @@ class mortgage_capital_repayment(Variable):
     label = "mortgage capital repayments"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.house_prices"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/consumption/property/mortgage_interest_repayment.py

@@ -8,4 +8,4 @@ class mortgage_interest_repayment(Variable):
     documentation = "Total amount spent on mortgage interest repayments"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.mortgage_interest"
+    uprating = "gov.economic_assumptions.indices.obr.mortgage_interest"

policyengine_uk/variables/input/consumption/property/personal_pension_contributions.py

@@ -7,4 +7,4 @@ class personal_pension_contributions(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "gov.obr.average_earnings"
+    uprating = "gov.economic_assumptions.indices.obr.average_earnings"

policyengine_uk/variables/input/consumption/recreation_consumption.py

@@ -11,4 +11,4 @@ class recreation_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/restaurants_and_hotels_consumption.py

@@ -11,4 +11,4 @@ class restaurants_and_hotels_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/consumption/transport_consumption.py

@@ -11,4 +11,4 @@ class transport_consumption(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"

policyengine_uk/variables/input/corporate_wealth.py

@@ -8,5 +8,5 @@ class corporate_wealth(Variable):
     definition_period = YEAR
     value_type = float
     unit = GBP
-    uprating = "household.wealth.corporate_wealth"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"
     quantity_type = STOCK

policyengine_uk/variables/input/dividend_income.py

@@ -10,4 +10,4 @@ class dividend_income(Variable):
     reference = "Income Tax (Trading and Other Income) Act 2005 s. 365(1)(b-d)"
     unit = GBP
     quantity_type = FLOW
-    uprating = "gov.obr.per_capita.gdp"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/employment_income.py

@@ -15,4 +15,4 @@ class employment_income(Variable):
         "employment_income_behavioral_response",
         "employer_ni_fixed_employer_cost_change",
     ]
-    uprating = "gov.obr.average_earnings"
+    uprating = "gov.economic_assumptions.indices.obr.average_earnings"

policyengine_uk/variables/input/employment_income_before_lsr.py

@@ -7,4 +7,4 @@ class employment_income_before_lsr(Variable):
     label = "employment income before labor supply responses"
     unit = GBP
     definition_period = YEAR
-    uprating = "gov.obr.average_earnings"
+    uprating = "gov.economic_assumptions.indices.obr.average_earnings"

policyengine_uk/variables/input/lump_sum_income.py

@@ -8,4 +8,4 @@ class lump_sum_income(Variable):
     documentation = "Income from lump sums"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.per_capita.gdp"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/main_residence_value.py

@@ -9,4 +9,4 @@ class main_residence_value(Variable):
     value_type = float
     unit = GBP
     quantity_type = STOCK
-    uprating = "household.wealth.financial_assets"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/maintenance_income.py

@@ -8,4 +8,4 @@ class maintenance_income(Variable):
     documentation = "Income from maintenance payments to you"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.per_capita.gdp"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/miscellaneous_income.py

@@ -8,4 +8,4 @@ class miscellaneous_income(Variable):
     documentation = "Income from any other source"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.per_capita.gdp"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/non_residential_property_value.py

@@ -11,4 +11,4 @@ class non_residential_property_value(Variable):
     value_type = float
     unit = GBP
     quantity_type = STOCK
-    uprating = "household.wealth.financial_assets"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/other_investment_income.py

@@ -8,4 +8,4 @@ class other_investment_income(Variable):
     documentation = "Investment income from sources other than dividends, property, and net interest on UK bank accounts; may include National Savings interest products, securities interest, interest from trusts or settlements, etc."
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.per_capita.gdp"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/other_residential_property_value.py

@@ -11,4 +11,4 @@ class other_residential_property_value(Variable):
     value_type = float
     unit = GBP
     quantity_type = STOCK
-    uprating = "household.wealth.financial_assets"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/owned_land.py

@@ -9,4 +9,4 @@ class owned_land(Variable):
     definition_period = YEAR
     value_type = float
     quantity_type = STOCK
-    uprating = "household.wealth.financial_assets"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/pension_income.py

@@ -11,4 +11,4 @@ class pension_income(Variable):
     unit = GBP
     reference = "Income Tax (Earnings and Pensions) Act 2003 s. 1(1)(b)"
     quantity_type = FLOW
-    uprating = "gov.obr.per_capita.gdp"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/private_pension_income.py

@@ -10,4 +10,4 @@ class private_pension_income(Variable):
     unit = GBP
     reference = "Income Tax (Earnings and Pensions) Act 2003 s. 1(1)(b)"
     quantity_type = FLOW
-    uprating = "gov.obr.per_capita.non_labour_income"
+    uprating = "gov.economic_assumptions.indices.obr.private_pension_index"

policyengine_uk/variables/input/private_transfer_income.py

@@ -8,4 +8,4 @@ class private_transfer_income(Variable):
     documentation = "Income from private transfers"
     definition_period = YEAR
     unit = GBP
-    uprating = "gov.obr.per_capita.gdp"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/property_income.py

@@ -10,4 +10,4 @@ class property_income(Variable):
     reference = "Income Tax (Trading and Other Income) Act 2005 s. 1(1)(b)"
     unit = GBP
     quantity_type = FLOW
-    uprating = "gov.obr.per_capita.gdp"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/rent.py

@@ -11,4 +11,4 @@ class rent(Variable):
     value_type = float
     unit = GBP
     quantity_type = FLOW
-    uprating = "gov.obr.rent"
+    uprating = "gov.economic_assumptions.indices.obr.rent"

policyengine_uk/variables/input/savings_interest_income.py

@@ -10,4 +10,4 @@ class savings_interest_income(Variable):
     reference = "Income Tax (Trading and Other Income) Act 2005 s. 365(1)(a)"
     unit = GBP
     quantity_type = FLOW
-    uprating = "gov.obr.per_capita.gdp"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.gdp"

policyengine_uk/variables/input/self_employment_income.py

@@ -10,4 +10,4 @@ class self_employment_income(Variable):
     unit = GBP
     reference = "Income Tax (Trading and Other Income) Act 2005 s. 1(1)(a)"
     quantity_type = FLOW
-    uprating = "gov.obr.per_capita.mixed_income"
+    uprating = "gov.economic_assumptions.indices.obr.per_capita.mixed_income"

policyengine_uk/variables/input/state_pension.py

@@ -9,7 +9,7 @@ class state_pension(Variable):
     unit = GBP
     documentation = "Gross State Pension payments"
     quantity_type = FLOW
-    uprating = "gov.obr.consumer_price_index"
+    uprating = "gov.economic_assumptions.indices.obr.consumer_price_index"
 
     def formula(person, period, parameters):
         gov = parameters(period).gov