From abc1e43052e66c95b1610a593390f7b98dd82c3a Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Fri, 14 Oct 2022 00:03:42 +0100 Subject: [PATCH] Format --- docs/usage/datasets.ipynb | 5 ++--- docs/usage/simulation.ipynb | 2 +- .../data/datasets/country_template_dataset.py | 5 ++--- setup.py | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/usage/datasets.ipynb b/docs/usage/datasets.ipynb index 90517f9a..493f2200 100644 --- a/docs/usage/datasets.ipynb +++ b/docs/usage/datasets.ipynb @@ -52,10 +52,9 @@ " }\n", " self.save_variable_values(year, data)\n", "\n", + "\n", "# Important: we must instantiate datasets. This tests their validity and adds dynamic logic.\n", - "CountryTemplateDataset = (\n", - " CountryTemplateDataset()\n", - ")" + "CountryTemplateDataset = CountryTemplateDataset()" ] }, { diff --git a/docs/usage/simulation.ipynb b/docs/usage/simulation.ipynb index 9d8d9cda..1b3d58a6 100644 --- a/docs/usage/simulation.ipynb +++ b/docs/usage/simulation.ipynb @@ -77,7 +77,7 @@ "\n", "sim = Microsimulation()\n", "\n", - "sim.calculate(\"income_tax\", \"2022-01\").sum()/1e6" + "sim.calculate(\"income_tax\", \"2022-01\").sum() / 1e6" ] }, { diff --git a/policyengine_core/country_template/data/datasets/country_template_dataset.py b/policyengine_core/country_template/data/datasets/country_template_dataset.py index 3803f72b..7faa78b7 100644 --- a/policyengine_core/country_template/data/datasets/country_template_dataset.py +++ b/policyengine_core/country_template/data/datasets/country_template_dataset.py @@ -31,7 +31,6 @@ def generate(self, year: int) -> None: } self.save_variable_values(year, data) + # Important: we must instantiate datasets. This tests their validity and adds dynamic logic. -CountryTemplateDataset = ( - CountryTemplateDataset() -) +CountryTemplateDataset = CountryTemplateDataset() diff --git a/setup.py b/setup.py index dc6d3cc9..d9da5353 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ general_requirements = [ "pytest>=4,<6", "numpy>=1.11,<1.21", - "black<23", + "black[jupyter]<23", "linecheck<1", "yaml-changelog<1", "coverage<7",