sportsball 0.3.83__tar.gz → 0.3.85__tar.gz

{sportsball-0.3.83/sportsball.egg-info → sportsball-0.3.85}/PKG-INFO

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

{sportsball-0.3.83 → sportsball-0.3.85}/setup.py

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

{sportsball-0.3.83 → sportsball-0.3.85}/sportsball/__init__.py

@@ -4,4 +4,4 @@
 import cchardet  # type: ignore
 import lxml  # noqa: ignore
 
-__VERSION__ = "0.3.83"
+__VERSION__ = "0.3.85"

{sportsball-0.3.83 → sportsball-0.3.85}/sportsball/data/afl/afl/afl_afl_league_model.py

@@ -31,10 +31,16 @@ def _parse_game_info(
         for div_positions_row in div.find_all(
             "div", {"class": re.compile(".*team-lineups__positions-row.*")}
         ):
-            row_players: list[list[tuple[str, str, str, str]]] = []
-            for div_team_players in div_positions_row.find_all(
-                "div",
-                {"class": re.compile(".*team-lineups__positions-players.*")},
+            row_players: list[list[tuple[str, str, str, str]]] = [[], []]
+            for count, div_team_players in enumerate(
+                div_positions_row.find_all(
+                    "div",
+                    {
+                        "class": re.compile(
+                            ".*team-lineups__positions-players-container.*"
+                        )
+                    },
+                )
             ):
                 team_players: list[tuple[str, str, str, str]] = []
                 for a in div_team_players.find_all(
@@ -59,17 +65,9 @@ def _parse_game_info(
                     team_players.append(
                         (player_id, player_number, first_name, second_name)
                     )
-                row_players.append(team_players)
-                if len(row_players) >= 2:
-                    break
-                for count, row_players_list in enumerate(row_players):
-                    try:
-                        teams_players[count].extend(row_players_list)
-                    except IndexError as exc:
-                        # logging.error(html)
-                        logging.error(len(team_players))
-                        logging.error(count)
-                        raise exc
+                row_players[count].extend(team_players)
+            for count, row_players_list in enumerate(row_players):
+                teams_players[count].extend(row_players_list)
         dt = None
         for time in div.find_all(
             "time", {"class": re.compile(".*match-list-alt__header-time.*")}

{sportsball-0.3.83 → sportsball-0.3.85}/sportsball/data/combined/combined_team_model.py

@@ -14,6 +14,13 @@ from .combined_player_model import create_combined_player_model
 REGEX = re.compile("[^a-zA-Z]")
 
 
+def _normalise_player_name(name: str) -> str:
+    # Handle "Surname, Firstname"
+    if "," in name:
+        name = " ".join(reversed([x.strip() for x in name.split(",")]))
+    return REGEX.sub("", unicodedata.normalize("NFC", name).lower())
+
+
 def create_combined_team_model(
     team_models: list[TeamModel],
     identifier: str,
@@ -35,9 +42,7 @@ def create_combined_team_model(
             location = team_model_location
         for player_model in team_model.players:
             player_id = player_model.identifier
-            player_name_key = REGEX.sub(
-                "", unicodedata.normalize("NFC", player_model.name).lower()
-            )
+            player_name_key = _normalise_player_name(player_model.name)
             if player_model.identifier in player_identity_map:
                 player_id = player_identity_map[player_id]
             elif player_name_key in names:

{sportsball-0.3.83 → sportsball-0.3.85}/sportsball/data/google/google_address_model.py

@@ -13287,6 +13287,52 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="",
         country="USA",
     ),
+    "Rebecca D. Lockhart Arena, Orem, Utah": SportsballGeocodeTuple(
+        city="Orem",
+        state="UT",
+        postal="84058",
+        lat=40.2787192,
+        lng=-111.7155783,
+        housenumber="785",
+        country="USA",
+    ),
+    "Reliant Stadium, Houston, Texas": NRG_STADIUM,
+    "South Padre Island Convention Centre, South Padre Island, Texas": SportsballGeocodeTuple(
+        city="South Padre Island",
+        state="TX",
+        postal="78597",
+        lat=26.140556,
+        lng=-97.175,
+        housenumber="7355",
+        country="USA",
+    ),
+    "Moon Palace Resort, Cancun": SportsballGeocodeTuple(
+        city="Cancun",
+        state="QR",
+        postal="77500",
+        lat=20.9886511,
+        lng=-86.826701,
+        housenumber="340",
+        country="Mexico",
+    ),
+    "Meeks Family Fieldhouse at Carson Center, Evansville, Indiana": SportsballGeocodeTuple(
+        city="Evansville",
+        state="IN",
+        postal="",
+        lat=37.9963496,
+        lng=-87.6993641,
+        housenumber="",
+        country="USA",
+    ),
+    "José Miguel Agrelot Coliseum, San Juan": SportsballGeocodeTuple(
+        city="San Juan",
+        state="PR",
+        postal="",
+        lat=18.427717,
+        lng=-66.061392,
+        housenumber="500",
+        country="USA",
+    ),
 }
 
 

{sportsball-0.3.83 → sportsball-0.3.85}/sportsball/data/player_model.py

@@ -41,6 +41,7 @@ PLAYER_ONE_PERCENTERS_COLUMN: Literal["one_percenters"] = "one_percenters"
 PLAYER_BOUNCES_COLUMN: Literal["bounces"] = "bounces"
 PLAYER_GOAL_ASSISTS_COLUMN: Literal["goal_assists"] = "goal_assists"
 PLAYER_PERCENTAGE_PLAYED_COLUMN: Literal["percentage_played"] = "percentage_played"
+PLAYER_NAME_COLUMN: Literal["name"] = "name"
 
 
 class PlayerModel(BaseModel):
@@ -92,7 +93,7 @@ class PlayerModel(BaseModel):
         json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
         alias=TURNOVERS_COLUMN,
     )
-    name: str
+    name: str = Field(..., alias=PLAYER_NAME_COLUMN)
     marks: int | None = Field(
         ...,
         json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},

{sportsball-0.3.83 → sportsball-0.3.85}/sportsball/data/sportsreference/sportsreference_team_model.py

@@ -30,6 +30,7 @@ _BAD_URLS = {
     "https://www.sports-reference.com/cbb/players/aj-caldwell-2.html",
     "https://www.sports-reference.com/cbb/players/akuwovo-ogheneyole-1.html",
     "https://www.sports-reference.com/cbb/players/jevon-lyle-1.html",
+    "https://www.sports-reference.com/cbb/players/mike-aaman-1.html",
 }
 _NON_WAYBACK_URLS: set[str] = {
     "https://www.sports-reference.com/cbb/schools/stony-brook/women/2021.html",
@@ -39,6 +40,7 @@ _NON_WAYBACK_URLS: set[str] = {
 }
 _BAD_TEAM_URLS = {
     "https://www.sports-reference.com/cbb/schools/mid-atlantic-christian/2016.html",
+    "https://www.sports-reference.com/cbb/schools/claflin/2013.html",
 }
 
 

{sportsball-0.3.83 → sportsball-0.3.85/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.3.83 → sportsball-0.3.85}/tests/data/afl/afl/afl_afl_league_model_test.py

@@ -15,7 +15,7 @@ class TestAFLAFLLeagueModel(unittest.TestCase):
 
     def test_parse_game_info(self):
         with open(os.path.join(self.dir, "team-lineups.html")) as handle:
-            list(_parse_game_info(handle.read(), self._session, [
+            game_models = list(_parse_game_info(handle.read(), self._session, [
                 "Melbourne",
                 "Richmond",
                 "Collingwood",
@@ -35,3 +35,7 @@ class TestAFLAFLLeagueModel(unittest.TestCase):
                 "Hawthorn",
                 "West Coast Eagles",
             ]))
+            first_game = game_models[0]
+            self.assertEqual(len(first_game.teams), 2)
+            for team in first_game.teams:
+                self.assertEqual(len(team.players), 22)