sportsball 0.3.34__tar.gz → 0.3.35__tar.gz

{sportsball-0.3.34/sportsball.egg-info → sportsball-0.3.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.34
+Version: 0.3.35
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield

{sportsball-0.3.34 → sportsball-0.3.35}/setup.py

@@ -26,7 +26,7 @@ def install_requires() -> typing.List[str]:
 
 setup(
     name='sportsball',
-    version='0.3.34',
+    version='0.3.35',
     description='A library for pulling in and normalising sports stats.',
     long_description=long_description,
     long_description_content_type='text/markdown',

{sportsball-0.3.34 → sportsball-0.3.35}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.34"
+__VERSION__ = "0.3.35"

sportsball-0.3.35/sportsball/cache.py

@@ -0,0 +1,5 @@
+"""Caching utilities."""
+
+from joblib import Memory  # type: ignore
+
+MEMORY = Memory(".sportsball_cache", verbose=0)

{sportsball-0.3.34 → sportsball-0.3.35}/sportsball/data/afl/combined/afl_combined_league_model.py

@@ -143,6 +143,7 @@ THUNDERDOME_STADIUM = "Thunderdome Stadium"
 SPOTLAND_STADIUM = "Spotland Stadium"
 GIANTS_STADIUM = "Giants Stadium"
 TIPOS_ARENA = "Ondrej Nepela Arena"
+BAROSSA_PARK = "Barossa Park"
 AFL_VENUE_IDENTITY_MAP = {
     "brunswick_st": BRUNSWICK_ST,
     "victoria_park": VICTORIA_PARK,
@@ -237,6 +238,7 @@ AFL_VENUE_IDENTITY_MAP = {
     "Marrara Oval": MARRARA_OVAL,
     "Giants Stadium": GIANTS_STADIUM,
     "Ondrej Nepela Arena": TIPOS_ARENA,
+    "Barossa Park": BAROSSA_PARK,
 }
 
 

{sportsball-0.3.34 → sportsball-0.3.35}/sportsball/data/combined/combined_league_model.py

@@ -3,14 +3,11 @@
 # pylint: disable=raise-missing-from
 import logging
 import multiprocessing
-import sys
-import traceback
-from multiprocessing import Pool
+from concurrent.futures import ThreadPoolExecutor
 from typing import Any, Iterator
 
 import requests_cache
 
-from ...logger import setup_logger
 from ..game_model import GameModel
 from ..league import League
 from ..league_model import LeagueModel
@@ -18,13 +15,7 @@ from .combined_game_model import create_combined_game_model
 
 
 def _produce_league_games(league_model: LeagueModel) -> list[dict[str, Any]]:
-    setup_logger()
-    try:
-        return [x.model_dump() for x in league_model.games]
-    except Exception as exc:
-        logging.error("Exception: %s", str(exc))
-        logging.error(traceback.format_exc())
-        raise ValueError(str(exc))
+    return [x.model_dump() for x in league_model.games]
 
 
 class CombinedLeagueModel(LeagueModel):
@@ -59,21 +50,18 @@ class CombinedLeagueModel(LeagueModel):
         team_identity_map = self.team_identity_map()
         for league_model in self._league_models:
             league_model.clear_session()
-        with Pool(min(multiprocessing.cpu_count(), len(self._league_models))) as p:
+        with ThreadPoolExecutor(
+            min(multiprocessing.cpu_count(), len(self._league_models))
+        ) as p:
             # We want to terminate immediately if any of our runners runs into trouble.
-            def _error_callback(exc: BaseException) -> None:
-                logging.error(str(exc))
-                sys.exit(1)
 
-            results = [
-                p.apply_async(
-                    _produce_league_games, args=(x,), error_callback=_error_callback
+            results = list(
+                p.map(
+                    _produce_league_games,
+                    self._league_models,
                 )
-                for x in self._league_models
-            ]
-            game_lists = [
-                [GameModel.model_validate(y) for y in x.get()] for x in results
-            ]
+            )
+        game_lists = [[GameModel.model_validate(y) for y in x] for x in results]
 
         for game_list in game_lists:
             for game_model in game_list:

{sportsball-0.3.34 → sportsball-0.3.35}/sportsball/data/google/google_address_model.py

@@ -2116,6 +2116,15 @@ BOSTON_GARDENS = SportsballGeocodeTuple(
     housenumber="150",
     country="USA",
 )
+THE_JUNGLE = SportsballGeocodeTuple(
+    city="Indianapolis",
+    state="IN",
+    postal="46202",
+    lat=39.770556,
+    lng=-86.175,
+    housenumber="901",
+    country="USA",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -6175,15 +6184,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "John F. Savage Hall, Toledo, Ohio": SAVAGE_ARENA,
     "War Memorial at The Sobrato Center, San Francisco, California": WAR_MEMORIAL_GYMNASIUM,
-    "The Jungle, Indianapolis, Indiana": SportsballGeocodeTuple(
-        city="Indianapolis",
-        state="IN",
-        postal="46202",
-        lat=39.770556,
-        lng=-86.175,
-        housenumber="901",
-        country="USA",
-    ),
+    "The Jungle, Indianapolis, Indiana": THE_JUNGLE,
     "Lantz Arena, Charleston, Illinois": SportsballGeocodeTuple(
         city="Charleston",
         state="IL",
@@ -11346,6 +11347,226 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Boston Garden, Boston, Massachusetts": BOSTON_GARDENS,
     "Madison Square Garden (III), New York, New York": MADISON_SQUARE_GARDEN,
+    "West Point, New York": SportsballGeocodeTuple(
+        city="West Point",
+        state="NY",
+        postal="",
+        lat=41.395,
+        lng=-73.955,
+        housenumber="",
+        country="USA",
+    ),
+    "Bethlehem, Pennsylvania": SportsballGeocodeTuple(
+        city="Bethlehem",
+        state="PA",
+        postal="",
+        lat=40.626111,
+        lng=-75.375556,
+        housenumber="",
+        country="USA",
+    ),
+    "Memphis, Tennessee": SportsballGeocodeTuple(
+        city="Memphis",
+        state="TN",
+        postal="",
+        lat=35.1175,
+        lng=-89.971111,
+        housenumber="",
+        country="USA",
+    ),
+    "Champaign, Illinois": SportsballGeocodeTuple(
+        city="Champaign",
+        state="IL",
+        postal="",
+        lat=40.116389,
+        lng=-88.243611,
+        housenumber="",
+        country="USA",
+    ),
+    "Iowa City, Iowa": SportsballGeocodeTuple(
+        city="Iowa City",
+        state="IO",
+        postal="",
+        lat=41.66,
+        lng=-91.53,
+        housenumber="",
+        country="USA",
+    ),
+    "Cedar City, Utah": SportsballGeocodeTuple(
+        city="Cedar City",
+        state="UT",
+        postal="",
+        lat=37.6775,
+        lng=-113.095278,
+        housenumber="",
+        country="USA",
+    ),
+    "Oxford, Mississippi": SportsballGeocodeTuple(
+        city="Oxford",
+        state="MS",
+        postal="",
+        lat=34.372222,
+        lng=-89.508056,
+        housenumber="",
+        country="USA",
+    ),
+    "Massimino Court, West Palm Beach, Florida": SportsballGeocodeTuple(
+        city="West Palm Beach",
+        state="FL",
+        postal="33409",
+        lat=26.7163158,
+        lng=-80.1098274,
+        housenumber="2300",
+        country="USA",
+    ),
+    "Brookshire Grocery Arena, Bossier City, Louisiana": SportsballGeocodeTuple(
+        city="Bossier City",
+        state="LA",
+        postal="",
+        lat=32.465167,
+        lng=-93.673583,
+        housenumber="2000",
+        country="USA",
+    ),
+    "Roberto Clemente Coliseum, San Juan": SportsballGeocodeTuple(
+        city="San Juan",
+        state="PR",
+        postal="",
+        lat=18.4159,
+        lng=-66.0754,
+        housenumber="",
+        country="USA",
+    ),
+    "Trojan Fieldhouse, Little Rock, Arkansas": SportsballGeocodeTuple(
+        city="Little Rock",
+        state="AR",
+        postal="37210",
+        lat=36.1407945,
+        lng=-86.7555075,
+        housenumber="410",
+        country="USA",
+    ),
+    "George Q. Cannon Activities Center, Laie, Hawaii": SportsballGeocodeTuple(
+        city="Laie",
+        state="HI",
+        postal="96762",
+        lat=21.641036,
+        lng=-157.9224658,
+        housenumber="55",
+        country="USA",
+    ),
+    "The Arena at Northwest Florida State College, Niceville, Florida": SportsballGeocodeTuple(
+        city="Niceville",
+        state="FL",
+        postal="",
+        lat=30.5394,
+        lng=-86.4756,
+        housenumber="",
+        country="USA",
+    ),
+    "South Point Arena, Enterprise, Nevada": SportsballGeocodeTuple(
+        city="Enterprise",
+        state="NV",
+        postal="89183",
+        lat=36.011426,
+        lng=-115.1753,
+        housenumber="9777",
+        country="USA",
+    ),
+    "McGonigle Hall, Philadelphia, Pennsylvania": SportsballGeocodeTuple(
+        city="Philadelphia",
+        state="PA",
+        postal="19121",
+        lat=39.981029,
+        lng=-75.158033,
+        housenumber="1800",
+        country="USA",
+    ),
+    "Municipal Auditorium, Columbus, Georgia": SportsballGeocodeTuple(
+        city="Columbus",
+        state="GA",
+        postal="",
+        lat=32.5029979,
+        lng=-84.9441475,
+        housenumber="",
+        country="USA",
+    ),
+    "IUPUI Gymnasium, Indianapolis, Indiana": THE_JUNGLE,
+    "Daniel Lynch '38 Gymnasium, Brooklyn, New York": GENEROSO_POPE_ATHELTIC_COMPLEX,
+    "TD Bank Sports Center, Hamden, Connecticut": SportsballGeocodeTuple(
+        city="Hamden",
+        state="CT",
+        postal="06518",
+        lat=41.413833,
+        lng=-72.911157,
+        housenumber="305",
+        country="USA",
+    ),
+    "University of Tasmania Stadium, Launceston, Austrália": UTAS_STADIUM,
+    "Optus Stadium, Perth, Austrália": OPTUS_STADIUM,
+    "San Francisco, California": SportsballGeocodeTuple(
+        city="San Francisco",
+        state="CA",
+        postal="",
+        lat=37.783333,
+        lng=-122.416667,
+        housenumber="",
+        country="USA",
+    ),
+    "Villanova, Pennsylvania": SportsballGeocodeTuple(
+        city="Villanova",
+        state="PA",
+        postal="",
+        lat=40.037222,
+        lng=-75.349167,
+        housenumber="",
+        country="USA",
+    ),
+    "Normal, Illinois": SportsballGeocodeTuple(
+        city="Normal",
+        state="IL",
+        postal="",
+        lat=40.512222,
+        lng=-88.988611,
+        housenumber="",
+        country="USA",
+    ),
+    "Troy, Alabama": SportsballGeocodeTuple(
+        city="Troy",
+        state="AL",
+        postal="",
+        lat=31.808889,
+        lng=-85.97,
+        housenumber="",
+        country="USA",
+    ),
+    "Fargo, North Dakota": SportsballGeocodeTuple(
+        city="Fargo",
+        state="ND",
+        postal="",
+        lat=46.873333,
+        lng=-96.827222,
+        housenumber="",
+        country="USA",
+    ),
+    "Savannah Civic Center, Savannah, Georgia": SportsballGeocodeTuple(
+        city="Savannah",
+        state="GA",
+        postal="31401",
+        lat=32.0769645,
+        lng=-81.0995252,
+        housenumber="301",
+        country="USA",
+    ),
+    "Barossa Park, Lyndoch, Australia": SportsballGeocodeTuple(
+        city="Lyndoch",
+        state="SA",
+        postal="5351",
+        lat=-34.5988377,
+        lng=138.8028998,
+        housenumber="2",
+        country="Australia",
+    ),
 }