Skip to content

Commit

Permalink
Resolving compatibility issues
Browse files Browse the repository at this point in the history
- Fixed issue between python and pandas not resolved in 0.2.9
- Dropped python 3.5 support from nfl_data_py to allow for parquet file usage
  • Loading branch information
cooperdff committed Aug 20, 2022
1 parent bcff032 commit 33fedd6
Show file tree
Hide file tree
Showing 7 changed files with 192 additions and 69 deletions.
149 changes: 121 additions & 28 deletions .tox/log/GLOB-0.log
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,126 @@ writing dependency_links to nfl_data_py.egg-info\dependency_links.txt
writing requirements to nfl_data_py.egg-info\requires.txt
writing top-level names to nfl_data_py.egg-info\top_level.txt
reading manifest file 'nfl_data_py.egg-info\SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'nfl_data_py.egg-info\SOURCES.txt'
running check
creating nfl_data_py-0.2.7
creating nfl_data_py-0.2.7\nfl_data_py
creating nfl_data_py-0.2.7\nfl_data_py.egg-info
copying files to nfl_data_py-0.2.7...
copying README.md -> nfl_data_py-0.2.7
copying setup.py -> nfl_data_py-0.2.7
copying nfl_data_py\__init__.py -> nfl_data_py-0.2.7\nfl_data_py
copying nfl_data_py.egg-info\PKG-INFO -> nfl_data_py-0.2.7\nfl_data_py.egg-info
copying nfl_data_py.egg-info\SOURCES.txt -> nfl_data_py-0.2.7\nfl_data_py.egg-info
copying nfl_data_py.egg-info\dependency_links.txt -> nfl_data_py-0.2.7\nfl_data_py.egg-info
copying nfl_data_py.egg-info\requires.txt -> nfl_data_py-0.2.7\nfl_data_py.egg-info
copying nfl_data_py.egg-info\top_level.txt -> nfl_data_py-0.2.7\nfl_data_py.egg-info
Writing nfl_data_py-0.2.7\setup.cfg
creating '.tox\dist\nfl_data_py-0.2.7.zip' and adding 'nfl_data_py-0.2.7' to it
adding 'nfl_data_py-0.2.7'
adding 'nfl_data_py-0.2.7\nfl_data_py'
adding 'nfl_data_py-0.2.7\nfl_data_py.egg-info'
adding 'nfl_data_py-0.2.7\PKG-INFO'
adding 'nfl_data_py-0.2.7\README.md'
adding 'nfl_data_py-0.2.7\setup.cfg'
adding 'nfl_data_py-0.2.7\setup.py'
adding 'nfl_data_py-0.2.7\nfl_data_py\__init__.py'
adding 'nfl_data_py-0.2.7\nfl_data_py.egg-info\dependency_links.txt'
adding 'nfl_data_py-0.2.7\nfl_data_py.egg-info\PKG-INFO'
adding 'nfl_data_py-0.2.7\nfl_data_py.egg-info\requires.txt'
adding 'nfl_data_py-0.2.7\nfl_data_py.egg-info\SOURCES.txt'
adding 'nfl_data_py-0.2.7\nfl_data_py.egg-info\top_level.txt'
removing 'nfl_data_py-0.2.7' (and everything under it)
creating nfl_data_py-0.2.9
creating nfl_data_py-0.2.9\data
creating nfl_data_py-0.2.9\data\schedules
creating nfl_data_py-0.2.9\nfl_data_py
creating nfl_data_py-0.2.9\nfl_data_py.egg-info
creating nfl_data_py-0.2.9\nfl_data_py\tests
creating nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__
copying files to nfl_data_py-0.2.9...
copying CHANGELOG.md -> nfl_data_py-0.2.9
copying CONTRIBUTING.md -> nfl_data_py-0.2.9
copying LICENSE -> nfl_data_py-0.2.9
copying MANIFEST.in -> nfl_data_py-0.2.9
copying README.md -> nfl_data_py-0.2.9
copying code_of_conduct.md -> nfl_data_py-0.2.9
copying constraints.txt -> nfl_data_py-0.2.9
copying setup.py -> nfl_data_py-0.2.9
copying tox.ini -> nfl_data_py-0.2.9
copying data\coaching_history.csv -> nfl_data_py-0.2.9\data
copying data\combine.csv -> nfl_data_py-0.2.9\data
copying data\drafts.csv -> nfl_data_py-0.2.9\data
copying data\qbr.csv -> nfl_data_py-0.2.9\data
copying data\schedules\1999.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2000.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2001.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2002.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2003.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2004.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2005.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2006.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2007.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2008.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2009.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2010.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2011.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2012.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2013.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2014.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2015.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2016.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2017.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2018.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2019.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2020.csv -> nfl_data_py-0.2.9\data\schedules
copying data\schedules\2021.csv -> nfl_data_py-0.2.9\data\schedules
copying nfl_data_py\__init__.py -> nfl_data_py-0.2.9\nfl_data_py
copying nfl_data_py.egg-info\PKG-INFO -> nfl_data_py-0.2.9\nfl_data_py.egg-info
copying nfl_data_py.egg-info\SOURCES.txt -> nfl_data_py-0.2.9\nfl_data_py.egg-info
copying nfl_data_py.egg-info\dependency_links.txt -> nfl_data_py-0.2.9\nfl_data_py.egg-info
copying nfl_data_py.egg-info\requires.txt -> nfl_data_py-0.2.9\nfl_data_py.egg-info
copying nfl_data_py.egg-info\top_level.txt -> nfl_data_py-0.2.9\nfl_data_py.egg-info
copying nfl_data_py\tests\nfl_test.py -> nfl_data_py-0.2.9\nfl_data_py\tests
copying nfl_data_py\tests\__pycache__\nfl_test.cpython-35-pytest-6.1.2.pyc -> nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__
copying nfl_data_py\tests\__pycache__\nfl_test.cpython-37-pytest-6.2.4.pyc -> nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__
copying nfl_data_py\tests\__pycache__\nfl_test.cpython-37-pytest-7.1.0.pyc -> nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__
copying nfl_data_py\tests\__pycache__\nfl_test.cpython-37-pytest-7.1.2.pyc -> nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__
copying nfl_data_py\tests\__pycache__\nfl_test.cpython-39-pytest-6.2.4.pyc -> nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__
copying nfl_data_py\tests\__pycache__\nfl_test.cpython-39-pytest-6.2.5.pyc -> nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__
copying nfl_data_py\tests\__pycache__\nfl_test.cpython-39-pytest-7.1.2.pyc -> nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__
Writing nfl_data_py-0.2.9\setup.cfg
creating '.tox\dist\nfl_data_py-0.2.9.zip' and adding 'nfl_data_py-0.2.9' to it
adding 'nfl_data_py-0.2.9'
adding 'nfl_data_py-0.2.9\data'
adding 'nfl_data_py-0.2.9\nfl_data_py'
adding 'nfl_data_py-0.2.9\nfl_data_py.egg-info'
adding 'nfl_data_py-0.2.9\CHANGELOG.md'
adding 'nfl_data_py-0.2.9\code_of_conduct.md'
adding 'nfl_data_py-0.2.9\constraints.txt'
adding 'nfl_data_py-0.2.9\CONTRIBUTING.md'
adding 'nfl_data_py-0.2.9\LICENSE'
adding 'nfl_data_py-0.2.9\MANIFEST.in'
adding 'nfl_data_py-0.2.9\PKG-INFO'
adding 'nfl_data_py-0.2.9\README.md'
adding 'nfl_data_py-0.2.9\setup.cfg'
adding 'nfl_data_py-0.2.9\setup.py'
adding 'nfl_data_py-0.2.9\tox.ini'
adding 'nfl_data_py-0.2.9\data\schedules'
adding 'nfl_data_py-0.2.9\data\coaching_history.csv'
adding 'nfl_data_py-0.2.9\data\combine.csv'
adding 'nfl_data_py-0.2.9\data\drafts.csv'
adding 'nfl_data_py-0.2.9\data\qbr.csv'
adding 'nfl_data_py-0.2.9\data\schedules\1999.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2000.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2001.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2002.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2003.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2004.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2005.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2006.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2007.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2008.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2009.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2010.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2011.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2012.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2013.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2014.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2015.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2016.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2017.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2018.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2019.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2020.csv'
adding 'nfl_data_py-0.2.9\data\schedules\2021.csv'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests'
adding 'nfl_data_py-0.2.9\nfl_data_py\__init__.py'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests\nfl_test.py'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__\nfl_test.cpython-35-pytest-6.1.2.pyc'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__\nfl_test.cpython-37-pytest-6.2.4.pyc'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__\nfl_test.cpython-37-pytest-7.1.0.pyc'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__\nfl_test.cpython-37-pytest-7.1.2.pyc'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__\nfl_test.cpython-39-pytest-6.2.4.pyc'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__\nfl_test.cpython-39-pytest-6.2.5.pyc'
adding 'nfl_data_py-0.2.9\nfl_data_py\tests\__pycache__\nfl_test.cpython-39-pytest-7.1.2.pyc'
adding 'nfl_data_py-0.2.9\nfl_data_py.egg-info\dependency_links.txt'
adding 'nfl_data_py-0.2.9\nfl_data_py.egg-info\PKG-INFO'
adding 'nfl_data_py-0.2.9\nfl_data_py.egg-info\requires.txt'
adding 'nfl_data_py-0.2.9\nfl_data_py.egg-info\SOURCES.txt'
adding 'nfl_data_py-0.2.9\nfl_data_py.egg-info\top_level.txt'
removing 'nfl_data_py-0.2.9' (and everything under it)
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Redirected data pulls to new repos

