brlib 0.2.0__tar.gz → 0.3.0__tar.gz

brlib-0.3.0/.github/workflows/full-test.yml

@@ -0,0 +1,47 @@
+name: Full Tests
+
+on:
+  # to be run before releases
+  workflow_dispatch:
+
+jobs:
+  pytest:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        resolution: ['highest']
+        include:
+          - os: ubuntu-latest
+            python-version: "3.10"
+            resolution: 'lowest-direct'
+          - os: windows-latest
+            python-version: "3.10"
+            resolution: 'lowest-direct'
+          - os: macos-latest
+            # there's no 3.10 wheel for lxml on ARM64 macOS
+            python-version: "3.11"
+            resolution: 'lowest-direct'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+
+      - name: Install Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
+
+      - name: Create virtual environment
+        run: uv venv
+
+      - name: Install brlib
+        run: uv pip install --resolution ${{ matrix.resolution }} -e .[dev]
+
+      - name: Run pytest
+        run: uv run pytest

{brlib-0.2.0 → brlib-0.3.0}/.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.x"
+          python-version: "3.14"
 
       - name: Install pypa/build
         run: python3 -m pip install build --user
@@ -25,7 +25,7 @@ jobs:
         run: python3 -m build
 
       - name: Store the distribution packages
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: python-package-distributions
           path: dist/
@@ -41,10 +41,10 @@ jobs:
       id-token: write
 
     steps:
-    - name: Download the dists
-      uses: actions/download-artifact@v6
-      with:
-        name: python-package-distributions
-        path: dist/
-    - name: Publish distribution
-      uses: pypa/gh-action-pypi-publish@release/v1
+      - name: Download the dists
+        uses: actions/download-artifact@v6
+        with:
+          name: python-package-distributions
+          path: dist/
+      - name: Publish distribution
+        uses: pypa/gh-action-pypi-publish@release/v1

brlib-0.3.0/.github/workflows/test.yml

@@ -0,0 +1,49 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - '**'
+  schedule:
+    # run at 12 UTC, hopefully after BR's daily in-season updates
+    # run weekly, because anything more would be overkill
+    - cron: '0 12 * * 6'
+
+jobs:
+  pytest:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        python-version: ["3.10", "3.14"]
+        exclude:
+          - os: windows-latest
+            python-version: "3.10"
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+
+      - name: Install Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
+
+      - name: Create virtual environment
+        run: uv venv
+
+      - name: Install brlib
+        run: uv pip install --resolution highest -e .[dev]
+
+      - name: Check import sorting with isort
+        run: uv run isort --check-only .
+
+      - name: Check formatting with Black
+        run: uv run black --check .
+
+      - name: Run pytest
+        run: uv run pytest

{brlib-0.2.0 → brlib-0.3.0}/PKG-INFO

@@ -1,50 +1,66 @@
 Metadata-Version: 2.4
 Name: brlib
-Version: 0.2.0
+Version: 0.3.0
 Summary: A library for collecting baseball statistics from Baseball Reference
-Project-URL: Homepage, https://github.com/john-bieren/brlib
 Project-URL: Documentation, https://github.com/john-bieren/brlib/wiki
-Project-URL: Repository, https://github.com/john-bieren/brlib.git
+Project-URL: GitHub, https://github.com/john-bieren/brlib
 Project-URL: Issues, https://github.com/john-bieren/brlib/issues
+Project-URL: Release Notes, https://github.com/john-bieren/brlib/releases
 Author-email: John Bieren <jbieren64@gmail.com>
 License-Expression: MIT
 License-File: LICENSE.txt
-Keywords: baseball,baseball reference,baseball stats,mlb
+Keywords: baseball,baseball reference,baseball stats,mlb,mlb stats
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Internet :: WWW/HTTP :: Indexing/Search
+Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.12
-Requires-Dist: beautifulsoup4<5.0.0,>=4.14.0
-Requires-Dist: curl-cffi<1.0.0,>=0.13.0
-Requires-Dist: lxml<7.0.0,>=6.0.2
-Requires-Dist: pandas<3.0.0,>=2.3.0
-Requires-Dist: platformdirs<5.0.0,>=4.5.0
-Requires-Dist: tqdm<5.0.0,>=4.67.1
+Requires-Python: >=3.10
+Requires-Dist: beautifulsoup4<4.15.0,>=4.12.0
+Requires-Dist: curl-cffi<0.15.0,>=0.11.1
+Requires-Dist: lxml<7.0.0,>=5.0.0
+Requires-Dist: pandas<3.0.0,>=2.2.0
+Requires-Dist: platformdirs<5.0.0,>=4.0.0
+Requires-Dist: tqdm<5.0.0,>=4.66.0
 Provides-Extra: dev
