Skip to content

Switch code formatter from Black to Ruff #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaxGhenis merged 2 commits into from
Mar 6, 2026
Merged

Switch code formatter from Black to Ruff #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
850f6be
Switch code formatter from Black to Ruff
MaxGhenis Mar 6, 2026
d906ca6
Replace black with ruff in CI workflow files
MaxGhenis Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/bump_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ def get_current_version(pyproject_path: Path) -> str:

def infer_bump(changelog_dir: Path) -> str:
fragments = [
f
for f in changelog_dir.iterdir()
if f.is_file() and f.name != ".gitkeep"
f for f in changelog_dir.iterdir() if f.is_file() and f.name != ".gitkeep"
]
if not fragments:
print("No changelog fragments found", file=sys.stderr)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install black
pip install "ruff>=0.9.0"
- name: Check formatting
run: black . -l 79 --check
run: ruff format --check .
test:
name: Test
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install black
pip install "ruff>=0.9.0"
- name: Check formatting
run: black . -l 79 --check
run: ruff format --check .
test:
name: Build and test
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: data test

format:
black . -l 79
ruff format .

test:
pytest .
Expand Down
1 change: 1 addition & 0 deletions changelog.d/switch-to-ruff.changed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Switched code formatter from Black to Ruff.
15 changes: 12 additions & 3 deletions docs/LA_methodology.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,13 @@
"import pandas as pd\n",
"from itables import init_notebook_mode, show\n",
"import itables.options as opt\n",
"\n",
"opt.maxBytes = \"1MB\"\n",
"init_notebook_mode(all_interactive=True)\n",
"\n",
"pd.read_csv(\"../policyengine_uk_data/datasets/frs/local_areas/local_authorities/targets/total_income.csv\")"
"pd.read_csv(\n",
" \"../policyengine_uk_data/datasets/frs/local_areas/local_authorities/targets/total_income.csv\"\n",
")"
]
},
{
Expand Down Expand Up @@ -818,10 +821,13 @@
"import pandas as pd\n",
"from itables import init_notebook_mode, show\n",
"import itables.options as opt\n",
"\n",
"opt.maxBytes = \"1MB\"\n",
"init_notebook_mode(all_interactive=True)\n",
"\n",
"pd.read_csv(\"../policyengine_uk_data/datasets/frs/local_areas/local_authorities/targets/age.csv\")"
"pd.read_csv(\n",
" \"../policyengine_uk_data/datasets/frs/local_areas/local_authorities/targets/age.csv\"\n",
")"
]
},
{
Expand Down Expand Up @@ -1188,10 +1194,13 @@
"import pandas as pd\n",
"from itables import init_notebook_mode, show\n",
"import itables.options as opt\n",
"\n",
"opt.maxBytes = \"1MB\"\n",
"init_notebook_mode(all_interactive=True)\n",
"\n",
"pd.read_csv(\"../policyengine_uk_data/datasets/frs/local_areas/local_authorities/targets/employment_income.csv\")"
"pd.read_csv(\n",
" \"../policyengine_uk_data/datasets/frs/local_areas/local_authorities/targets/employment_income.csv\"\n",
")"
]
},
{
Expand Down
15 changes: 12 additions & 3 deletions docs/constituency_methodology.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,13 @@
"import pandas as pd\n",
"from itables import init_notebook_mode, show\n",
"import itables.options as opt\n",
"\n",
"opt.maxBytes = \"1MB\"\n",
"init_notebook_mode(all_interactive=True)\n",
"\n",
"pd.read_csv(\"../policyengine_uk_data/datasets/frs/local_areas/constituencies/targets/total_income.csv\")"
"pd.read_csv(\n",
" \"../policyengine_uk_data/datasets/frs/local_areas/constituencies/targets/total_income.csv\"\n",
")"
]
},
{
Expand Down Expand Up @@ -818,10 +821,13 @@
"import pandas as pd\n",
"from itables import init_notebook_mode, show\n",
"import itables.options as opt\n",
"\n",
"opt.maxBytes = \"1MB\"\n",
"init_notebook_mode(all_interactive=True)\n",
"\n",
"pd.read_csv(\"../policyengine_uk_data/datasets/frs/local_areas/constituencies/targets/age.csv\")"
"pd.read_csv(\n",
" \"../policyengine_uk_data/datasets/frs/local_areas/constituencies/targets/age.csv\"\n",
")"
]
},
{
Expand Down Expand Up @@ -1302,10 +1308,13 @@
"import pandas as pd\n",
"from itables import init_notebook_mode, show\n",
"import itables.options as opt\n",
"\n",
"opt.maxBytes = \"1MB\"\n",
"init_notebook_mode(all_interactive=True)\n",
"\n",
"pd.read_csv(\"../policyengine_uk_data/datasets/frs/local_areas/constituencies/targets/employment_income.csv\")"
"pd.read_csv(\n",
" \"../policyengine_uk_data/datasets/frs/local_areas/constituencies/targets/employment_income.csv\"\n",
")"
]
},
{
Expand Down
Loading