From d80790e9016058f1981233db7c3d934b90195043 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 13:08:08 +0000 Subject: [PATCH 1/2] chore(deps-dev): Bump mypy from 0.982 to 0.991 Bumps [mypy](https://github.com/python/mypy) from 0.982 to 0.991. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.982...v0.991) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.in | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.in b/requirements-dev.in index 1c7f3742..767d63f5 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -10,7 +10,7 @@ codecov==2.1.12 coverage==6.5.0 flake8==4.0.1 isort==5.10.1 -mypy==0.982 +mypy==0.991 tox==3.25.1 twine==3.1.1 wheel==0.38.4 diff --git a/requirements-dev.txt b/requirements-dev.txt index 7964f465..9a1f0f6a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -66,7 +66,7 @@ keyring==21.4.0 # via twine mccabe==0.6.1 # via flake8 -mypy==0.982 +mypy==0.991 # via -r requirements-dev.in mypy-extensions==0.4.3 # via From d2a3e2884bc9eaf68ddde19e933949bf18d6452a Mon Sep 17 00:00:00 2001 From: Samuel Villegas Date: Tue, 20 Dec 2022 12:25:21 -0300 Subject: [PATCH 2/2] chore: Update `Optional` parameters for new version of `mypy` --- cl_sii/libs/csv_utils.py | 4 ++-- cl_sii/libs/mm_utils.py | 4 ++-- cl_sii/libs/rows_processing.py | 10 +++++----- cl_sii/rcv/parse_csv.py | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cl_sii/libs/csv_utils.py b/cl_sii/libs/csv_utils.py index 5eaf0cc1..b32abe76 100644 --- a/cl_sii/libs/csv_utils.py +++ b/cl_sii/libs/csv_utils.py @@ -1,5 +1,5 @@ import csv -from typing import IO, Sequence, Type, Union +from typing import IO, Optional, Sequence, Type, Union def create_csv_dict_reader( @@ -7,7 +7,7 @@ def create_csv_dict_reader( csv_dialect: Type[csv.Dialect], row_dict_extra_fields_key: Union[str, None] = None, expected_fields_strict: bool = True, - expected_field_names: Sequence[str] = None, + expected_field_names: Optional[Sequence[str]] = None, ) -> csv.DictReader: """ Create a CSV dict reader with custom options. diff --git a/cl_sii/libs/mm_utils.py b/cl_sii/libs/mm_utils.py index 33a78fdd..3af0ab0f 100644 --- a/cl_sii/libs/mm_utils.py +++ b/cl_sii/libs/mm_utils.py @@ -1,5 +1,5 @@ from datetime import date, datetime -from typing import Any, Union +from typing import Any, Optional, Union import marshmallow import marshmallow.fields @@ -83,7 +83,7 @@ class CustomMarshmallowDateField(marshmallow.fields.Field): 'format': '"{input}" cannot be formatted as a date.', } - def __init__(self, format: str = None, **kwargs: Any) -> None: + def __init__(self, format: Optional[str] = None, **kwargs: Any) -> None: """Constructor. :param format: Either ``"iso"`` (for ISO-8601) or a date format str. diff --git a/cl_sii/libs/rows_processing.py b/cl_sii/libs/rows_processing.py index 459b4bab..631f4749 100644 --- a/cl_sii/libs/rows_processing.py +++ b/cl_sii/libs/rows_processing.py @@ -1,6 +1,6 @@ import csv import logging -from typing import Dict, Iterable, Sequence, Tuple +from typing import Dict, Iterable, Optional, Sequence, Tuple import marshmallow @@ -24,8 +24,8 @@ def csv_rows_mm_deserialization_iterator( csv_reader: csv.DictReader, row_schema: marshmallow.Schema, n_rows_offset: int = 0, - max_n_rows: int = None, - fields_to_remove_names: Sequence[str] = None, + max_n_rows: Optional[int] = None, + fields_to_remove_names: Optional[Sequence[str]] = None, ) -> Iterable[Tuple[int, Dict[str, object], Dict[str, object], dict]]: """ Marshmallow deserialization iterator over CSV rows. @@ -78,8 +78,8 @@ def rows_mm_deserialization_iterator( rows_iterator: Iterable[Dict[str, object]], row_schema: marshmallow.Schema, n_rows_offset: int = 0, - max_n_rows: int = None, - fields_to_remove_names: Sequence[str] = None, + max_n_rows: Optional[int] = None, + fields_to_remove_names: Optional[Sequence[str]] = None, ) -> Iterable[Tuple[int, Dict[str, object], Dict[str, object], dict]]: """ Marshmallow deserialization iterator. diff --git a/cl_sii/rcv/parse_csv.py b/cl_sii/rcv/parse_csv.py index 7f6ca0b9..27ea6ab4 100644 --- a/cl_sii/rcv/parse_csv.py +++ b/cl_sii/rcv/parse_csv.py @@ -87,7 +87,7 @@ def parse_rcv_venta_csv_file( rut: Rut, input_file_path: str, n_rows_offset: int = 0, - max_n_rows: int = None, + max_n_rows: Optional[int] = None, ) -> Iterable[Tuple[Optional[RvDetalleEntry], int, Dict[str, object], Dict[str, object]]]: """ Parse entries from an RV ("Registro de Ventas") (CSV file). @@ -199,7 +199,7 @@ def parse_rcv_compra_registro_csv_file( rut: Rut, input_file_path: str, n_rows_offset: int = 0, - max_n_rows: int = None, + max_n_rows: Optional[int] = None, ) -> Iterable[Tuple[Optional[RcRegistroDetalleEntry], int, Dict[str, object], Dict[str, object]]]: """ Parse entries from an RC ("Registro de Compras") / "registro" (CSV file). @@ -280,7 +280,7 @@ def parse_rcv_compra_no_incluir_csv_file( rut: Rut, input_file_path: str, n_rows_offset: int = 0, - max_n_rows: int = None, + max_n_rows: Optional[int] = None, ) -> Iterable[Tuple[Optional[RcNoIncluirDetalleEntry], int, Dict[str, object], Dict[str, object]]]: """ Parse entries from an RC ("Registro de Compras") / "no incluir" (CSV file). @@ -355,7 +355,7 @@ def parse_rcv_compra_reclamado_csv_file( rut: Rut, input_file_path: str, n_rows_offset: int = 0, - max_n_rows: int = None, + max_n_rows: Optional[int] = None, ) -> Iterable[Tuple[Optional[RcReclamadoDetalleEntry], int, Dict[str, object], Dict[str, object]]]: """ Parse entries from an RC ("Registro de Compras") / "reclamado" (CSV file). @@ -430,7 +430,7 @@ def parse_rcv_compra_pendiente_csv_file( rut: Rut, input_file_path: str, n_rows_offset: int = 0, - max_n_rows: int = None, + max_n_rows: Optional[int] = None, ) -> Iterable[Tuple[Optional[RcPendienteDetalleEntry], int, Dict[str, object], Dict[str, object]]]: """ Parse entries from an RC ("Registro de Compras") / "pendiente" (CSV file). @@ -1131,7 +1131,7 @@ def _parse_rcv_csv_file( fields_to_remove_names: Sequence[str], input_file_path: str, n_rows_offset: int, - max_n_rows: int = None, + max_n_rows: Optional[int] = None, ) -> Iterable[Tuple[Optional[RcvDetalleEntry], int, Dict[str, object], Dict[str, object]]]: """ Parse entries from an RC or RV (CSV file).