Update/py3 13 deps

.github/workflows/release.yml

@@ -6,18 +6,18 @@ jobs:
   publish-pypi:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v4.1.0
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.13
       - name: Install dependencies
         run: pip install -qU setuptools wheel twine
       - name: Generating distribution archives
         run: python setup.py sdist bdist_wheel
       - name: Publish distribution 📦 to PyPI
         if: startsWith(github.event.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}

.github/workflows/test.yml

@@ -6,11 +6,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4.1.0
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.13
       - name: Install dependencies
         run: make install-test
       - name: Lint
@@ -20,11 +20,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: ['3.10', '3.11', '3.12', '3.13']
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4.1.0
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -35,18 +35,19 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4.1.0
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.13
       - name: Install dependencies
         run: make install-test
       - name: Generate coverage report
         run: pytest --cov-report=xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v5
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
           flags: unittests
           name: codecov-umbrella

Makefile

@@ -1,9 +1,9 @@
 SHELL := bash
 PATH := ./venv/bin:${PATH}
-PYTHON=python3.7
+PYTHON=python3.11
 PROJECT=cep
 isort = isort $(PROJECT) tests setup.py
-black = black -S -l 79 --target-version py37 $(PROJECT) tests setup.py
+black = black -S -l 79 --target-version py311 $(PROJECT) tests setup.py
 
 .PHONY: all
 all: testt

README.md

