feat(package): remove the need of the libffi-dev requirement on pyreaddbc

Author: luabida

.github/workflows/python-package.yml

@@ -34,7 +34,7 @@ jobs:
         pip install poetry poetry-plugin-export
         poetry config virtualenvs.create false
         if [ "${{ runner.os }}" = "Linux" ]; then
-          poetry install --without dev --extras dbc
+          poetry install --without dev
           pip install pre-commit
         else
           poetry install --without dev

README.md

@@ -20,13 +20,6 @@ PySUS is a Python package for accessing and analyzing Brazil's public health dat
 pip install pysus
 ```
 
-For DBC file support (requires libffi):
-```bash
-# Ubuntu/Debian
-sudo apt install libffi-dev
-pip install pysus[dbc]
-```
-
 For the terminal user interface (TUI):
 ```bash
 pip install pysus[tui]

docker/Dockerfile

@@ -29,7 +29,7 @@ COPY docker/scripts/entrypoint.sh /entrypoint.sh
 COPY docker/notebooks/ /home/pysus/Notebooks/
 
 RUN pip install poetry \
-  && cd /usr/src && poetry config virtualenvs.create false && poetry install --with docs --extras dbc \
+  && cd /usr/src && poetry config virtualenvs.create false && poetry install --with docs \
   && pip install 'httpx<0.28' \
   && chown -R pysus:pysus /home/pysus
 

docs/source/installation.rst

@@ -14,14 +14,6 @@ The simplest way to install PySUS is via pip:
 Extras
 ^^^^^^
 
-For DBC file support (requires ``libffi``):
-
-.. code-block:: bash
-
-   # Ubuntu/Debian
-   sudo apt install libffi-dev
-   pip install pysus[dbc]
-
 For the terminal user interface (TUI):
 
 .. code-block:: bash

poetry.lock

@@ -38,17 +38,15 @@ httpx = ">=0.28.0"
 aioftp = "^0.21.4"
 dbfread = "2.0.7"
 bigtree = "^0.12.2"
-
-pyreaddbc = { version = ">=1.1.0", optional = true }
-pycparser = { version = "2.21", optional = true }
-textual = { extras = ["syntax"], version = "^8.2.1", optional = true }
-humanize = { version = "^4.8.0", optional = true }
+pyreaddbc = ">=2.0.4"
 dotenv = "^0.9.9"
 boto3 = "^1.42.89"
 typer = "^0.24.1"
 
+humanize = { version = "^4.8.0", optional = true }
+textual = { extras = ["syntax"], version = "^8.2.1", optional = true }
+
 [tool.poetry.extras]
-dbc = ["pyreaddbc", "pycparser"]
 tui = ["textual", "humanize"]
 
 [tool.poetry.group.dev.dependencies]

pyproject.toml

@@ -2,10 +2,8 @@
 
 import asyncio
 import csv
-import ctypes.util
 import gzip
 import shutil
-import sys
 import tarfile
 import zipfile
 from collections.abc import AsyncGenerator, Callable
@@ -26,16 +24,9 @@
 from .types import FileType
 
 try:
-    LIBFFI = True
-    if sys.platform.startswith("linux"):
-        LIBFFI = ctypes.util.find_library("ffi") is not None
+    from pyreaddbc import dbc2dbf
 
-    if LIBFFI:
-        from pyreaddbc import dbc2dbf
-
-        DBC_IMPORT = True
-    else:
-        DBC_IMPORT = False
+    DBC_IMPORT = True
 except ImportError:
     DBC_IMPORT = False
 
@@ -781,14 +772,12 @@ def _extract():
         return list(await asyncio.gather(*tasks))
 
 
-class FTPNotImported(BaseTabularFile):
+class DBCNotImported(BaseTabularFile):
     """Placeholder for DBC files when optional dependency is not installed."""
 
     path: Path = Field(default_factory=lambda: Path("..."))
     type: str | FileType = Field(default="remote")
-    import_err: ClassVar[
-        str
-    ] = """
+    import_err: ClassVar[str] = """
         run "pip install pysus[dbc]" to handle DBC files.
         Make sure you also have libffi installed on the system. It may not work
         on Windows
@@ -872,7 +861,7 @@ class ExtensionFactory:
         ".csv": CSV,
         ".parquet": Parquet,
         ".dbf": DBF,
-        ".dbc": DBC if DBC_IMPORT else FTPNotImported,  # type: ignore
+        ".dbc": DBC if DBC_IMPORT else DBCNotImported,  # type: ignore
         ".pdf": PDF,
         ".json": JSON,
     }