Skip to content
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

Jump to bottom

chore(fuzzywuzzy): use thefuzz, fix levenshtein #747

Merged
merged 5 commits into from
Jan 9, 2023
Merged

chore(fuzzywuzzy): use thefuzz, fix levenshtein #747

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40c6174
chore
lucasrodes Jan 8, 2023
1f27691
clean
lucasrodes Jan 8, 2023
fc1ea1e
Merge branch 'master' into fix/dependencies
lucasrodes Jan 9, 2023
2baa1f4
fix type check after updating pyright
Marigold Jan 9, 2023
9967782
Update pyproject.toml
lucasrodes Jan 9, 2023
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
2 changes: 1 addition & 1 deletion etl/match_variables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import click
import pandas as pd
from fuzzywuzzy import fuzz
from thefuzz import fuzz

from etl import db

Expand Down
3 changes: 2 additions & 1 deletion etl/scripts/countries-regions/init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import os

import pandas as pd # noqa
from IPython import get_ipython
from IPython import get_ipython # type: ignore
from sqlalchemy import create_engine

engine = create_engine(os.environ["MYSQL_URL"])

ipython = get_ipython()
assert ipython
ipython.magic("load_ext rich")
ipython.magic("load_ext autoreload")
ipython.magic("autoreload 2")
Expand Down
2 changes: 1 addition & 1 deletion etl/steps/data/garden/emdat/2022-11-24/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ def add_region_aggregates(
.reset_index()
.assign(**{country_column: region})
)
data = pd.concat([data, region_df], ignore_index=True)
data = pd.concat([data, region_df], ignore_index=True) # type: ignore

return data

Expand Down
Loading