@@ -2,7 +2,7 @@
 
 [![test](https://github.com/cuenca-mx/cep-python/workflows/test/badge.svg)](https://github.com/cuenca-mx/cep-python/actions?query=workflow%3Atest)
 [![codecov](https://codecov.io/gh/cuenca-mx/cep-python/branch/master/graph/badge.svg)](https://codecov.io/gh/cuenca-mx/cep-python)
-[![PyPI](https://img.shields.io/pypi/v/cuenca.svg)](https://pypi.org/project/cuenca/)
+[![PyPI](https://img.shields.io/pypi/v/cepmex.svg)](https://pypi.org/project/cepmex/)
 
 Python client library for CEP (http://www.banxico.org.mx/cep/)
 

cep/cuenta.py

@@ -1,15 +1,16 @@
 from dataclasses import dataclass
+from typing import Optional
 
 from lxml import etree
 
 
 @dataclass
 class Cuenta:
-    nombre: str
-    tipo: str
-    banco: str
-    numero: str
-    rfc: str
+    nombre: Optional[str] = None
+    tipo: Optional[str] = None
+    banco: Optional[str] = None
+    numero: Optional[str] = None
+    rfc: Optional[str] = None
 
     @classmethod
     def from_etree(cls, element: etree._Element):

cep/exc.py

@@ -10,3 +10,10 @@ class MaxRequestError(CepError):
     Máximo número de peticiones alcanzadas para
     obtener el CEP de una transferencia
     """
+
+
+class IncompleteResponseError(CepError):
+    """
+    Respuesta incompleta del sitio web
+    https://www.banxico.org.mx/cep/
+    """

cep/transferencia.py

@@ -8,7 +8,7 @@
 
 from .client import Client
 from .cuenta import Cuenta
-from .exc import CepError, MaxRequestError
+from .exc import CepError, IncompleteResponseError, MaxRequestError
 
 MAX_REQUEST_ERROR_MESSAGE = (
     b'Lo sentimos, pero ha excedido el número máximo '
@@ -54,12 +54,19 @@ def validar(
 
         resp = etree.fromstring(xml)
 
-        ordenante = Cuenta.from_etree(resp.find('Ordenante'))
-        beneficiario = Cuenta.from_etree(resp.find('Beneficiario'))
-        concepto = resp.find('Beneficiario').get('Concepto')
-        fecha_operacion = datetime.datetime.fromisoformat(
-            str(fecha) + ' ' + resp.get('Hora')
-        )
+        ordenante_element = resp.find('Ordenante')
+        beneficiario_element = resp.find('Beneficiario')
+
+        if ordenante_element is None or beneficiario_element is None:
+            raise IncompleteResponseError
+
+        ordenante = Cuenta.from_etree(ordenante_element)
+        beneficiario = Cuenta.from_etree(beneficiario_element)
+
+        concepto = beneficiario_element.get('Concepto') or ''
+        hora = resp.get('Hora') or '00:00:00'
+        fecha_operacion = datetime.datetime.fromisoformat(f'{fecha} {hora}')
+
         transferencia = cls(
             fecha_operacion=fecha_operacion,
             ordenante=ordenante,
@@ -69,7 +76,7 @@ def validar(
             clave_rastreo=clave_rastreo,
             emisor=emisor,
             receptor=receptor,
-            sello=resp.get('sello'),
+            sello=resp.get('sello') or '',
         )
         setattr(transferencia, '__client', client)
         return transferencia
@@ -78,14 +85,19 @@ def descargar(self, formato: str = 'PDF') -> bytes:
         """formato puede ser PDF, XML o ZIP"""
         client = getattr(self, '__client', None)
         if not client:
+            numero_cuenta = ''
+            if self.beneficiario is not None:
+                numero_cuenta = self.beneficiario.numero or ''
             client = self._validar(
                 self.fecha_operacion.date(),
                 self.clave_rastreo,
                 self.emisor,
                 self.receptor,
-                self.beneficiario.numero,
+                numero_cuenta,
                 self.monto,
             )
+            if not client:
+                raise CepError
         return self._descargar(client, formato)
 
     def to_dict(self) -> dict:

requirements-test.txt

@@ -1,7 +1,9 @@
-pytest==6.2.5
-pytest-vcr==1.0.2
-pytest-cov==3.0.0
-black==22.3.0
-flake8==4.0.1
-isort[pipfile]==5.10.1
-mypy==0.790
+pytest==8.*
+pytest-vcr==1.*
+pytest-cov==6.*
+black==24.*
+flake8==7.*
+isort==5.*
+mypy==1.*
+types-lxml==2024.*
+types-requests==2.*

requirements.txt

@@ -1,4 +1,3 @@
-requests==2.31.0
-clabe==1.2.4
-lxml==4.9.1
-dataclasses>=0.6;python_version<"3.7"
+requests==2.32.3
+clabe==2.0.0
+lxml==5.3.0

setup.py

@@ -21,15 +21,17 @@
     packages=find_packages(),
     include_package_data=True,
     package_data=dict(cep=['py.typed']),
-    python_requires='>=3.7',
+    python_requires='>=3.10',
     install_requires=[
-        'requests>=2.25,<2.32',
-        'clabe>=1.2.4,<1.3',
-        'lxml>=4.6.2,<4.10',
-        'dataclasses>=0.6;python_version<"3.7"',
+        'requests>=2.32.0,<3.0.0',
+        'clabe>=2.0.0,<3.0.0',
+        'lxml>=5.3.0,<6.0.0',
     ],
     classifiers=[
-        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
     ],

tests/test_transferencia.py

@@ -5,7 +5,8 @@
 from requests import HTTPError
 
 from cep import Transferencia
-from cep.exc import CepError, MaxRequestError
+from cep.client import Client
+from cep.exc import CepError, IncompleteResponseError, MaxRequestError
 
 
 @pytest.mark.vcr
@@ -89,3 +90,41 @@ def test_maximo_numero_de_requests():
             cuenta='012180000',
             monto=0.01,
         )
+
+
+def test_incomplete_response(monkeypatch):
+    mock_post_response = b'Respuesta exitosa'
+    mock_get_response = (
+        b'<?xml version="1.0" encoding="UTF-8"?>'
+        b'<SPEI_Tercero FechaOperacion="2019-04-12" Hora="13:31:44">'
+        b'</SPEI_Tercero>'
+    )
+
+    def mock_post(self, path, data):
+        return mock_post_response
+
+    def mock_get(self, path):
+        return mock_get_response
+
+    monkeypatch.setattr(Client, 'post', mock_post)
+    monkeypatch.setattr(Client, 'get', mock_get)
+
+    with pytest.raises(IncompleteResponseError):
+        Transferencia.validar(
+            fecha=dt.date(2022, 4, 19),
+            clave_rastreo='CUENCA927820173168',
+            emisor='90646',  # STP
+            receptor='40012',  # BBVA
+            cuenta='012180000',
+            monto=0.01,
+        )
+
+
+def test_descarga_sin_client_validacion_fallida(monkeypatch, transferencia):
+    def mock_validar(*args, **kwargs):
+        return None
+
+    monkeypatch.setattr(Transferencia, '_validar', mock_validar)
+
+    with pytest.raises(CepError):
+        transferencia.descargar()