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

Fix DataFrame indexing - import_ids() #71

Closed
wants to merge 4 commits into from
Closed

Fix DataFrame indexing - import_ids() #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5afa886
Fix `import_ids` column & id dataframe indexing
brendanillies Oct 1, 2023
77e53a7
Add default return case of all coumns
brendanillies Oct 1, 2023
3351b2c
Add test cases for specified params `ids` and `columns`
brendanillies Oct 1, 2023
0d7d5a4
Ignore cached test cases
brendanillies Oct 1, 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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ coverage.xml
.pytest_cache/
cover/

nfl_data_py/tests


# Translations
*.mo
*.pot
Expand Down
11 changes: 6 additions & 5 deletions nfl_data_py/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,16 +764,17 @@ def import_ids(columns=None, ids=None):

rem_cols = [x for x in df.columns if x not in avail_ids]
tgt_ids = [x + '_id' for x in ids]


ret_columns = set(rem_cols + tgt_ids)
# filter df to just specified columns
if len(columns) > 0 and len(ids) > 0:
df = df[set(tgt_ids + columns)]
ret_columns = set(tgt_ids + columns)
elif len(columns) > 0 and len(ids) == 0:
df = df[set(avail_ids + columns)]
ret_columns = set(avail_ids + columns)
elif len(columns) == 0 and len(ids) > 0:
df = df[set(tgt_ids + rem_cols)]
ret_columns = set(tgt_ids + rem_cols)

return df
return df[list(ret_columns)]


def import_contracts():
Expand Down
23 changes: 23 additions & 0 deletions nfl_data_py/tests/nfl_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,29 @@ def test_is_df_with_data(self):
self.assertEqual(True, isinstance(s, pd.DataFrame))
self.assertTrue(len(s) > 0)

def test_import_using_ids(self):
ids = ["espn", "yahoo", "gsis"]
s = nfl.import_ids(ids=ids)
self.assertTrue(all([f"{id}_id" in s.columns for id in ids]))

def test_import_using_columns(self):
ret_columns = ["name", "birthdate", "college"]
not_ret_columns = ["draft_year", "db_season", "team"]
s = nfl.import_ids(columns=ret_columns)
self.assertTrue(all([column in s.columns for column in ret_columns]))
self.assertTrue(all([column not in s.columns for column in not_ret_columns]))

def test_import_using_ids_and_columns(self):
ret_ids = ["espn", "yahoo", "gsis"]
ret_columns = ["name", "birthdate", "college"]
not_ret_ids = ["cfbref_id", "pff_id", "prf_id"]
not_ret_columns = ["draft_year", "db_season", "team"]
s = nfl.import_ids(columns=ret_columns, ids=ret_ids)
self.assertTrue(all([column in s.columns for column in ret_columns]))
self.assertTrue(all([column not in s.columns for column in not_ret_columns]))
self.assertTrue(all([f"{id}_id" in s.columns for id in ret_ids]))
self.assertTrue(all([f"{id}_id" not in s.columns for id in not_ret_ids]))

class test_ngs(TestCase):
def test_is_df_with_data(self):
s = nfl.import_ngs_data('passing')
Expand Down