## [0.2.9] - 2022-08-18
- Fixed compatibility issue between python and pandas

## [0.2.10] - 2022-08-20
- Actually fixed issue between python and pandas not resolved in 0.2.9
- Dropped python 3.5 support from nfl_data_py to allow for parquet file usage

Binary file removed nfl_data_py/__pycache__/__init__.cpython-37.pyc
Binary file not shown.
Binary file removed nfl_data_py/__pycache__/__init__.cpython-39.pyc
Binary file not shown.
91 changes: 56 additions & 35 deletions nfl_data_py/tests/nfl_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,109 +4,130 @@
import nfl_data_py as nfl

class test_pbp(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_pbp_data([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))
self.assertTrue(len(s) > 0)

class test_weekly(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_weekly_data([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_seasonal(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_seasonal_data([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_pbp_cols(TestCase):
def test_is_list(self):
def test_is_list_with_data(self):
s = nfl.see_pbp_cols()
self.assertEqual(True, isinstance(set(nfl.see_pbp_cols()), set))

self.assertTrue(len(s) > 0)

class test_weekly_cols(TestCase):
def test_is_list(self):
def test_is_list_with_data(self):
s = nfl.see_weekly_cols()
self.assertEqual(True, isinstance(set(nfl.see_pbp_cols()), set))

self.assertTrue(len(s) > 0)

class test_rosters(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_rosters([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_team_desc(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_team_desc()
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_schedules(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_schedules([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_wins(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_win_totals([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_officials(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_officials([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_draft_picks(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_draft_picks([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_draft_values(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_draft_values()
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_combine(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_combine_data([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_ids(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_ids()
self.assertEqual(True, isinstance(s, pd.DataFrame))
self.assertTrue(len(s) > 0)

class test_ngs(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_ngs_data('passing')
self.assertEqual(True, isinstance(s, pd.DataFrame))
self.assertTrue(len(s) > 0)

class test_clean(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.clean_nfl_data(nfl.import_weekly_data([2020]))
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_depth_charts(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_depth_charts([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))
self.assertTrue(len(s) > 0)

class test_injuries(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_injuries([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))
self.assertTrue(len(s) > 0)

class test_qbr(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_qbr()
self.assertEqual(True, isinstance(s, pd.DataFrame))

self.assertTrue(len(s) > 0)

class test_pfr(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_pfr('pass')
self.assertEqual(True, isinstance(s, pd.DataFrame))
self.assertTrue(len(s) > 0)

class test_snaps(TestCase):
def test_is_df(self):
def test_is_df_with_data(self):
s = nfl.import_snap_counts([2020])
self.assertEqual(True, isinstance(s, pd.DataFrame))
self.assertTrue(len(s) > 0)

class test_cache(TestCase):
def test_cache(self):
Expand Down
11 changes: 6 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
URL = 'https://github.com/cooperdff/nfl_data_py'
EMAIL = '[email protected]'
AUTHOR = 'cooperdff'
REQUIRES_PYTHON = '>=3.5.0'
VERSION = '0.2.7'
REQUIRES_PYTHON = '>=3.6.0'
VERSION = '0.2.10'


# What packages are required for this module to be executed?
REQUIRED = [
'pandas>=1.3.5',
'appdirs>=1.4.4',
'fastparquet>=0.8.1',
'pandas>1',
'appdirs>1',
'fastparquet>0.5',
'python-snappy>0.5'
]

# What packages are optional?
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# content of: tox.ini , put in same dir as setup.py
[tox]
envlist = python3.5,python3.6,python3.7,python3.8,python3.9
envlist = python3.6,python3.7,python3.8,python3.9
[testenv]
deps = pytest
# run the tests
# ... or run any other command line tool you need to run here
commands = pytest
download = True

0 comments on commit 33fedd6

Please sign in to comment.