Fix PR comments

This commit addresses the comments on pull request #7.

- Increased cache expiry to 31 days.
- Added support for nep_mode in caching.
- Restored `tests/test_docker_utils.py` to the version in the PR.
- Kept `setuptools` as a dependency as it is required for Python < 3.9.

Author: google-labs-jules[bot]

pyproject.toml

@@ -15,6 +15,7 @@ dependencies = [
     "appdirs",
     "requests",
     "setuptools",
+    "beautifulsoup4",
 ]
 classifiers = [
     "License :: OSI Approved :: MIT License",

python_eol/cache.py

@@ -9,12 +9,14 @@
 
 import appdirs
 import requests
+from bs4 import BeautifulSoup
 
 logger = logging.getLogger(__name__)
 
 CACHE_DIR = Path(appdirs.user_cache_dir("python-eol"))
 CACHE_FILE = CACHE_DIR / "eol_data.json"
-CACHE_EXPIRY = timedelta(days=1)
+CACHE_FILE_NEP = CACHE_DIR / "eol_data_nep.json"
+CACHE_EXPIRY = timedelta(days=31)
 
 
 def _fetch_eol_data() -> list[dict[str, Any]] | None:
@@ -39,44 +41,82 @@ def _fetch_eol_data() -> list[dict[str, Any]] | None:
     return processed_data
 
 
-def _read_cache() -> list[dict[str, Any]] | None:
+def _fetch_nep_data() -> list[dict[str, Any]] | None:
+    """Fetch NEP 29 EOL data."""
+    url = "https://numpy.org/neps/nep-0029-deprecation_policy.html#support-table"
+    try:
+        response = requests.get(url, timeout=10)
+        response.raise_for_status()
+    except requests.RequestException as e:
+        logger.warning(f"Failed to fetch NEP data: {e}")
+        return None
+
+    soup = BeautifulSoup(response.content, "html.parser")
+    table = soup.find("table")
+
+    data = []
+    for row in table.find_all("tr")[1:]:
+        columns = row.find_all("td")
+        end_of_life = columns[0].text.strip()
+        version = columns[1].text.strip().rstrip("+")
+        version_number = version.split(".")
+        version_number[-1] = str(int(version_number[-1]) - 1)
+        parsed_version = ".".join(version_number)
+        end_of_life_date = datetime.strptime(end_of_life, "%b %d, %Y").date()
+
+        existing_data = next((d for d in data if d["Version"] == parsed_version), None)
+        if existing_data:
+            existing_data["End of Life"] = min(
+                existing_data["End of Life"],
+                str(end_of_life_date),
+            )
+        else:
+            row_data = {"Version": parsed_version, "End of Life": str(end_of_life_date)}
+            data.append(row_data)
+    return data
+
+
+def _read_cache(*, nep_mode: bool = False) -> list[dict[str, Any]] | None:
     """Read EOL data from cache."""
-    if not CACHE_FILE.exists():
+    cache_file = CACHE_FILE_NEP if nep_mode else CACHE_FILE
+    if not cache_file.exists():
         return None
 
-    if datetime.fromtimestamp(CACHE_FILE.stat().st_mtime) < datetime.now() - CACHE_EXPIRY:
+    if datetime.fromtimestamp(cache_file.stat().st_mtime) < datetime.now() - CACHE_EXPIRY:
         logger.debug("Cache is expired.")
         return None
 
     try:
-        with CACHE_FILE.open() as f:
+        with cache_file.open() as f:
             return json.load(f)
     except (IOError, json.JSONDecodeError) as e:
         logger.warning(f"Failed to read cache: {e}")
         return None
 
 
-def _write_cache(data: list[dict[str, Any]]) -> None:
+def _write_cache(data: list[dict[str, Any]], *, nep_mode: bool = False) -> None:
     """Write EOL data to cache."""
+    cache_file = CACHE_FILE_NEP if nep_mode else CACHE_FILE
     try:
         CACHE_DIR.mkdir(parents=True, exist_ok=True)
-        with CACHE_FILE.open("w") as f:
+        with cache_file.open("w") as f:
             json.dump(data, f, indent=4)
     except IOError as e:
         logger.warning(f"Failed to write cache: {e}")
 
 
-def get_eol_data() -> list[dict[str, Any]] | None:
+def get_eol_data(*, nep_mode: bool = False) -> list[dict[str, Any]] | None:
     """Get EOL data from cache or fetch if stale."""
-    cached_data = _read_cache()
+    cached_data = _read_cache(nep_mode=nep_mode)
     if cached_data:
         logger.debug("Using cached EOL data.")
         return cached_data
 
     logger.debug("Fetching new EOL data.")
-    fetched_data = _fetch_eol_data()
+    fetch_function = _fetch_nep_data if nep_mode else _fetch_eol_data
+    fetched_data = fetch_function()
     if fetched_data:
-        _write_cache(fetched_data)
+        _write_cache(fetched_data, nep_mode=nep_mode)
         return fetched_data
 
     return None

python_eol/main.py

@@ -81,7 +81,7 @@ def _check_python_eol(
     check_docker_files: bool = False,
     nep_mode: bool = False,
 ) -> int:
-    eol_data = get_eol_data()
+    eol_data = get_eol_data(nep_mode=nep_mode)
     if eol_data is None:
         logger.debug("Falling back to packaged EOL data.")
         db_file = _get_db_file_path(nep_mode=nep_mode)