-Requires-Dist: pytest>=9.0.0; extra == 'dev'
+Requires-Dist: black==26.1.0; extra == 'dev'
+Requires-Dist: isort==7.0.0; extra == 'dev'
+Requires-Dist: pytest>=7.0.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # brlib
 
 [![Tests](https://github.com/john-bieren/brlib/actions/workflows/test.yml/badge.svg)](https://github.com/john-bieren/brlib/actions/workflows/test.yml)
 [![PyPI Latest Release](https://img.shields.io/pypi/v/brlib?label=PyPI&logo=pypi&logoColor=ffe873&color=0073b7)](https://pypi.org/project/brlib)
+[![Python Versions](https://img.shields.io/pypi/pyversions/brlib?label=Python%20Versions)](https://pypi.org/project/brlib)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
 
-A library for collecting baseball statistics from [Baseball Reference](https://www.baseball-reference.com).
+A library for collecting baseball statistics from
+[Baseball Reference](https://www.baseball-reference.com).
 
 > [!IMPORTANT]
 > brlib is in beta, breaking changes are possible until the release of version 1.
 
 ## Key Features
 
-* `Game`, `Player`, and `Team` classes give you easy access to all associated data in one place, with attributes for stats tables, information, and more.
-* Aggregate these into `GameSet`, `PlayerSet`, or `TeamSet` classes, which have similar attributes, for easy analysis of larger samples.
-* Quickly search for games, players, and teams of interest, and gather their stats without violating the [rate limit](https://www.sports-reference.com/429.html).
+* `Game`, `Player`, and `Team` classes give you easy access to all associated data in one place,
+  with attributes for stats tables, information, and more.
+* Aggregate these into `GameSet`, `PlayerSet`, or `TeamSet` classes, which have similar attributes,
+  for easy analysis of larger samples.
+* Quickly search for games, players, and teams of interest, and gather their stats without violating
+  the [rate limit](https://www.sports-reference.com/429.html).
 
 Learn more by reading the documentation on the [wiki](https://github.com/john-bieren/brlib/wiki).
 
@@ -72,4 +88,5 @@ import brlib as br
 
 ## Data Use
 
-Since brlib gathers data from Baseball Reference, your use of this data is subject to their [data use policy](https://www.sports-reference.com/data_use.html).
+Since brlib gathers data from Baseball Reference, your use of this data is subject to their
+[data use policy](https://www.sports-reference.com/data_use.html).

{brlib-0.2.0 → brlib-0.3.0}/README.md

@@ -2,17 +2,24 @@
 
 [![Tests](https://github.com/john-bieren/brlib/actions/workflows/test.yml/badge.svg)](https://github.com/john-bieren/brlib/actions/workflows/test.yml)
 [![PyPI Latest Release](https://img.shields.io/pypi/v/brlib?label=PyPI&logo=pypi&logoColor=ffe873&color=0073b7)](https://pypi.org/project/brlib)
+[![Python Versions](https://img.shields.io/pypi/pyversions/brlib?label=Python%20Versions)](https://pypi.org/project/brlib)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
 
-A library for collecting baseball statistics from [Baseball Reference](https://www.baseball-reference.com).
+A library for collecting baseball statistics from
+[Baseball Reference](https://www.baseball-reference.com).
 
 > [!IMPORTANT]
 > brlib is in beta, breaking changes are possible until the release of version 1.
 
 ## Key Features
 
-* `Game`, `Player`, and `Team` classes give you easy access to all associated data in one place, with attributes for stats tables, information, and more.
-* Aggregate these into `GameSet`, `PlayerSet`, or `TeamSet` classes, which have similar attributes, for easy analysis of larger samples.
-* Quickly search for games, players, and teams of interest, and gather their stats without violating the [rate limit](https://www.sports-reference.com/429.html).
+* `Game`, `Player`, and `Team` classes give you easy access to all associated data in one place,
+  with attributes for stats tables, information, and more.
+* Aggregate these into `GameSet`, `PlayerSet`, or `TeamSet` classes, which have similar attributes,
+  for easy analysis of larger samples.
+* Quickly search for games, players, and teams of interest, and gather their stats without violating
+  the [rate limit](https://www.sports-reference.com/429.html).
 
 Learn more by reading the documentation on the [wiki](https://github.com/john-bieren/brlib/wiki).
 
@@ -40,4 +47,5 @@ import brlib as br
 
 ## Data Use
 
-Since brlib gathers data from Baseball Reference, your use of this data is subject to their [data use policy](https://www.sports-reference.com/data_use.html).
+Since brlib gathers data from Baseball Reference, your use of this data is subject to their
+[data use policy](https://www.sports-reference.com/data_use.html).

{brlib-0.2.0 → brlib-0.3.0}/pyproject.toml

@@ -7,14 +7,14 @@ name = "brlib"
 description = "A library for collecting baseball statistics from Baseball Reference"
 authors = [{ name = "John Bieren", email = "jbieren64@gmail.com" }]
 dynamic = ["version"]
-requires-python = ">=3.12"
+requires-python = ">=3.10"
 dependencies = [
-    "pandas>=2.3.0,<3.0.0",
-    "beautifulsoup4>=4.14.0,<5.0.0",
-    "tqdm>=4.67.1,<5.0.0",
-    "curl-cffi>=0.13.0,<1.0.0",
-    "lxml>=6.0.2,<7.0.0",
-    "platformdirs>=4.5.0,<5.0.0"
+    "beautifulsoup4>=4.12.0,<4.15.0",
+    "curl-cffi>=0.11.1,<0.15.0",
+    "lxml>=5.0.0,<7.0.0",
+    "pandas>=2.2.0,<3.0.0",
+    "platformdirs>=4.0.0,<5.0.0",
+    "tqdm>=4.66.0,<5.0.0"
 ]
 readme = "README.md"
 license = "MIT"
@@ -22,24 +22,35 @@ license-files = ["LICENSE.txt"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
-    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
-    "Operating System :: OS Independent",
+    "Topic :: Internet :: WWW/HTTP :: Indexing/Search",
+    "Topic :: Scientific/Engineering :: Information Analysis",
+    "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-keywords = ["baseball reference", "baseball", "baseball stats", "mlb"]
+keywords = ["baseball reference", "baseball", "baseball stats", "mlb", "mlb stats"]
 
 [project.optional-dependencies]
-dev = ["pytest>=9.0.0"]
+dev = [
+    "black==26.1.0",
+    "isort==7.0.0",
+    "pytest>=7.0.0"
+]
 
 [project.urls]
-Homepage = "https://github.com/john-bieren/brlib"
 Documentation = "https://github.com/john-bieren/brlib/wiki"
-Repository = "https://github.com/john-bieren/brlib.git"
+GitHub = "https://github.com/john-bieren/brlib"
 Issues = "https://github.com/john-bieren/brlib/issues"
+"Release Notes" = "https://github.com/john-bieren/brlib/releases"
 
 [tool.hatch.version]
 path = "src/brlib/__init__.py"
@@ -47,3 +58,12 @@ path = "src/brlib/__init__.py"
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 pythonpath = ["src"]
+
+[tool.black]
+line-length = 100
+target-version = ["py310", "py311", "py312", "py313", "py314"]
+
+[tool.isort]
+profile = "black"
+line_length = 100
+known_first_party = ["brlib"]

brlib-0.3.0/scripts/wiki.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+
+"""
+Copies public member docstrings into Markdown files in an adjacent "wiki" directory,
+presumably a clone of brlib's GitHub wiki repo. This is used to refresh the wiki's contents.
+"""
+
+import inspect
+from pathlib import Path
+
+import brlib
+
+
+def main() -> None:
+    """
+    Copies public member docstrings into Markdown files in an adjacent "wiki" directory,
+    presumably a clone of brlib's GitHub wiki repo. This is used to refresh the wiki's contents.
+    """
+    wiki_dir = Path(__file__).parent.parent / "wiki"
+    public_members = {
+        name: mem for name, mem in inspect.getmembers(brlib) if not name.startswith("_")
+    }
+
+    for member_name, member in public_members.items():
+        if inspect.ismodule(member):
+            continue
+        file_path = wiki_dir / f"{member_name}.md"
+        file_path.write_text(clean_docstring(member.__doc__), encoding="UTF-8")
+
+        # for classes or variables which are the instantiation of a singleton class
+        if not inspect.isfunction(member):
+            # create files for each of the class's public methods
+            methods = inspect.getmembers(member, predicate=is_function_or_method)
+            public_methods = {name: mem for name, mem in methods if not name.startswith("_")}
+            for method_name, method in public_methods.items():
+                file_path = wiki_dir / f"{member_name}.{method_name}.md"
+                file_path.write_text(clean_docstring(method.__doc__), encoding="UTF-8")
+
+
+def clean_docstring(docstring: str) -> str:
+    """Reformat whitespace in `docstring`."""
+    # remove leading newline
+    if docstring[0] == "\n":
+        docstring = docstring[1:]
+    return docstring
+
+
+def is_function_or_method(member: object) -> bool:
+    """
+    Checks whether `inspect.isfunction` or `inspect.ismethod` is `True`. `isfunction` finds methods
+    if `member` is a class, and `ismethod` finds methods if `member` is a class instance.
+    """
+    return inspect.isfunction(member) or inspect.ismethod(member)
+
+
+if __name__ == "__main__":
+    main()

{brlib-0.2.0 → brlib-0.3.0}/src/brlib/__init__.py

@@ -1,4 +1,11 @@
-from .all_major_leaguers import all_major_leaguers
+"""
+A library for collecting baseball statistics from [Baseball
+Reference](https://www.baseball-reference.com).
+
+Documentation can be found on the [wiki](https://github.com/john-bieren/brlib/wiki).
+"""
+
+from .all_players import all_players
 from .find_asg import find_asg
 from .find_games import find_games
 from .find_teams import find_teams
@@ -13,10 +20,10 @@ from .player_set import PlayerSet
 from .team import Team
 from .team_set import TeamSet
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 
 __all__ = [
-    "all_major_leaguers",
+    "all_players",
     "find_asg",
     "find_games",
     "find_teams",
@@ -29,5 +36,5 @@ __all__ = [
     "Player",
     "PlayerSet",
     "Team",
-    "TeamSet"
+    "TeamSet",
 ]

brlib-0.3.0/src/brlib/_helpers/__init__.py

@@ -0,0 +1,4 @@
+"""
+Functions, classes, and constants internal to the codebase.
+External use of this module is strongly discouraged, and its API may change without notice.
+"""

{brlib-0.2.0 → brlib-0.3.0}/src/brlib/_helpers/abbreviations_manager.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-
-"""Defines and instantiates AbbreviationsManager singleton."""
+"""Defines and instantiates `AbbreviationsManager` singleton."""
 
 import functools
 import os
@@ -8,15 +6,21 @@ from datetime import datetime
 
 import pandas as pd
 from bs4 import BeautifulSoup as bs
-from curl_cffi import Response
+from curl_cffi.requests import Response
 
 from ..options import write
-from .constants import (BML_FRANCHISE_ABVS, CACHE_DIR, CACHE_TIMEZONE,
-                        CURRENT_YEAR, CY_BASEBALL, FIRST_GAMES_YEAR,
-                        SEASON_START_DATE, TEAM_ALIASES)
+from .constants import (
+    BML_FRANCHISE_ABVS,
+    CACHE_DIR,
+    CACHE_TIMEZONE,
+    CURRENT_YEAR,
+    CY_BASEBALL,
+    FIRST_GAMES_YEAR,
+    SEASON_START_DATE,
+    TEAM_ALIASES,
+)
 from .requests_manager import req_man
 from .singleton import Singleton
-from .utils import report_on_exc
 
 
 class AbbreviationsManager(Singleton):
@@ -25,6 +29,7 @@ class AbbreviationsManager(Singleton):
     franchise abbreviations used by Baseball Reference. Manages retrieval and caching of the data,
     loads data on import of brlib. Has methods for working with these abbreviations.
     """
+
     def __init__(self) -> None:
         self._cache_file = CACHE_DIR / "abv_data_v1.csv"
         self.df = pd.DataFrame()
@@ -68,7 +73,6 @@ class AbbreviationsManager(Singleton):
         self.df.to_csv(self._cache_file, index=False)
         self.df.rename({"Team ID": "Team", "Franchise ID": "Franchise"}, axis=1, inplace=True)
 
-    @report_on_exc()
     def _gather_abbreviations(self, page: Response) -> None:
         """Scrapes team_IDs page and create `self.df`."""
         soup = bs(page.content, "lxml")
@@ -82,12 +86,13 @@ class AbbreviationsManager(Singleton):
             record = [ele.text.strip() for ele in row.find_all(["th", "td"])]
             if record[4] == "Present":
                 record[4] = str(CURRENT_YEAR + CY_BASEBALL - 1)
-            del record[2] # remove the column of full team names
+            del record[2]  # remove the column of full team names
 
             # create indicator column for major Negro League teams
             if i == 0:
                 record.append("BML")
             else:
+                # noinspection PyTypeChecker
                 record.append(record[0] in BML_FRANCHISE_ABVS)
             records.append(record)
 
@@ -111,73 +116,69 @@ class AbbreviationsManager(Singleton):
 
     @functools.cache
     def _find_correct_teams(
-            self,
-            abbreviation: str,
-            season: int,
-            era_adjustment: bool
-            ) -> pd.DataFrame:
+        self,
+        abbreviation: str,
+        season: int,
+        era_adjustment: bool,
+    ) -> pd.DataFrame:
         """
         Returns the team row associated with `abbreviation` during `season`.
         Can return an empty DataFrame if there is no match.
 
-        If `era_adjustment` is True, the return DataFrame will contain the row associated with
+        If `era_adjustment` is `True`, the return DataFrame will contain the row associated with
         `abbreviation`'s franchise during `season` even if the abbreviation is not correct.
-        For example, `self._find_correct_teams("FLA", 2025, True)` returns the `MIA` team row.
-        There can be multiple rows in the return DataFrame if an abbreviation, e.g. `BAL`,
+        For example, `self._find_correct_teams("FLA", 2025, True)` returns the MIA team row.
+        There can be multiple rows in the return DataFrame if an abbreviation, e.g. BAL,
         is valid during a season, e.g. 1915, and is also associated with a franchise that
-        is active during that year, e.g. `SLB` which uses `BAL` in later years. In this case,
-        `self._find_correct_teams("BAL", 1915, True)`, the `BAL` and `SLB` team rows are returned.
+        is active during that year, e.g. SLB which uses BAL in later years. In this case,
+        `self._find_correct_teams("BAL", 1915, True)`, the BAL and SLB team rows are returned.
         """
         abv_rows = self.df.loc[self.df["Team"] == abbreviation]
 
         if era_adjustment:
+            # handle potential overlap of abbreviations (e.g. BAL, 1915)
             potential_franchises = abv_rows["Franchise"].values
             franchise_rows = self.df.loc[self.df["Franchise"].isin(potential_franchises)]
-            mask = ((franchise_rows["First Year"] <= season) &
-                    (franchise_rows["Last Year"] >= season))
-            matching_franchises = franchise_rows.loc[mask]["Franchise"]
+            matching_franchises = franchise_rows.loc[
+                (franchise_rows["First Year"] <= season) & (franchise_rows["Last Year"] >= season)
+            ]["Franchise"]
             correct_rows = abv_rows.loc[abv_rows["Franchise"].isin(matching_franchises)]
-            return self._fix_discontinuities(correct_rows, season)
-
-        mask = (abv_rows["First Year"] <= season) & (abv_rows["Last Year"] >= season)
-        correct_row = abv_rows.loc[mask]
-        assert len(correct_row) <= 1
-        return self._fix_discontinuities(correct_row, season)
-
-    def _fix_discontinuities(self, team_rows: pd.DataFrame, season: int) -> pd.DataFrame:
-        """
-        For each row in `team_rows`, returns the team row with the shortest year range that
-        includes `season` within the same franchise.
-        For example, `LAA` is listed as 1961-present, but `CAL` and `ANA` were also used
-        during that time. The rows returned should reflect the abbreviation used during `season`.
-        It is assumed that all year ranges in `team_rows` include `season`.
-        """
-        team_rows.reset_index(drop=True, inplace=True)
-        for i, row in team_rows.iterrows():
+            # handle the special case of the 1939 Toledo Crawfords, who changed leagues mid-season
+            # these are treated as separate teams and have different abbreviations (TC and TC2)
+            if season == 1939 and "PC" in matching_franchises.values:
+                correct_rows = correct_rows.loc[correct_rows["Franchise"] != "PC"]
+                tc_rows = self.df.loc[self.df["Team"].isin({"TC", "TC2"})]
+                correct_rows = pd.concat([correct_rows, tc_rows], ignore_index=True)
+        else:
+            # check whether abbreviation is valid for season, if so pass that row forward
+            mask = (abv_rows["First Year"] <= season) & (abv_rows["Last Year"] >= season)
+            correct_rows = abv_rows.loc[mask]
+            assert len(correct_rows) <= 1
+
+        # For each row in correct_rows, find the team row with the shortest year range that
+        # includes season within the same franchise.
+        # This corrects abbreviations for era (if applicable), and also fixes discontinuities.
+        # For example, LAA is listed as 1961-present, but CAL and ANA were also used during
+        # parts of that time. The rows returned should reflect the abbreviations used during season.
+        correct_rows.reset_index(drop=True, inplace=True)
+        for i, row in correct_rows.iterrows():
             franchise_rows = self.df.loc[self.df["Franchise"] == row["Franchise"]]
-            mask = ((franchise_rows["First Year"] <= season) &
-                    (franchise_rows["Last Year"] >= season))
-            franchise_rows = franchise_rows.loc[mask]
-            years_col = franchise_rows["Last Year"] - franchise_rows["First Year"]
-            correct_row = franchise_rows.loc[years_col == years_col.min()]
-            team_rows.iloc[i] = correct_row.reset_index(drop=True).iloc[0]
-        return team_rows
-
-    def correct_abvs(
-            self,
-            abbreviation: str,
-            season: int,
-            era_adjustment: bool
-            ) -> list[str]:
+            franchise_rows = franchise_rows.loc[
+                (franchise_rows["First Year"] <= season) & (franchise_rows["Last Year"] >= season)
+            ]
+            # for the 1939 Crawfords, skip the normal process to enable the prior workaround
+            if not (season == 1939 and row["Franchise"] == "PC"):
+                years_col = franchise_rows["Last Year"] - franchise_rows["First Year"]
+                correct_row = franchise_rows.loc[years_col == years_col.min()]
+                correct_rows.iloc[i] = correct_row.reset_index(drop=True).iloc[0]
+        return correct_rows
+
+    def correct_abvs(self, abbreviation: str, season: int, era_adjustment: bool) -> list[str]:
         """Returns the team abbreviations from `self._find_correct_teams`."""
         team_rows = self._find_correct_teams(abbreviation, season, era_adjustment)
         return team_rows["Team"].values.tolist()
 
-    def franchise_abv(
-            self,
-            abbreviation: str,
-            season: int
-            ) -> str:
+    def franchise_abv(self, abbreviation: str, season: int) -> str:
         """Returns the franchise abbreviation for the team at `abbreviation` and `season`."""
         team_row = self._find_correct_teams(abbreviation, season, era_adjustment=False)
         if team_row.empty:
@@ -187,7 +188,7 @@ class AbbreviationsManager(Singleton):
     def all_team_abvs(self, abbreviation: str, season: int) -> list[str]:
         """
         Returns all team abbreviations used by the franchise which is associated with the team at
-        `abbreviation` and `season`, e.g. ("ATH", 2025) returns ["PHA", "KCA", "OAK", "ATH"].
+        `abbreviation` and `season`, e.g. `("ATH", 2025)` returns `["PHA", "KCA", "OAK", "ATH"]`.
         """
         franchise_abv = self.franchise_abv(abbreviation, season)
         franchise_df = self.df.loc[self.df["Franchise"] == franchise_abv]
@@ -215,7 +216,7 @@ class AbbreviationsManager(Singleton):
         """
         # some aliases, e.g. KCA, are valid team abvs, these should be left alone
         team_row = self._find_correct_teams(abbreviation, season, era_adjustment=False)
-        if not team_row.empty: # this is a valid team abbreviation for season
+        if not team_row.empty:  # this is a valid team abbreviation for season
             return team_row["Team"].values[0]
 
         # otherwise, convert alias to team abv
@@ -226,4 +227,5 @@ class AbbreviationsManager(Singleton):
             return abbreviation
         return correct_row["Team"].values[0]
 
+
 abv_man = AbbreviationsManager()