instapaper-scraper 1.1.0__tar.gz → 1.1.1__tar.gz

{instapaper_scraper-1.1.0/src/instapaper_scraper.egg-info → instapaper_scraper-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: instapaper-scraper
-Version: 1.1.0
+Version: 1.1.1
 Summary: A tool to scrape articles from Instapaper.
 Project-URL: Homepage, https://github.com/chriskyfung/InstapaperScraper
 Project-URL: Source, https://github.com/chriskyfung/InstapaperScraper
@@ -43,12 +43,19 @@ Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: licensecheck; extra == "dev"
 Dynamic: license-file
 
 # Instapaper Scraper
 
 <!-- Badges -->
 <p align="center">
+  <a href="https://pypi.org/project/instapaper-scraper/">
+    <img src="https://img.shields.io/pypi/v/instapaper-scraper.svg" alt="PyPI version">
+  </a>
+  <a href="https://pepy.tech/projects/instapaper-scraper">
+    <img src="https://static.pepy.tech/personalized-badge/instapaper-scraper?period=total&left_text=downloads" alt="PyPI Downloads">
+  </a>
   <a href="https://github.com/chriskyfung/InstapaperScraper">
     <img src="https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fchriskyfung%2FInstapaperScraper%2Frefs%2Fheads%2Fmaster%2Fpyproject.toml" alt="Python Version from PEP 621 TOML">
   </a>
@@ -58,23 +65,18 @@ Dynamic: license-file
   <a href="https://codecov.io/gh/chriskyfung/InstapaperScraper">
     <img src="https://codecov.io/gh/chriskyfung/InstapaperScraper/graph/badge.svg" alt="Code Coverage">
   </a>
+  <wbr />
   <a href="https://github.com/chriskyfung/InstapaperScraper/actions/workflows/ci.yml">
     <img src="https://github.com/chriskyfung/InstapaperScraper/actions/workflows/ci.yml/badge.svg" alt="CI Status">
   </a>
-  <a href="https://pypi.org/project/instapaper-scraper/">
-    <img src="https://img.shields.io/pypi/v/instapaper-scraper.svg" alt="PyPI version">
-  </a>
-  <a href="https://pepy.tech/projects/instapaper-scraper">
-    <img src="https://static.pepy.tech/personalized-badge/instapaper-scraper?period=total&left_text=downloads" alt="PyPI Downloads">
-  </a>
   <a href="https://www.gnu.org/licenses/gpl-3.0.en.html">
     <img src="https://img.shields.io/github/license/chriskyfung/InstapaperScraper" alt="GitHub License">
   </a>
   <a href="https://github.com/sponsors/chriskyfung" title="Sponsor on GitHub">
-    <img src="https://img.shields.io/badge/Sponsor-GitHub-purple?logo=github" alt="GitHub Sponsors Default">
+    <img src="https://img.shields.io/badge/Sponsor-GitHub-blue?logo=github-sponsors&colorA=263238&colorB=EC407A" alt="GitHub Sponsors Default">
   </a>
-  <a href="https://www.buymeacoffee.com/chriskyfung" title="Buy Me A Coffee">
-    <img src="https://img.shields.io/badge/Support%20Me-Coffee-ffdd00?logo=buy-me-a-coffee&logoColor=white" alt="Buy Me A Coffee">
+  <a href="https://www.buymeacoffee.com/chriskyfung" title="Support Coffee">
+    <img src="https://img.shields.io/badge/Support-Coffee-ffdd00?logo=buy-me-a-coffee&logoColor=ffdd00&colorA=263238" alt="Buy Me A Coffee">
   </a>
 </p>
 
@@ -336,6 +338,13 @@ To run static type checking with `mypy`:
 mypy src
 ```
 
+To run license checks:
+
+```sh
+licensecheck --show-only-failing
+```
+
+
 ## 📜 Disclaimer
 
 This script requires valid Instapaper credentials. Use it responsibly and in accordance with Instapaper’s Terms of Service.
@@ -344,9 +353,8 @@ This script requires valid Instapaper credentials. Use it responsibly and in acc
 
 This project is licensed under the terms of the **GNU General Public License v3.0**. See the [LICENSE](LICENSE) file for the full license text.
 
-## 🙏 Support the Project
+## Contributors
 
-`Instapaper Scraper` is a free and open-source project that requires significant time and effort to maintain and improve. If you find this tool useful, please consider supporting its development. Your contribution helps ensure the project stays healthy, active, and continuously updated.
+[![Contributors](https://contrib.rocks/image?repo=chriskyfung/InstapaperScraper)](https://github.com/chriskyfung/InstapaperScraper/graphs/contributors)
 
-- **[Sponsor on GitHub](https://github.com/sponsors/chriskyfung):** The best way to support the project with recurring monthly donations. Tiers with special rewards like priority support are available!
-- **[Buy Me a Coffee](https://www.buymeacoffee.com/chriskyfung):** Perfect for a one-time thank you.
+Made with [contrib.rocks](https://contrib.rocks).

{instapaper_scraper-1.1.0 → instapaper_scraper-1.1.1}/README.md

@@ -2,6 +2,12 @@
 
 <!-- Badges -->
 <p align="center">
+  <a href="https://pypi.org/project/instapaper-scraper/">
+    <img src="https://img.shields.io/pypi/v/instapaper-scraper.svg" alt="PyPI version">
+  </a>
+  <a href="https://pepy.tech/projects/instapaper-scraper">
+    <img src="https://static.pepy.tech/personalized-badge/instapaper-scraper?period=total&left_text=downloads" alt="PyPI Downloads">
+  </a>
   <a href="https://github.com/chriskyfung/InstapaperScraper">
     <img src="https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fchriskyfung%2FInstapaperScraper%2Frefs%2Fheads%2Fmaster%2Fpyproject.toml" alt="Python Version from PEP 621 TOML">
   </a>
@@ -11,23 +17,18 @@
   <a href="https://codecov.io/gh/chriskyfung/InstapaperScraper">
     <img src="https://codecov.io/gh/chriskyfung/InstapaperScraper/graph/badge.svg" alt="Code Coverage">
   </a>
+  <wbr />
   <a href="https://github.com/chriskyfung/InstapaperScraper/actions/workflows/ci.yml">
     <img src="https://github.com/chriskyfung/InstapaperScraper/actions/workflows/ci.yml/badge.svg" alt="CI Status">
   </a>
-  <a href="https://pypi.org/project/instapaper-scraper/">
-    <img src="https://img.shields.io/pypi/v/instapaper-scraper.svg" alt="PyPI version">
-  </a>
-  <a href="https://pepy.tech/projects/instapaper-scraper">
-    <img src="https://static.pepy.tech/personalized-badge/instapaper-scraper?period=total&left_text=downloads" alt="PyPI Downloads">
-  </a>
   <a href="https://www.gnu.org/licenses/gpl-3.0.en.html">
     <img src="https://img.shields.io/github/license/chriskyfung/InstapaperScraper" alt="GitHub License">
   </a>
   <a href="https://github.com/sponsors/chriskyfung" title="Sponsor on GitHub">
-    <img src="https://img.shields.io/badge/Sponsor-GitHub-purple?logo=github" alt="GitHub Sponsors Default">
+    <img src="https://img.shields.io/badge/Sponsor-GitHub-blue?logo=github-sponsors&colorA=263238&colorB=EC407A" alt="GitHub Sponsors Default">
   </a>
-  <a href="https://www.buymeacoffee.com/chriskyfung" title="Buy Me A Coffee">
-    <img src="https://img.shields.io/badge/Support%20Me-Coffee-ffdd00?logo=buy-me-a-coffee&logoColor=white" alt="Buy Me A Coffee">
+  <a href="https://www.buymeacoffee.com/chriskyfung" title="Support Coffee">
+    <img src="https://img.shields.io/badge/Support-Coffee-ffdd00?logo=buy-me-a-coffee&logoColor=ffdd00&colorA=263238" alt="Buy Me A Coffee">
   </a>
 </p>
 
@@ -289,6 +290,13 @@ To run static type checking with `mypy`:
 mypy src
 ```
 
+To run license checks:
+
+```sh
+licensecheck --show-only-failing
+```
+
+
 ## 📜 Disclaimer
 
 This script requires valid Instapaper credentials. Use it responsibly and in accordance with Instapaper’s Terms of Service.
@@ -297,9 +305,8 @@ This script requires valid Instapaper credentials. Use it responsibly and in acc
 
 This project is licensed under the terms of the **GNU General Public License v3.0**. See the [LICENSE](LICENSE) file for the full license text.
 
-## 🙏 Support the Project
+## Contributors
 
-`Instapaper Scraper` is a free and open-source project that requires significant time and effort to maintain and improve. If you find this tool useful, please consider supporting its development. Your contribution helps ensure the project stays healthy, active, and continuously updated.
+[![Contributors](https://contrib.rocks/image?repo=chriskyfung/InstapaperScraper)](https://github.com/chriskyfung/InstapaperScraper/graphs/contributors)
 
-- **[Sponsor on GitHub](https://github.com/sponsors/chriskyfung):** The best way to support the project with recurring monthly donations. Tiers with special rewards like priority support are available!
-- **[Buy Me a Coffee](https://www.buymeacoffee.com/chriskyfung):** Perfect for a one-time thank you.
+Made with [contrib.rocks](https://contrib.rocks).

{instapaper_scraper-1.1.0 → instapaper_scraper-1.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "instapaper-scraper"
-version = "1.1.0"
+version = "1.1.1"
 description = "A tool to scrape articles from Instapaper."
 readme = "README.md"
 requires-python = ">=3.9"
@@ -35,7 +35,7 @@ dependencies = [
     "soupsieve~=2.8",
     "typing_extensions~=4.15.0",
     "urllib3>=2.5,<2.7",
-    "tomli~=2.0.1; python_version < '3.11'",
+    "tomli~=2.0.1; python_version < '3.11'"
 ]
 
 [project.urls]
@@ -46,6 +46,9 @@ Issues = "https://github.com/chriskyfung/InstapaperScraper/issues"
 [project.scripts]
 instapaper-scraper = "instapaper_scraper.cli:main"
 
+[tool.licensecheck]
+license = "GPL-3.0"
+
 [tool.pytest.ini_options]
 pythonpath = "src"
 
@@ -77,5 +80,6 @@ dev = [
     "build",
     "twine",
     "mypy",
-    "pre-commit"
+    "pre-commit",
+    "licensecheck"
 ]

{instapaper_scraper-1.1.0 → instapaper_scraper-1.1.1}/src/instapaper_scraper/output.py

@@ -1,9 +1,6 @@
 import os
-import json
-import sqlite3
 import logging
-import csv
-from typing import List, Dict, Any
+from typing import List, Dict, Any, TYPE_CHECKING
 
 from .constants import INSTAPAPER_READ_URL, KEY_ID, KEY_TITLE, KEY_URL
 
@@ -19,6 +16,13 @@ LOG_NO_ARTICLES = "No articles found to save."
 LOG_SAVED_ARTICLES = "Saved {count} articles to {filename}"
 LOG_UNKNOWN_FORMAT = "Unknown output format: {format}"
 
+if TYPE_CHECKING:
+    # Import for type-checking purposes, and use an alias
+    # to signal to linters like ruff that it is being used.
+    import sqlite3 as sqlite3
+
+    __all__ = ["sqlite3"]
+
 
 def get_sqlite_create_table_sql(add_instapaper_url: bool = False) -> str:
     """Returns the SQL statement to create the articles table."""
@@ -28,6 +32,8 @@ def get_sqlite_create_table_sql(add_instapaper_url: bool = False) -> str:
         f"{KEY_URL} TEXT NOT NULL",
     ]
     if add_instapaper_url:
+        import sqlite3
+
         # The GENERATED ALWAYS AS syntax was added in SQLite 3.31.0
         if sqlite3.sqlite_version_info >= (3, 31, 0):
             columns.append(
@@ -55,6 +61,8 @@ def save_to_csv(
     data: List[Dict[str, Any]], filename: str, add_instapaper_url: bool = False
 ) -> None:
     """Saves a list of articles to a CSV file."""
+    import csv
+
     os.makedirs(os.path.dirname(filename), exist_ok=True)
     with open(filename, "w", newline="", encoding="utf-8") as f:
         fieldnames = [KEY_ID, KEY_TITLE, KEY_URL]
@@ -71,6 +79,8 @@ def save_to_csv(
 
 def save_to_json(data: List[Dict[str, Any]], filename: str) -> None:
     """Saves a list of articles to a JSON file."""
+    import json
+
     os.makedirs(os.path.dirname(filename), exist_ok=True)
     with open(filename, "w", encoding="utf-8") as f:
         json.dump(data, f, indent=JSON_INDENT, ensure_ascii=False)
@@ -81,6 +91,8 @@ def save_to_sqlite(
     data: List[Dict[str, Any]], db_name: str, add_instapaper_url: bool = False
 ) -> None:
     """Saves a list of articles to a SQLite database."""
+    import sqlite3
+
     os.makedirs(os.path.dirname(db_name), exist_ok=True)
     conn = sqlite3.connect(db_name)
     cursor = conn.cursor()

{instapaper_scraper-1.1.0 → instapaper_scraper-1.1.1/src/instapaper_scraper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: instapaper-scraper
-Version: 1.1.0
+Version: 1.1.1
 Summary: A tool to scrape articles from Instapaper.
 Project-URL: Homepage, https://github.com/chriskyfung/InstapaperScraper
 Project-URL: Source, https://github.com/chriskyfung/InstapaperScraper
@@ -43,12 +43,19 @@ Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: licensecheck; extra == "dev"
 Dynamic: license-file
 
 # Instapaper Scraper
 
 <!-- Badges -->
 <p align="center">
+  <a href="https://pypi.org/project/instapaper-scraper/">
+    <img src="https://img.shields.io/pypi/v/instapaper-scraper.svg" alt="PyPI version">
+  </a>
+  <a href="https://pepy.tech/projects/instapaper-scraper">
+    <img src="https://static.pepy.tech/personalized-badge/instapaper-scraper?period=total&left_text=downloads" alt="PyPI Downloads">
+  </a>
   <a href="https://github.com/chriskyfung/InstapaperScraper">
     <img src="https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fchriskyfung%2FInstapaperScraper%2Frefs%2Fheads%2Fmaster%2Fpyproject.toml" alt="Python Version from PEP 621 TOML">
   </a>
@@ -58,23 +65,18 @@ Dynamic: license-file
   <a href="https://codecov.io/gh/chriskyfung/InstapaperScraper">
     <img src="https://codecov.io/gh/chriskyfung/InstapaperScraper/graph/badge.svg" alt="Code Coverage">
   </a>
+  <wbr />
   <a href="https://github.com/chriskyfung/InstapaperScraper/actions/workflows/ci.yml">
     <img src="https://github.com/chriskyfung/InstapaperScraper/actions/workflows/ci.yml/badge.svg" alt="CI Status">
   </a>
-  <a href="https://pypi.org/project/instapaper-scraper/">
-    <img src="https://img.shields.io/pypi/v/instapaper-scraper.svg" alt="PyPI version">
-  </a>
-  <a href="https://pepy.tech/projects/instapaper-scraper">
-    <img src="https://static.pepy.tech/personalized-badge/instapaper-scraper?period=total&left_text=downloads" alt="PyPI Downloads">
-  </a>
   <a href="https://www.gnu.org/licenses/gpl-3.0.en.html">
     <img src="https://img.shields.io/github/license/chriskyfung/InstapaperScraper" alt="GitHub License">
   </a>
   <a href="https://github.com/sponsors/chriskyfung" title="Sponsor on GitHub">
-    <img src="https://img.shields.io/badge/Sponsor-GitHub-purple?logo=github" alt="GitHub Sponsors Default">
+    <img src="https://img.shields.io/badge/Sponsor-GitHub-blue?logo=github-sponsors&colorA=263238&colorB=EC407A" alt="GitHub Sponsors Default">
   </a>
-  <a href="https://www.buymeacoffee.com/chriskyfung" title="Buy Me A Coffee">
-    <img src="https://img.shields.io/badge/Support%20Me-Coffee-ffdd00?logo=buy-me-a-coffee&logoColor=white" alt="Buy Me A Coffee">
+  <a href="https://www.buymeacoffee.com/chriskyfung" title="Support Coffee">
+    <img src="https://img.shields.io/badge/Support-Coffee-ffdd00?logo=buy-me-a-coffee&logoColor=ffdd00&colorA=263238" alt="Buy Me A Coffee">
   </a>
 </p>
 
@@ -336,6 +338,13 @@ To run static type checking with `mypy`:
 mypy src
 ```
 
+To run license checks:
+
+```sh
+licensecheck --show-only-failing
+```
+
+
 ## 📜 Disclaimer
 
 This script requires valid Instapaper credentials. Use it responsibly and in accordance with Instapaper’s Terms of Service.
@@ -344,9 +353,8 @@ This script requires valid Instapaper credentials. Use it responsibly and in acc
 
 This project is licensed under the terms of the **GNU General Public License v3.0**. See the [LICENSE](LICENSE) file for the full license text.
 
-## 🙏 Support the Project
+## Contributors
 
-`Instapaper Scraper` is a free and open-source project that requires significant time and effort to maintain and improve. If you find this tool useful, please consider supporting its development. Your contribution helps ensure the project stays healthy, active, and continuously updated.
+[![Contributors](https://contrib.rocks/image?repo=chriskyfung/InstapaperScraper)](https://github.com/chriskyfung/InstapaperScraper/graphs/contributors)
 
-- **[Sponsor on GitHub](https://github.com/sponsors/chriskyfung):** The best way to support the project with recurring monthly donations. Tiers with special rewards like priority support are available!
-- **[Buy Me a Coffee](https://www.buymeacoffee.com/chriskyfung):** Perfect for a one-time thank you.
+Made with [contrib.rocks](https://contrib.rocks).

{instapaper_scraper-1.1.0 → instapaper_scraper-1.1.1}/src/instapaper_scraper.egg-info/requires.txt

@@ -24,3 +24,4 @@ build
 twine
 mypy
 pre-commit
+licensecheck

{instapaper_scraper-1.1.0 → instapaper_scraper-1.1.1}/tests/test_output.py

@@ -4,7 +4,7 @@ import sqlite3
 import logging
 import io
 import csv
-from unittest.mock import patch, MagicMock
+from unittest.mock import patch, MagicMock, PropertyMock
 
 from instapaper_scraper.output import (
     _correct_ext,
@@ -47,6 +47,25 @@ def output_dir(tmp_path):
     return tmp_path / "output"
 
 
+@pytest.fixture
+def mock_sqlite3():
+    """
+    Fixture to mock the sqlite3 module for dynamic imports.
+    This fixture patches sys.modules to replace the sqlite3 module with a mock.
+    It yields a function that allows tests to configure the mock's version info.
+    """
+    with patch.dict("sys.modules", {"sqlite3": MagicMock()}) as mock_modules:
+        mock_sqlite = mock_modules["sqlite3"]
+
+        def _configure_mock(version_info):
+            # Use PropertyMock to ensure the version comparison works correctly
+            type(mock_sqlite).sqlite_version_info = PropertyMock(
+                return_value=version_info
+            )
+
+        yield _configure_mock, mock_sqlite
+
+
 class TestCorrectExt:
     @pytest.mark.parametrize(
         "filename, format, expected",
@@ -73,16 +92,18 @@ def test_get_sqlite_create_table_sql_without_url():
     assert "instapaper_url" not in sql
 
 
-@patch("sqlite3.sqlite_version_info", (3, 31, 0))
-def test_get_sqlite_create_table_sql_with_url_modern_sqlite():
+def test_get_sqlite_create_table_sql_with_url_modern_sqlite(mock_sqlite3):
     """Test CREATE TABLE SQL with instapaper_url on modern SQLite."""
+    configure_mock, _ = mock_sqlite3
+    configure_mock((3, 31, 0))
     sql = get_sqlite_create_table_sql(add_instapaper_url=True)
     assert "instapaper_url TEXT GENERATED ALWAYS AS" in sql
 
 
-@patch("sqlite3.sqlite_version_info", (3, 30, 0))
-def test_get_sqlite_create_table_sql_with_url_old_sqlite():
+def test_get_sqlite_create_table_sql_with_url_old_sqlite(mock_sqlite3):
     """Test CREATE TABLE SQL with instapaper_url on old SQLite."""
+    configure_mock, _ = mock_sqlite3
+    configure_mock((3, 30, 0))
     sql = get_sqlite_create_table_sql(add_instapaper_url=True)
     assert "instapaper_url TEXT" in sql
     assert "GENERATED" not in sql
@@ -188,15 +209,15 @@ def test_save_to_sqlite(sample_articles, output_dir):
     conn.close()
 
 
-@patch("sqlite3.connect")
-@patch("sqlite3.sqlite_version_info", (3, 31, 0))
 def test_save_to_sqlite_with_instapaper_url_modern_sqlite(
-    mock_connect, sample_articles, output_dir
+    mock_sqlite3, sample_articles, output_dir
 ):
     """Test saving with instapaper_url on modern SQLite."""
+    configure_mock, mock_sqlite = mock_sqlite3
+    configure_mock((3, 31, 0))
     mock_conn = MagicMock()
     mock_cursor = MagicMock()
-    mock_connect.return_value = mock_conn
+    mock_sqlite.connect.return_value = mock_conn
     mock_conn.cursor.return_value = mock_cursor
 
     articles = sample_articles()
@@ -217,15 +238,15 @@ def test_save_to_sqlite_with_instapaper_url_modern_sqlite(
     assert "instapaper_url" not in executed_data[0]
 
 
-@patch("sqlite3.connect")
-@patch("sqlite3.sqlite_version_info", (3, 30, 0))
 def test_save_to_sqlite_with_instapaper_url_old_sqlite(
-    mock_connect, sample_articles, output_dir
+    mock_sqlite3, sample_articles, output_dir
 ):
     """Test saving with instapaper_url on old SQLite."""
+    configure_mock, mock_sqlite = mock_sqlite3
+    configure_mock((3, 30, 0))
     mock_conn = MagicMock()
     mock_cursor = MagicMock()
-    mock_connect.return_value = mock_conn
+    mock_sqlite.connect.return_value = mock_conn
     mock_conn.cursor.return_value = mock_cursor
 
     articles = sample_articles()