Changes docs and made misc. changes to code

HarryShomer · Dec 25, 2017 · b9497ce · b9497ce
1 parent 8379e5a
commit b9497ce
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 28 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.rst b/README.rst
@@ -20,8 +20,8 @@ This package is designed to allow people to scrape the Play by Play and Shift da
 Prerequisites
 -------------
 
-You are going to need to have python installed for this. Specifically, you’ll need from at least version 3.6.0
-(just to be safe, it will most likely be fine for earlier versions of 3).
+You are going to need to have python installed for this. This should work for both python 2.7 and 3 (I recommend having
+from at least version 3.6.0 but earlier versions should be fine).
 
 If you don’t have python installed on your machine, I’d recommend installing it through the `anaconda distribution
 <https://www.continuum.io/downloads>`_. Anaconda comes with a bunch of libraries pre-installed so it’s easier to start off.

diff --git a/docs/.DS_Store b/docs/.DS_Store
diff --git a/docs/source/.DS_Store b/docs/source/.DS_Store
diff --git a/docs/source/hockey_scraper.rst b/docs/source/hockey_scraper.rst
@@ -73,6 +73,7 @@ Play is automatically scraped.
 
 
    # When scraping by game or date range
+   "
    {
       'pbp': [
          Plays
@@ -81,8 +82,10 @@ Play is automatically scraped.
          Shifts
       ]
    }
+   "
 
    # When scraping by season
+   "
    {
       'pbp': {
          'Seasons': [
@@ -95,9 +98,10 @@ Play is automatically scraped.
          ]
       }
    }
-
+   "
 
    # For example, if you scraped the 2008 and 2009 seasons the Json will look like this:
+   "
    {
       'pbp': {
          '2008': [
@@ -116,7 +120,7 @@ Play is automatically scraped.
          ]
       }
    }
-
+   "
 
 
 Functions

diff --git a/hockey_scraper/.DS_Store b/hockey_scraper/.DS_Store
diff --git a/hockey_scraper/game_scraper.py b/hockey_scraper/game_scraper.py
@@ -308,25 +308,30 @@ def print_errors():
     global espn_games
     global missing_coords
 
-    print('\nBroken pbp:')
-    for x in broken_pbp_games:
-        print(x[0], x[1])
-
-    print('\nBroken shifts:')
-    for x in broken_shifts_games:
-        print(x[0], x[1])
-
-    print("\nPlayers missing ID's:")
-    for x in players_missing_ids:
-        print(x[0], x[1])
-
-    print('\nESPN games:')
-    for x in espn_games:
-        print(x[0], x[1])
-
-    print('\nGames missing coordinates:')
-    for x in missing_coords:
-        print(x[0], x[1])
+    if broken_pbp_games:
+        print('\nBroken pbp:')
+        for x in broken_pbp_games:
+            print(x[0], x[1])
+
+    if broken_shifts_games:
+        print('\nBroken shifts:')
+        for x in broken_shifts_games:
+            print(x[0], x[1])
+
+    if players_missing_ids:
+        print("\nPlayers missing ID's:")
+        for x in players_missing_ids:
+            print(x[0], x[1])
+
+    if espn_games:
+        print('\nESPN games:')
+        for x in espn_games:
+            print(x[0], x[1])
+
+    if missing_coords:
+        print('\nGames missing coordinates:')
+        for x in missing_coords:
+            print(x[0], x[1])
 
     print('\n')
 

diff --git a/hockey_scraper/scrape_functions.py b/hockey_scraper/scrape_functions.py
@@ -166,7 +166,7 @@ def scrape_seasons(seasons, if_scrape_shifts, data_format='csv', preseason=False
     game_scraper.print_errors()
 
     # If we have something in there that means json was chosen
-    if len(json_dfs.keys()) > 0:
+    if len(json_dfs['pbp'].keys()) > 0:
         return json.dumps(json_dfs)
 
 

diff --git a/hockey_scraper/shared.py b/hockey_scraper/shared.py
@@ -97,7 +97,7 @@
          'TIMOTHY JR. THOMAS': 'Tim Thomas', 'ILJA BRYZGALOV': 'Ilya Bryzgalov', 'MATHEW DUMBA': 'Matt Dumba',
          'MICHAËL BOURNIVAL': 'Michael Bournival', 'MATTHEW BENNING': 'Matt Benning', 'ZACHARY SANFORD': 'Zach Sanford',
          'AJ GREER': 'A.J. Greer', 'JT COMPHER': 'J.T. Compher', 'NICOLAS PETAN': 'Nic Petan',
-         'VINCENT HINOSTROZA': 'Vinnie  Hinostroza', 'PHILIP VARONE': 'Phil Varone', 'JOSHUA MORRISSEY': 'Josh Morrissey',
+         'VINCENT HINOSTROZA': 'Vinnie Hinostroza', 'PHILIP VARONE': 'Phil Varone', 'JOSHUA MORRISSEY': 'Josh Morrissey',
          'Mathew Bodie': 'Mat Bodie', 'MICHAEL FERLAND': 'Micheal Ferland', 'MICHAEL SANTORELLI' :'Mike Santorelli',
          'CHRISTOPHER BREEN': 'Chris Breen', 'BRYCE VAN BRABRANT': 'Bryce Van Brabant', 'ALEXANDER KILLORN': 'Alex Killorn',
          'JOSEPH MORROW': 'Joe Morrow', 'ALEX STEEN': 'Alexander Steen', 'BRADLEY MILLS': 'Brad Mills',
@@ -111,7 +111,7 @@
          'OLAF KOLZIG': 'OLIE KOLZIG', 'J-SEBASTIEN AUBIN': 'JEAN-SEBASTIEN AUBIN', 'ALEXANDER AULD': 'ALEX AULD',
          'JAMES HOWARD': 'JIMMY HOWARD', 'JEFF DROUIN-DESLAURIERS': 'JEFF DESLAURIERS', 'SIMEON VARLAMOV': 'SEMYON VARLAMOV',
          'ALEXANDER PECHURSKI': 'Alexander Pechurskiy', 'JEFFREY PENNER': 'JEFF PENNER', 'EMMANUEL FERNANDEZ': 'Manny FERNANDEZ',
-         'ALEXANDER PETROVIC': 'ALEX PETROVIC'
+         'ALEXANDER PETROVIC': 'ALEX PETROVIC',
          }
 
 

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@ def read():
 
 setup(
     name='hockey_scraper',
-    version='1.1',
+    version='1.2',
     description="""This package is designed to allow people to scrape Play by Play and Shift data off of the National
                 Hockey League (NHL) API and website for all preseason, regular season and playoff games since the 
                 2007-2008 season""",
@@ -16,7 +16,8 @@ def read():
         "Development Status :: 5 - Production/Stable",
         'Intended Audience :: Science/Research',
         "License :: OSI Approved :: MIT License",
-        'Programming Language :: Python :: 3'
+        'Programming Language :: Python :: 3',
+        "Programming Language :: Python :: 2",
     ],
     keywords='NHL',
     url='https://github.com/HarryShomer/Hockey-Scraper',