Merge branch 'master' into mypy

Author: Daverball

.github/workflows/test.yml

@@ -9,22 +9,6 @@ on:
     - cron: '9 0 * * 1'
 
 jobs:
-  test_legacy:
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [3.7]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: python -m pip install --upgrade pip tox
-      - name: Run tox
-        run: tox -e "$(echo py${{ matrix.python-version }} | sed -e 's/[.]//g;s/pypypy/pypy/')" --skip-missing-interpreters false
   test:
     runs-on: ubuntu-latest
     strategy:

setup.py

@@ -63,7 +63,6 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',

stdnum/be/nn.py

@@ -184,7 +184,7 @@ def get_birth_month(number: str) -> int | None:
 def get_birth_date(number: str) -> datetime.date | None:
     """Return the date of birth."""
     year, month, day = _get_birth_date_parts(compact(number))
-    if year is not None and month is not None and day is not None:
+    if year and month and day:
         return datetime.date(year, month, day)
     return None
 

stdnum/cz/rc.py

@@ -1,7 +1,7 @@
 # rc.py - functions for handling Czech birth numbers
 # coding: utf-8
 #
-# Copyright (C) 2012-2019 Arthur de Jong
+# Copyright (C) 2012-2025 Arthur de Jong
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -91,14 +91,10 @@ def validate(number: str) -> str:
     if len(number) not in (9, 10):
         raise InvalidLength()
     # check if birth date is valid
-    birth_date = get_birth_date(number)
-    # TODO: check that the birth date is not in the future
+    get_birth_date(number)
     # check the check digit (10 digit numbers only)
     if len(number) == 10:
-        check = int(number[:-1]) % 11
-        # before 1985 the checksum could be 0 or 10
-        if birth_date < datetime.date(1985, 1, 1):
-            check = check % 10
+        check = int(number[:-1]) % 11 % 10
         if number[-1] != str(check):
             raise InvalidChecksum()
     return number

stdnum/do/cedula.py

@@ -179,7 +179,11 @@ def format(number: str) -> str:
     return '-'.join((number[:3], number[3:-1], number[-1]))
 
 
