Add back MANIFEST.in (#948)

* Add back MANIFES.in * Format
PolicyEngine · Sep 18, 2024 · 61e7b32 · 61e7b32
1 parent da0a735
commit 61e7b32
Show file tree

Hide file tree

Showing 13 changed files with 5,949 additions and 5,837 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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).
 
+## [2.1.0] - 2024-09-18 11:04:12
+
+### Fixed
+
+- Add back recursive-include.
+
 ## [2.0.0] - 2024-09-18 10:53:42
 
 ### Changed
@@ -1480,6 +1486,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[2.1.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/PolicyEngine/openfisca-uk/compare/1.8.0...2.0.0
 [1.8.0]: https://github.com/PolicyEngine/openfisca-uk/compare/1.7.4...1.8.0
 [1.7.4]: https://github.com/PolicyEngine/openfisca-uk/compare/1.7.3...1.7.4

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+recursive-include policyengine_uk *
diff --git a/Makefile b/Makefile
@@ -24,3 +24,12 @@ changelog:
 	bump-version changelog.yaml setup.py
 	rm changelog_entry.yaml || true
 	touch changelog_entry.yaml
+
+compare_psnd:
+	pip uninstall policyengine-uk -y
+	pip install policyengine-uk
+	cd policyengine_uk/utils && python psnd.py
+	mv policyengine_uk/utils/psnd.csv psnd_old.csv
+	pip install -e .
+	cd policyengine_uk/utils && python psnd.py
+	mv policyengine_uk/utils/psnd.csv psnd_new.csv
diff --git a/changelog.yaml b/changelog.yaml
@@ -1239,3 +1239,8 @@
     changed:
     - Dataset handling outsourced to policyengine-uk-data.
   date: 2024-09-18 10:53:42
+- bump: minor
+  changes:
+    fixed:
+    - Add back recursive-include.
+  date: 2024-09-18 11:04:12
diff --git a/docs/book/model/baseline.ipynb b/docs/book/model/baseline.ipynb
@@ -38,6 +38,7 @@
     "OBR_PSND = [2_540, 2_691, 2_793, 2_820, 2_903, 2_995, 3_078]\n",
     "from policyengine_uk_data.storage import STORAGE_FOLDER\n",
     "import pandas as pd\n",
+    "\n",
     "tax_ben = pd.read_csv(STORAGE_FOLDER / \"tax_benefit.csv\")\n",
     "REVENUES = [\n",
     "    \"income_tax\",\n",
@@ -54,9 +55,14 @@
     "    \"pip\",\n",
     "    \"dla\",\n",
     "]\n",
-    "tax_ben_revenues = tax_ben[tax_ben.name.isin(REVENUES)].set_index(\"name\").loc[REVENUES]\n",
-    "tax_ben_spending = tax_ben[tax_ben.name.isin(SPENDING)].set_index(\"name\").loc[SPENDING]\n",
+    "tax_ben_revenues = (\n",
+    "    tax_ben[tax_ben.name.isin(REVENUES)].set_index(\"name\").loc[REVENUES]\n",
+    ")\n",
+    "tax_ben_spending = (\n",
+    "    tax_ben[tax_ben.name.isin(SPENDING)].set_index(\"name\").loc[SPENDING]\n",
+    ")\n",
     "from policyengine_uk import Microsimulation\n",
+    "\n",
     "PE_REVENUES = [\n",
     "    \"income_tax\",\n",
     "    \"ni_employee\",\n",
@@ -78,17 +84,29 @@
     "\n",
     "for year in range(2022, 2029):\n",
     "    obr_psnd = OBR_PSND[year - 2022]\n",
-    "    obr_totals = tax_ben_spending[str(year)].sum() - tax_ben_revenues[str(year)].sum()\n",
-    "    pe_revenues = sum(baseline.calculate(variable, map_to=\"household\", period=year).sum()/1e9 for variable in PE_REVENUES)\n",
-    "    pe_spending = sum(baseline.calculate(variable, map_to=\"household\", period=year).sum()/1e9 for variable in PE_SPENDING)\n",
+    "    obr_totals = (\n",
+    "        tax_ben_spending[str(year)].sum() - tax_ben_revenues[str(year)].sum()\n",
+    "    )\n",
+    "    pe_revenues = sum(\n",
+    "        baseline.calculate(variable, map_to=\"household\", period=year).sum()\n",
+    "        / 1e9\n",
+    "        for variable in PE_REVENUES\n",
+    "    )\n",
+    "    pe_spending = sum(\n",
+    "        baseline.calculate(variable, map_to=\"household\", period=year).sum()\n",
+    "        / 1e9\n",
+    "        for variable in PE_SPENDING\n",
+    "    )\n",
     "    pe_totals = pe_spending - pe_revenues\n",
     "    pe_psnd.append(obr_psnd + pe_totals - obr_totals)\n",
     "\n",
-    "df = pd.DataFrame({\n",
-    "    \"year\": range(2022, 2029),\n",
-    "    \"OBR\": OBR_PSND,\n",
-    "    \"PE\": pe_psnd,\n",
-    "})"
+    "df = pd.DataFrame(\n",
+    "    {\n",
+    "        \"year\": range(2022, 2029),\n",
+    "        \"OBR\": OBR_PSND,\n",
+    "        \"PE\": pe_psnd,\n",
+    "    }\n",
+    ")"
    ]
   },
   {

diff --git a/docs/book/programs/gov/dwp/PIP.ipynb b/docs/book/programs/gov/dwp/PIP.ipynb
@@ -162,9 +162,18 @@
     "enhanced_daily = parameters.gov.dwp.pip.daily_living.enhanced\n",
     "standard_daily = parameters.gov.dwp.pip.daily_living.standard\n",
     "\n",
-    "elements = [enhanced_daily, standard_daily] # [...]\n",
+    "elements = [enhanced_daily, standard_daily]  # [...]\n",
     "\n",
-    "dates = [\"2016-01-01\",\"2017-01-01\",\"2018-01-01\",\"2019-01-01\",\"2020-01-01\", \"2021-01-01\", \"2022-01-01\",\"2023-01-01\"]\n",
+    "dates = [\n",
+    "    \"2016-01-01\",\n",
+    "    \"2017-01-01\",\n",
+    "    \"2018-01-01\",\n",
+    "    \"2019-01-01\",\n",
+    "    \"2020-01-01\",\n",
+    "    \"2021-01-01\",\n",
+    "    \"2022-01-01\",\n",
+    "    \"2023-01-01\",\n",
+    "]\n",
     "names = [\"enhanced\", \"standard\"]\n",
     "\n",
     "import pandas as pd\n",
@@ -174,18 +183,14 @@
     "for date in dates:\n",
     "    for element, name in zip(elements, names):\n",
     "        # Append to a dataframe: row = date, column = element, value = amount\n",
-    "        new_row = {\n",
-    "            \"date\": date,\n",
-    "            \"element\": name,\n",
-    "            \"amount\": element(date)\n",
-    "        }\n",
-    "         # Append row to the dataframe\n",
+    "        new_row = {\"date\": date, \"element\": name, \"amount\": element(date)}\n",
+    "        # Append row to the dataframe\n",
     "        df = pd.concat([df, pd.DataFrame([new_row])])\n",
     "\n",
     "\n",
     "# merge element cells\n",
     "pivot_df = df.pivot(index=\"date\", columns=\"element\", values=\"amount\")\n",
-    "pivot_df.fillna(\"\")\n"
+    "pivot_df.fillna(\"\")"
    ]
   },
   {
@@ -1234,9 +1239,9 @@
     "    yaxis_range=[0, 100],\n",
     "    yaxis_tickformat=\",.0f\",\n",
     "    yaxis_tickprefix=\"£\",\n",
-    "    yaxis_title = \"Amount(£m)\",\n",
-    "    xaxis_title = \"Year\",\n",
-    "    legend_title = \"Element\"\n",
+    "    yaxis_title=\"Amount(£m)\",\n",
+    "    xaxis_title=\"Year\",\n",
+    "    legend_title=\"Element\",\n",
     ")\n",
     "\n",
     "fig = format_fig(fig)\n",
@@ -1374,9 +1379,18 @@
     "enhanced_mobility = parameters.gov.dwp.pip.mobility.enhanced\n",
     "standard_mobility = parameters.gov.dwp.pip.mobility.standard\n",
     "\n",
-    "elements = [enhanced_mobility, standard_mobility] # [...]\n",
+    "elements = [enhanced_mobility, standard_mobility]  # [...]\n",
     "\n",
-    "dates = [\"2016-01-01\",\"2017-01-01\",\"2018-01-01\",\"2019-01-01\",\"2020-01-01\", \"2021-01-01\", \"2022-01-01\",\"2023-01-01\"]\n",
+    "dates = [\n",
+    "    \"2016-01-01\",\n",
+    "    \"2017-01-01\",\n",
+    "    \"2018-01-01\",\n",
+    "    \"2019-01-01\",\n",
+    "    \"2020-01-01\",\n",
+    "    \"2021-01-01\",\n",
+    "    \"2022-01-01\",\n",
+    "    \"2023-01-01\",\n",
+    "]\n",
     "names = [\"enhanced\", \"standard\"]\n",
     "\n",
     "import pandas as pd\n",
@@ -1386,18 +1400,14 @@
     "for date in dates:\n",
     "    for element, name in zip(elements, names):\n",
     "        # Append to a dataframe: row = date, column = element, value = amount\n",
-    "        new_row = {\n",
-    "            \"date\": date,\n",
-    "            \"element\": name,\n",
-    "            \"amount\": element(date)\n",
-    "        }\n",
-    "         # Append row to the dataframe\n",
+    "        new_row = {\"date\": date, \"element\": name, \"amount\": element(date)}\n",
+    "        # Append row to the dataframe\n",
     "        df = pd.concat([df, pd.DataFrame([new_row])])\n",
     "\n",
     "\n",
     "# merge element cells\n",
     "pivot_df = df.pivot(index=\"date\", columns=\"element\", values=\"amount\")\n",
-    "pivot_df.fillna(\"\")\n"
+    "pivot_df.fillna(\"\")"
    ]
   },
   {
@@ -2417,9 +2427,9 @@
     "    yaxis_range=[0, 100],\n",
     "    yaxis_tickformat=\",.0f\",\n",
     "    yaxis_tickprefix=\"£\",\n",
-    "    yaxis_title = \"Amount(£m)\",\n",
-    "    xaxis_title = \"Year\",\n",
-    "    legend_title = \"Element\"\n",
+    "    yaxis_title=\"Amount(£m)\",\n",
+    "    xaxis_title=\"Year\",\n",
+    "    legend_title=\"Element\",\n",
     ")\n",
     "\n",
     "fig = format_fig(fig)\n",

diff --git a/docs/book/programs/gov/dwp/pension-credit.ipynb b/docs/book/programs/gov/dwp/pension-credit.ipynb