-def check_dgii(number: str, timeout: float = 30) -> dict[str, t.Any] | None:  # pragma: no cover
+def check_dgii(
+    number: str,
+    timeout: float = 30,
+    verify: bool = True
+) -> dict[str, t.Any] | None:  # pragma: no cover
     """Lookup the number using the DGII online web service.
 
     This uses the validation service run by the the Dirección General de
@@ -201,7 +205,7 @@ def check_dgii(number: str, timeout: float = 30) -> dict[str, t.Any] | None:  #
     # this function isn't automatically tested because it would require
     # network access for the tests and unnecessarily load the online service
     # we use the RNC implementation and change the rnc result to cedula
-    result = rnc.check_dgii(number, timeout)
+    result = rnc.check_dgii(number, timeout, verify)
     if result and 'rnc' in result:
         result['cedula'] = result.pop('rnc')
     return result

stdnum/gs1_128.py

@@ -249,7 +249,7 @@ def encode(data: t.Mapping[str, object], separator: str = '', parentheses: bool
             mod.validate(value)
         value = _encode_value(info['format'], info['type'], value)
         # store variable-sized values separate from fixed-size values
-        if info.get('fnc1', False):
+        if info.get('fnc1'):
             variable_values.append((ai_fmt % ai, info['format'], info['type'], value))
         else:
             fixed_values.append(ai_fmt % ai + value)

stdnum/vatin.py

@@ -67,9 +67,8 @@ def _get_cc_module(cc: str) -> t.NumberValidationModule:
         raise InvalidFormat()
     if cc not in _country_modules:
         _country_modules[cc] = get_cc_module(cc, 'vat')
-
     module = _country_modules[cc]
-    if module is None:
+    if not module:
         raise InvalidComponent()  # unknown/unsupported country code
     return module
 

tests/test_be_iban.doctest

@@ -37,6 +37,15 @@ Traceback (most recent call last):
 InvalidChecksum: ...
 
 
+Some bank account numbers don't have a BIC.
+(this is a constructed bank account number, no actual one was found in the wild)
+
+>>> iban.validate('BE45102000000089')
+'BE45102000000089'
+>>> iban.to_bic('BE45102000000089') is None
+True
+
+
 These should all be valid numbers combined with the appropriate BIC code for
 the IBAN.
 

tests/test_cz_rc.doctest

@@ -0,0 +1,36 @@
+test_cz_rc.doctest - more detailed doctests for stdnum.cz.rc
+
+Copyright (C) 2025 Arthur de Jong
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA
+
+
+This file contains more detailed doctests for the stdnum.cz.rc
+module.
+
+>>> from stdnum.cz import rc
+
+
+
+These have been found online and should all be valid numbers.
+
+>>> numbers = '''
+...
+... 8801251680
+...
+... '''
+>>> [x for x in numbers.splitlines() if x and not rc.is_valid(x)]
+[]

tests/test_do_cedula.py

@@ -36,6 +36,14 @@ class TestDGII(unittest.TestCase):
     """Test the web services provided by the the Dirección General de
     Impuestos Internos (DGII), the Dominican Republic tax department."""
 
+    # Theses tests currently fail because the SOAP service at
+    # https://www.dgii.gov.do/wsMovilDGII/WSMovilDGII.asmx?WSDL
+    # is no longer available. There is a new one at
+    # https://www.dgii.gov.do/ventanillaunica/ventanillaunica.asmx?WSDL
+    # but it has a different API and seems to require authentication.
+    # See https://github.com/arthurdejong/python-stdnum/pull/462
+    # and https://github.com/arthurdejong/python-stdnum/issues/461
+    @unittest.expectedFailure
     def test_check_dgii(self):
         """Test stdnum.do.cedula.check_dgii()"""
         # Test a normal valid number

tests/test_do_rnc.py

@@ -36,12 +36,14 @@ class TestDGII(unittest.TestCase):
     """Test the web services provided by the the Dirección General de
     Impuestos Internos (DGII), the Dominican Republic tax department."""
 
-    def setUp(self):
-        """Prepare the test."""
-        # For Python 2.7 compatibility
-        if not hasattr(self, 'assertRegex'):
-            self.assertRegex = self.assertRegexpMatches
-
+    # Theses tests currently fail because the SOAP service at
+    # https://www.dgii.gov.do/wsMovilDGII/WSMovilDGII.asmx?WSDL
+    # is no longer available. There is a new one at
+    # https://www.dgii.gov.do/ventanillaunica/ventanillaunica.asmx?WSDL
+    # but it has a different API and seems to require authentication.
+    # See https://github.com/arthurdejong/python-stdnum/pull/462
+    # and https://github.com/arthurdejong/python-stdnum/issues/461
+    @unittest.expectedFailure
     def test_check_dgii(self):
         """Test stdnum.do.rnc.check_dgii()"""
         # Test a normal valid number
@@ -64,6 +66,14 @@ def test_check_dgii(self):
         result = rnc.check_dgii('132070801')
         self.assertEqual(result['rnc'], '132070801')
 
+    # Theses tests currently fail because the SOAP service at
+    # https://www.dgii.gov.do/wsMovilDGII/WSMovilDGII.asmx?WSDL
+    # is no longer available. There is a new one at
+    # https://www.dgii.gov.do/ventanillaunica/ventanillaunica.asmx?WSDL
+    # but it has a different API and seems to require authentication.
+    # See https://github.com/arthurdejong/python-stdnum/pull/462
+    # and https://github.com/arthurdejong/python-stdnum/issues/461
+    @unittest.expectedFailure
     def test_search_dgii(self):
         """Test stdnum.do.rnc.search_dgii()"""
         # Search for some existing companies

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{37,38,39,310,311,312,313,py3},flake8,docs,headers
+envlist = py{38,39,310,311,312,313,py3},flake8,mypy,docs,headers
 skip_missing_interpreters = true
 
 [testenv]